Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-11-13 21:56:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop

Browse source
This commit is contained in:
angelblue05 2016-11-30 14:13:55 -06:00
commit 69e56acc81
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
addon.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.emby" <addon id="plugin.video.emby"
name="Emby" name="Emby"
version="2.3.21" version="2.3.22"
provider-name="Emby.media"> provider-name="Emby.media">
<requires> <requires>
<import addon="xbmc.python" version="2.19.0"/> <import addon="xbmc.python" version="2.19.0"/>

1
resources/language/English/strings.xml
View file

@ -352,5 +352,6 @@
<string id="33092">Create a backup</string> <string id="33092">Create a backup</string>
<string id="33093">Backup folder</string> <string id="33093">Backup folder</string>
<string id="33094">Select content type to repair</string> <string id="33094">Select content type to repair</string>
<string id="33095">Failed to retrieve latest updates using fast sync, using full sync.</string>
</strings> </strings>

4
resources/lib/librarysync.py
View file

@ -136,9 +136,9 @@ class LibrarySync(threading.Thread):
if settings('enableMusic') != "true": if settings('enableMusic') != "true":
params['filter'] = "music" params['filter'] = "music"
url = "{server}/emby/Emby.Kodi.SyncQueue/{UserId}/GetItems?format=json" url = "{server}/emby/Emby.Kodi.SyncQueue/{UserId}/GetItems?format=json"
result = self.doUtils(url, parameters=params)
try: try:
result = self.doUtils(url, parameters=params)
processlist = { processlist = {
'added': result['ItemsAdded'], 'added': result['ItemsAdded'],
@ -149,13 +149,13 @@ class LibrarySync(threading.Thread):
except (KeyError, TypeError): except (KeyError, TypeError):
log.error("Failed to retrieve latest updates using fast sync.") log.error("Failed to retrieve latest updates using fast sync.")
xbmcgui.Dialog().ok(lang(29999), lang(33095))
return False return False
else: else:
log.info("Fast sync changes: %s" % result) log.info("Fast sync changes: %s" % result)
for action in processlist: for action in processlist:
self.triage_items(action, processlist[action]) self.triage_items(action, processlist[action])
return True return True
def saveLastSync(self): def saveLastSync(self):