Merge pull request #47 from GioF71/feature/search-album

[Feature] Search Album

README.md

@@ -20,7 +20,7 @@ Leia compatible version available in alternate branch
 
 ## Installation
 From repository
-[repository.warwickh-0.9.0.zip](https://github.com/warwickh/repository.warwickh/raw/master/matrix/zips/repository.warwickh/repository.warwickh-0.9.0.zip) (Please report any issues)
+[repository.warwickh](https://github.com/warwickh/repository.warwickh/raw/master/matrix/zips/repository.warwickh) (Please report any issues)
 
 From GitHub
 * Click the code button and download

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.subsonic" name="Subsonic" version="3.0.1" provider-name="BasilFX,warwickh">
+<addon id="plugin.audio.subsonic" name="Subsonic" version="3.0.2" provider-name="BasilFX,warwickh">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
     </requires>

lib/libsonic/connection.py

@@ -20,6 +20,7 @@ from netrc import netrc
 from hashlib import md5
 import urllib.request
 import urllib.error
+import urllib.parse
 from http import client as http_client
 from urllib.parse import urlencode
 from io import StringIO
@@ -154,8 +155,18 @@ class Connection(object):
                             request.  This is not recommended as request
                             URLs can get very long with some API calls
         """
-        self._baseUrl = baseUrl
-        self._hostname = baseUrl.split('://')[1].strip()
+        
+        self._baseUrl = baseUrl.rstrip('/')
+        self._hostname = self._baseUrl.split('://')[1]
+        if len(self._hostname.split('/'))>1:
+            print(len(self._hostname.split('/')))
+            xbmc.log("Got a folder %s"%(self._hostname.split('/')[1]),xbmc.LOGDEBUG)
+            parts = urllib.parse.urlparse(self._baseUrl)
+            self._baseUrl = "%s://%s" % (parts.scheme, parts.hostname)
+            self._hostname = parts.hostname
+            self._serverPath = parts.path.strip('/') + '/rest'
+        else:
+            self._serverPath = serverPath.strip('/')
         self._username = username
         self._rawPass = password
         self._legacyAuth = legacyAuth
@@ -172,7 +183,6 @@ class Connection(object):
         self._port = int(port)
         self._apiVersion = apiVersion
         self._appName = appName
-        self._serverPath = serverPath.strip('/')
         self._insecure = insecure
         self._opener = self._getOpener(self._username, self._rawPass)
 
@@ -899,7 +909,7 @@ class Connection(object):
         #xbmc.log("Requesting %s"%str(req.full_url),xbmc.LOGDEBUG)
         return_url = req.full_url
         if self._insecure:
-            return_url += '|verifypeer=false'
+            return_url += '&verifypeer=false'
             xbmc.log("Request is insecure %s"%return_url,level=xbmc.LOGDEBUG)   
         return return_url
 
@@ -948,7 +958,7 @@ class Connection(object):
         #xbmc.log("Requesting %s"%str(req.full_url),xbmc.LOGDEBUG)
         return_url = req.full_url
         if self._insecure:
-            return_url += '|verifypeer=false'
+            return_url += '&verifypeer=false'
             xbmc.log("Request is insecure %s"%return_url,level=xbmc.LOGDEBUG)   
         return return_url
 

lib/simpleplugin/simpleplugin.py

@@ -19,7 +19,8 @@ import inspect
 import time
 import hashlib
 import pickle
-from collections import MutableMapping, namedtuple
+from collections.abc import MutableMapping
+from collections import namedtuple
 from copy import deepcopy
 from functools import wraps
 from shutil import copyfile
@@ -58,7 +59,7 @@ def _format_vars(variables):
     :return: formatted string with sorted ``var = val`` pairs
     :rtype: str
     """
-    var_list = [(var, val) for var, val in iteritems(variables)]
+    var_list = [(var, val) for var, val in iter(variables.items())]
     lines = []
     for var, val in sorted(var_list, key=lambda i: i[0]):
         if not (var.startswith('__') or var.endswith('__')):

main.py

@@ -107,6 +107,11 @@ def root(params):
             'callback': 'search',
             'thumb': None
         },  
+        'searchalbum': {
+            'name':     Addon().get_localized_string(30045),
+            'callback': 'search_album',
+            'thumb': None
+        },  
     }
 
     # Iterate through categories
