Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix episode deletes

This commit is contained in:
xnappo 2015-03-28 11:14:52 -05:00
parent 79486c5772
commit 012bceca90
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
resources/lib/KodiMonitor.py
View File

@ -40,22 +40,31 @@ class Kodi_Monitor(xbmc.Monitor):
WriteKodiDB().updatePlayCountFromKodi(item, type, playcount) WriteKodiDB().updatePlayCountFromKodi(item, type, playcount)
if method == "VideoLibrary.OnRemove": if method == "VideoLibrary.OnRemove":
xbmc.log('Intercepted remove from sender: ' + sender + ' method: ' + method + ' data: ' + data) xbmc.log('Intercepted remove from sender: ' + sender + ' method: ' + method + ' data: ' + data)
WINDOW = xbmcgui.Window( 10000 )
if WINDOW.getProperty("suspendDeletes") == "True":
#This is a handshake to not try to delete if the item was removed from the Kodi DB due to sync
xbmc.log('Item deleted by sync')
WINDOW.setProperty("suspendDeletes", "False")
return
jsondata = json.loads(data) jsondata = json.loads(data)
if jsondata != None: if jsondata != None:
if jsondata.get("type") == "episode": if jsondata.get("type") == "episode":
episodeid = jsondata.get("id") episodeid = jsondata.get("id")
WINDOW = xbmcgui.Window( 10000 ) MBlist = WINDOW.getProperty("episodeid" + str(episodeid)).split(";;")
#ignore if the item has just been deleted by the background sync #MBlist[0] is the ID, and [1] the title
if not WINDOW.getProperty(episodeid,"deleted"): url='http://' + server + '/mediabrowser/Items?Ids=' + MBlist[1] + '&format=json'
MBlist = WINDOW.getProperty("episodeid" + str(episodeid)).split(";;") #This is a check to see if the item exists on the server, if it doesn't it may have already been deleted by another client
url='http://' + server + '/mediabrowser/Items?Ids=' + MBlist[1] + '&format=json' data = DownloadUtils().downloadUrl(url=url, suppress=True, popup=0)
data = DownloadUtils().downloadUrl(url=url, suppress=True, popup=0) result = json.loads(data)
if data != "": item = result.get("Items")[0]
return_value = xbmcgui.Dialog().yesno("Confirm Delete", "Delete: "+ MBlist[0] + "\n on Emby Server?\nEmbyID: " + MBlist[1]) if WINDOW.getProperty("embyid" + item.get("Id")) == "deleted":
if return_value: xbmc.log('Item was already deleted: ' + str(MBlist))
url='http://' + server + '/mediabrowser/Items/' + MBlist[1] elif data != "":
xbmc.log('Deleting via URL: ' + url) return_value = xbmcgui.Dialog().yesno("Confirm Delete", "Delete: "+ MBlist[0] + "\n on Emby Server?")
DownloadUtils().downloadUrl(url, type="DELETE") if return_value:
url='http://' + server + '/mediabrowser/Items/' + MBlist[1]
xbmc.log('Deleting via URL: ' + url)
DownloadUtils().downloadUrl(url, type="DELETE")

2
resources/lib/LibrarySync.py
View File

@ -580,7 +580,7 @@ class LibrarySync():
allMB3EpisodeIds = set(allMB3EpisodeIds) allMB3EpisodeIds = set(allMB3EpisodeIds)
for episode in allKodiEpisodeIds: for episode in allKodiEpisodeIds:
if episode.get('episodeid') not in allMB3EpisodeIds: if episode.get('episodeid') not in allMB3EpisodeIds:
WINDOW.setProperty(episode.get('episodeid'),"deleted") WINDOW.setProperty("embyid" + str(episode.get('episodeid')),"deleted")
WriteKodiDB().deleteEpisodeFromKodiLibrary(episode.get('episodeid'),episode.get('tvshowid')) WriteKodiDB().deleteEpisodeFromKodiLibrary(episode.get('episodeid'),episode.get('tvshowid'))
cleanneeded = True cleanneeded = True
totalItemsDeleted += 1 totalItemsDeleted += 1

4
resources/lib/WriteKodiDB.py
View File

@ -776,9 +776,13 @@ class WriteKodiDB():
if episode != None: if episode != None:
strmfile = episode["file"] strmfile = episode["file"]
nfofile = strmfile.replace(".strm",".nfo") nfofile = strmfile.replace(".strm",".nfo")
WINDOW = xbmcgui.Window( 10000 )
WINDOW.setProperty("suspendDeletes", "True")
xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.RemoveEpisode", "params": { "episodeid": %i}, "id": 1 }' %(episode["episodeid"])) xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.RemoveEpisode", "params": { "episodeid": %i}, "id": 1 }' %(episode["episodeid"]))
xbmcvfs.delete(strmfile) xbmcvfs.delete(strmfile)
xbmcvfs.delete(nfofile) xbmcvfs.delete(nfofile)
while WINDOW.getProperty("suspendDeletes") == "True":
xbmc.sleep(100)
def addTVShowToKodiLibrary( self, item ): def addTVShowToKodiLibrary( self, item ):
itemPath = os.path.join(tvLibrary,item["Id"]) itemPath = os.path.join(tvLibrary,item["Id"])