Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi

Browse source
This commit is contained in:
Marcel van der Veldt 2015-03-28 17:42:55 +01:00
commit eccfaf983f
6 changed files with 29 additions and 16 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"?>
<addon id="plugin.video.emby"
name="Emby"
version="0.0.4"
version="0.0.5"
provider-name="Emby.media">
<requires>
<import addon="xbmc.python" version="2.1.0"/>

33
resources/lib/KodiMonitor.py
View file

@ -98,22 +98,31 @@ class Kodi_Monitor(xbmc.Monitor):
WriteKodiDB().updatePlayCountFromKodi(item, type, playcount)
if method == "VideoLibrary.OnRemove":
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)
if jsondata != None:
if jsondata.get("type") == "episode":
episodeid = jsondata.get("id")
WINDOW = xbmcgui.Window( 10000 )
#ignore if the item has just been deleted by the background sync
if not WINDOW.getProperty(episodeid,"deleted"):
MBlist = WINDOW.getProperty("episodeid" + str(episodeid)).split(";;")
url='http://' + server + '/mediabrowser/Items?Ids=' + MBlist[1] + '&format=json'
data = DownloadUtils().downloadUrl(url=url, suppress=True, popup=0)
if data != "":
return_value = xbmcgui.Dialog().yesno("Confirm Delete", "Delete: "+ MBlist[0] + "\n on Emby Server?\nEmbyID: " + MBlist[1])
if return_value:
url='http://' + server + '/mediabrowser/Items/' + MBlist[1]
xbmc.log('Deleting via URL: ' + url)
DownloadUtils().downloadUrl(url, type="DELETE")
MBlist = WINDOW.getProperty("episodeid" + str(episodeid)).split(";;")
#MBlist[0] is the ID, and [1] the title
url='http://' + server + '/mediabrowser/Items?Ids=' + MBlist[1] + '&format=json'
#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
data = DownloadUtils().downloadUrl(url=url, suppress=True, popup=0)
result = json.loads(data)
item = result.get("Items")[0]
if WINDOW.getProperty("embyid" + item.get("Id")) == "deleted":
xbmc.log('Item was already deleted: ' + str(MBlist))
elif data != "":
return_value = xbmcgui.Dialog().yesno("Confirm Delete", "Delete: "+ MBlist[0] + "\n on Emby Server?")
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)
for episode in allKodiEpisodeIds:
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'))
cleanneeded = True
totalItemsDeleted += 1

4
resources/lib/WriteKodiDB.py
View file

@ -790,9 +790,13 @@ class WriteKodiDB():
if episode != None:
strmfile = episode["file"]
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"]))
xbmcvfs.delete(strmfile)
xbmcvfs.delete(nfofile)
while WINDOW.getProperty("suspendDeletes") == "True":
xbmc.sleep(100)
def addTVShowToKodiLibrary( self, item ):
itemPath = os.path.join(tvLibrary,item["Id"])

2
resources/settings.xml
View file

@ -29,7 +29,7 @@
</category>
<category label="Playback"> <!-- Extra Sync options -->
<setting id="addExtraPlaybackArt" type="bool" label="Add extra playback art" default="false" visible="true" enable="true" />
<setting id="addExtraPlaybackArt" type="bool" label="Add extra playback art" default="true" visible="true" enable="true" />
<setting id="smbusername" type="text" label="30007" default="" visible="true" enable="true" />
<setting id="smbpassword" type="text" label="30008" default="" option="hidden" visible="true" enable="true" />
</category>

2
service.py
View file

@ -79,7 +79,7 @@ class Service():
pass
else:
# background worker for database sync
if DownloadUtils().authenticate(retreive=False) != "":
if DownloadUtils().authenticate(retreive=True) != "":
# Correctly launch the websocket, if user manually launches the add-on
if (self.newWebSocketThread == None):