Funkwhale
/
Kodi.plugin.audio.subsonic
mirror of https://github.com/gordielachance/plugin.audio.subsonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove dependency for integer ids to suit Navidrome requirement

This commit is contained in:
Warwick Harris 2021-08-30 16:42:28 +10:00
parent 194844571c
commit ed3f7da8b5
2 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libsonic/connection.py
View File

@ -942,9 +942,9 @@ class Connection(object):
q = self._getQueryDict({'id': aid, 'size': size}) q = self._getQueryDict({'id': aid, 'size': size})
req = self._getRequest(viewName, q) req = self._getRequest(viewName, q)
res = self._doBinReq(req) #res = self._doBinReq(req)
if isinstance(res, dict): #if isinstance(res, dict):
self._checkStatus(res) # self._checkStatus(res)
return req.full_url return req.full_url
@ -2672,7 +2672,8 @@ class Connection(object):
methodName = 'getVideoInfo' methodName = 'getVideoInfo'
viewName = '%s.view' % methodName viewName = '%s.view' % methodName
q = {'id': int(vid)} #q = {'id': int(vid)}
q = {'id': vid}
req = self._getRequest(viewName, q) req = self._getRequest(viewName, q)
res = self._doInfoReq(req) res = self._doInfoReq(req)
self._checkStatus(res) self._checkStatus(res)
@ -2689,7 +2690,8 @@ class Connection(object):
methodName = 'getAlbumInfo' methodName = 'getAlbumInfo'
viewName = '%s.view' % methodName viewName = '%s.view' % methodName
q = {'id': int(aid)} #q = {'id': int(aid)}
q = {'id': aid}
req = self._getRequest(viewName, q) req = self._getRequest(viewName, q)
res = self._doInfoReq(req) res = self._doInfoReq(req)
self._checkStatus(res) self._checkStatus(res)
@ -2706,7 +2708,8 @@ class Connection(object):
methodName = 'getAlbumInfo2' methodName = 'getAlbumInfo2'
viewName = '%s.view' % methodName viewName = '%s.view' % methodName
q = {'id': int(aid)} #q = {'id': int(aid)}
q = {'id': aid}
req = self._getRequest(viewName, q) req = self._getRequest(viewName, q)
res = self._doInfoReq(req) res = self._doInfoReq(req)
self._checkStatus(res) self._checkStatus(res)
@ -2725,7 +2728,8 @@ class Connection(object):
methodName = 'getCaptions' methodName = 'getCaptions'
viewName = '%s.view' % methodName viewName = '%s.view' % methodName
q = self._getQueryDict({'id': int(vid), 'format': fmt}) #q = self._getQueryDict({'id': int(vid), 'format': fmt})
q = self._getQueryDict({'id': vid, 'format': fmt})
req = self._getRequest(viewName, q) req = self._getRequest(viewName, q)
res = self._doInfoReq(req) res = self._doInfoReq(req)
self._checkStatus(res) self._checkStatus(res)
@ -2797,12 +2801,12 @@ class Connection(object):
qdict.update(query) qdict.update(query)
url = '%s:%d/%s/%s' % (self._baseUrl, self._port, self._serverPath, url = '%s:%d/%s/%s' % (self._baseUrl, self._port, self._serverPath,
viewName) viewName)
xbmc.log("Standard URL %s"%url,level=xbmc.LOGDEBUG) #xbmc.log("Standard URL %s"%url,level=xbmc.LOGDEBUG)
xbmc.log("Qdict %s"%str(qdict),level=xbmc.LOGDEBUG) #xbmc.log("Qdict %s"%str(qdict),level=xbmc.LOGDEBUG)
req = urllib.request.Request(url, urlencode(qdict).encode('utf-8')) req = urllib.request.Request(url, urlencode(qdict).encode('utf-8'))
if(self._useGET or ('getCoverArt' in viewName) or ('stream' in viewName)): if(self._useGET or ('getCoverArt' in viewName) or ('stream' in viewName)):
url += '?%s' % urlencode(qdict) url += '?%s' % urlencode(qdict)
xbmc.log("UseGET URL %s"%(url),xbmc.LOGDEBUG) #xbmc.log("UseGET URL %s"%(url),xbmc.LOGDEBUG)
req = urllib.request.Request(url) req = urllib.request.Request(url)
return req return req

137
main.py
View File