@@ -578,27 +583,61 @@ def search(params):
 
     dialog = xbmcgui.Dialog()
     d = dialog.input(Addon().get_localized_string(30039), type=xbmcgui.INPUT_ALPHANUM)
-    if not d:
-        d = " "
 
+    listing = []
 
+    if d:
         # get connection
         connection = get_connection()
 
-    if connection==False:
+        if connection == False:
             return
 
-    listing = []
-
         # Get items
         items = connection.search2(query=d)
         # Iterate through items
-    for item in items.get('searchResult2').get('song'):
+        songs = items.get('searchResult2').get('song')
+        if songs:
+            for item in songs:
                 entry = get_entry_track( item, params)
                 listing.append(entry)
 
-    if len(listing) == 1:
-        plugin.log('One single Media Folder found; do return listing from browse_indexes()...')
+    if len(listing) == 0:
+        plugin.log('No songs found; do return listing from browse_indexes()...')
+        return browse_indexes(params)
+    else:
+        add_directory_items(create_listing(listing))
+
+
+@plugin.action()
+def search_album(params):
+
+    dialog = xbmcgui.Dialog()
+    d = dialog.input(Addon().get_localized_string(30045), type=xbmcgui.INPUT_ALPHANUM)
+
+    listing = []
+
+    if d:
+        # get connection
+        connection = get_connection()
+        if connection==False:
+            return
+        # Get items, we are only looking for albums here
+        # so artistCount and songCount is set to 0
+        items = connection.search2(query=d, artistCount=0, songCount=0)
+        # Iterate through items
+    
+        album_list = items.get('searchResult2').get('album')
+        if album_list:
+            for item in items.get('searchResult2').get('album'):
+                entry = get_entry_album( item, params)
+                listing.append(entry)
+
+    # I believe it is ok to return an empty listing if
+    # the search gave no result
+    # maybe inform the user?
+    if len(listing) == 0:
+        plugin.log('No albums found; do return listing from browse_indexes()...')
         return browse_indexes(params)
     else:
         add_directory_items(create_listing(listing))

resources/language/English/strings.po

@@ -154,7 +154,7 @@ msgid "Browse"
 msgstr ""
 
 msgctxt "#30039"
-msgid "Search"
+msgid "Search Songs"
 msgstr ""
 
 msgctxt "#30040"
@@ -176,3 +176,7 @@ msgstr ""
 msgctxt "#30044"
 msgid "Scrobble to Last.FM"
 msgstr ""
+
+msgctxt "#30045"
+msgid "Search Albums"
+msgstr ""

resources/language/French/strings.po

@@ -153,8 +153,8 @@ msgid "Browse"
 msgstr "Parcourir"
 
 msgctxt "#30039"
-msgid "Search"
-msgstr "Rechercher"
+msgid "Search Songs"
+msgstr "Rechercher Chansons"
 
 
 msgctxt "#30040"
@@ -176,3 +176,7 @@ msgstr ""
 msgctxt "#30044"
 msgid "Scrobble to Last.FM"
 msgstr ""
+
+msgctxt "#30045"
+msgid "Search Albums"
+msgstr "Rechercher Albums"

resources/language/German/strings.po

@@ -153,8 +153,8 @@ msgid "Browse"
 msgstr "Durchsuchen"
 
 msgctxt "#30039"
-msgid "Search"
-msgstr "Suche"
+msgid "Search Songs"
+msgstr "Suche Lieder"
 
 msgctxt "#30040"
 msgid "useGET"
@@ -175,3 +175,7 @@ msgstr ""
 msgctxt "#30044"
 msgid "Scrobble to Last.FM"
 msgstr ""
+
+msgctxt "#30045"
+msgid "Search Albums"
+msgstr "Suche Albums"