Conflicts:
	resources/lib/LibrarySync.py
This commit is contained in:
Marcel van der Veldt 2015-03-17 10:44:02 +01:00
commit 112f636ab2
1 changed files with 4 additions and 2 deletions

View File

@ -734,7 +734,7 @@ class LibrarySync():
if pendingChanges: if pendingChanges:
xbmc.sleep(sleepVal) xbmc.sleep(sleepVal)
utils.logMsg("MB3 Sync","updating propertyarray..." + str(propertyName) + ": " + str(json_array)) utils.logMsg("MB3 Sync","updating propertyarray... Name:" + str(propertyName) + " Current:" + str(currentvalues) + " New:" + str(json_array))
xbmc.executeJSONRPC(jsoncommand %(id,propertyName,json_array)) xbmc.executeJSONRPC(jsoncommand %(id,propertyName,json_array))
return pendingChanges return pendingChanges
@ -855,7 +855,9 @@ class LibrarySync():
premieredate = premieredatelist[0] premieredate = premieredatelist[0]
SubElement(root, "firstaired").text = premieredate SubElement(root, "firstaired").text = premieredate
SubElement(root, "premieredate").text = premieredate SubElement(root, "premieredate").text = premieredate
SubElement(root, "runtime").text = str(timeInfo.get('Duration'))
if(timeInfo.get('Duration') != "0"):
SubElement(root, "runtime").text = str(timeInfo.get('Duration'))
SubElement(root, "plot").text = utils.convertEncoding(API().getOverview(item)) SubElement(root, "plot").text = utils.convertEncoding(API().getOverview(item))