@ -13,6 +13,7 @@ import xbmcplugin
import xbmcgui import xbmcgui
import json import json
import shutil import shutil
import time
import dateutil.parser import dateutil.parser
from datetime import datetime from datetime import datetime
from collections import MutableMapping, namedtuple from collections import MutableMapping, namedtuple
@ -34,8 +35,9 @@ plugin = Plugin()
connection = None connection = None
cachetime = int(Addon().get_setting('cachetime')) cachetime = int(Addon().get_setting('cachetime'))
local_starred = set({})
local_starred = set({})
plugin.log("This is where the local_stars are cleared")
ListContext = namedtuple('ListContext', ['listing', 'succeeded','update_listing', 'cache_to_disk','sort_methods', 'view_mode','content', 'category']) ListContext = namedtuple('ListContext', ['listing', 'succeeded','update_listing', 'cache_to_disk','sort_methods', 'view_mode','content', 'category'])
PlayContext = namedtuple('PlayContext', ['path', 'play_item', 'succeeded']) PlayContext = namedtuple('PlayContext', ['path', 'play_item', 'succeeded'])
def popup(text, time=5000, image=None): def popup(text, time=5000, image=None):
@ -50,7 +52,7 @@ def get_connection():
if connection==None: if connection==None:
connected = False connected = False
# Create connection # Create connection
try: if 1:#try:
connection = libsonic.Connection( connection = libsonic.Connection(
baseUrl=Addon().get_setting('subsonic_url'), baseUrl=Addon().get_setting('subsonic_url'),
username=Addon().get_setting('username', convert=False), username=Addon().get_setting('username', convert=False),
@ -62,8 +64,8 @@ def get_connection():
useGET=Addon().get_setting('useget'), useGET=Addon().get_setting('useget'),
) )
connected = connection.ping() connected = connection.ping()
except: #except:
pass # pass
if connected==False: if connected==False:
popup('Connection error') popup('Connection error')
@ -557,7 +559,8 @@ def list_tracks(params):
#update stars #update stars
if menu_id == 'tracks_starred': if menu_id == 'tracks_starred':
ids_list = [item.get('id') for item in items] ids_list = [item.get('id') for item in items]
stars_cache_update(ids_list) #stars_local_update(ids_list)
cache_refresh(True)
# Iterate through items # Iterate through items
key = 0; key = 0;
@ -642,12 +645,9 @@ def search(params):
# Get items # Get items
items = connection.search2(query=d) items = connection.search2(query=d)
# Iterate through items # Iterate through items
try: for item in items.get('searchResult2').get('song'):
for item in items.get('searchResult2').get('song'): entry = get_entry_track( item, params)
entry = get_entry_track( item, params) listing.append(entry)
listing.append(entry)
except:
pass
if len(listing) == 1: if len(listing) == 1:
plugin.log('One single Media Folder found; do return listing from browse_indexes()...') plugin.log('One single Media Folder found; do return listing from browse_indexes()...')
@ -731,7 +731,8 @@ def star_item(params):
message = Addon().get_localized_string(30032) message = Addon().get_localized_string(30032)
plugin.log('Starred %s #%s' % (type,json.dumps(ids))) plugin.log('Starred %s #%s' % (type,json.dumps(ids)))
stars_cache_update(ids,unstar) #stars_local_update(ids,unstar)
cache_refresh(True)
popup(message) popup(message)
@ -804,8 +805,13 @@ def get_entry_playlist(item,params):
#@plugin.cached(cachetime) #cache (in minutes) #@plugin.cached(cachetime) #cache (in minutes)
def get_entry_artist(item,params): def get_entry_artist(item,params):
image = connection.getCoverArtUrl(item.get('coverArt')) image = connection.getCoverArtUrl(item.get('coverArt'))
#artist_info = connection.getArtistInfo(item.get('id')).get('artistInfo')
#artist_bio = artist_info.get('biography')
#xbmc.log("Artist info: %s"%artist_info.get('biography'),xbmc.LOGINFO)
return { return {
'label': get_starred_label(item.get('id'),item.get('name')), 'label': get_starred_label(item.get('id'),item.get('name')),
'label2': "test label",
'offscreen': True,
'thumb': image, 'thumb': image,
'fanart': image, 'fanart': image,
'url': plugin.get_url( 'url': plugin.get_url(
@ -816,7 +822,11 @@ def get_entry_artist(item,params):
'info': { 'info': {
'music': { ##http://romanvm.github.io/Kodistubs/_autosummary/xbmcgui.html#xbmcgui.ListItem.setInfo 'music': { ##http://romanvm.github.io/Kodistubs/_autosummary/xbmcgui.html#xbmcgui.ListItem.setInfo
'count': item.get('albumCount'), 'count': item.get('albumCount'),
'artist': item.get('name') 'artist': item.get('name'),
'title': "testtitle",
'album': "testalbum",
'comment': "testcomment"
# 'title': artist_info.get('biography')
} }
} }
} }
@ -920,7 +930,10 @@ def get_starred_label(id,label):
def is_starred(id): def is_starred(id):
starred = stars_cache_get() starred = stars_cache_get()
id = int(id) #plugin.log(starred)
#plugin.log("id in starred %s %s"%(id,id in starred))
#plugin.log("int(id) in starred %s %s"%(id, int(id) in starred))
#id = int(id)
if id in starred: if id in starred:
return True return True
else: else:
@ -1023,49 +1036,39 @@ def get_sort_methods(type,params):
return sortable return sortable
def cache_refresh(forced=False):
def stars_cache_update(ids,remove=False): global local_starred
#cachetime = 5
#get existing cache set last_update = 0
starred = stars_cache_get()
#make sure this==a list
if not isinstance(ids, list):
ids = [ids]
#abord if empty
if len(ids) == 0:
return
#parse items
for item_id in ids:
item_id = int(item_id)
if not remove:
starred.add(item_id)
else:
starred.remove(item_id)
#store them
with plugin.get_storage() as storage: with plugin.get_storage() as storage:
storage['starred_ids'] = starred #storage['starred_ids'] = starred
try:
plugin.log('stars_cache_update:') last_update = storage['updated']
plugin.log(starred) except KeyError as e:
plugin.log("keyerror, is this a new cache file?")
if(time.time()-(cachetime*60)>last_update) or forced:
plugin.log("Cache expired, updating %s %s %s forced %s"%(time.time(),cachetime*60,last_update, forced))
generator = walk_tracks_starred()
items = list(generator)
ids_list = [item.get('id') for item in items]
#plugin.log("Retreived from server: %s"%ids_list)
storage['starred_ids'] = ids_list
storage['updated']=time.time()
plugin.log("cache_refresh checking length of load to local %s items"%len(ids_list))
local_starred = ids_list
else:
#plugin.log("Cache fresh %s %s %s forced %s remaining %s"%(time.time(),cachetime*60,last_update, forced, time.time()-(cachetime*60)-last_update))
pass
if(len(local_starred)==0):
local_starred = storage['starred_ids']
#plugin.log("cache_refresh returning %s items"%len(local_starred))
return
def stars_cache_get(): #Retrieving stars from cache is too slow, so load to local variable def stars_cache_get(): #Retrieving stars from cache is too slow, so load to local variable
global local_starred global local_starred
plugin.log(len(local_starred)) cache_refresh()
if(len(local_starred)>0): #plugin.log("stars_cache_get returning %s items"%len(local_starred))
plugin.log('stars already loaded:') return local_starred
plugin.log(local_starred)
return(local_starred)
else:
with plugin.get_storage() as storage:
local_starred = storage.get('starred_ids',set())
plugin.log('stars_cache_get:')
plugin.log(local_starred)
return local_starred
def navigate_next(params): def navigate_next(params):
@ -1419,31 +1422,25 @@ def walk_playlists():
""" """
response = connection.getPlaylists() response = connection.getPlaylists()
try:
for child in response["playlists"]["playlist"]: for child in response["playlists"]["playlist"]:
yield child yield child
except:
yield from ()
def walk_playlist(playlist_id): def walk_playlist(playlist_id):
""" """
Request Subsonic's playlist items and iterate over each item. Request Subsonic's playlist items and iterate over each item.
""" """
response = connection.getPlaylist(playlist_id) response = connection.getPlaylist(playlist_id)
try:
for child in response["playlist"]["entry"]: for child in response["playlist"]["entry"]:
yield child yield child
except:
yield from ()
def walk_folders(): def walk_folders():
response = connection.getMusicFolders() response = connection.getMusicFolders()
try:
for child in response["musicFolders"]["musicFolder"]: for child in response["musicFolders"]["musicFolder"]:
yield child yield child
except:
yield from ()
def walk_directory(directory_id): def walk_directory(directory_id):
""" """