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

add back in the service monitor watchdog

Browse source
This commit is contained in:
shaun 2015-05-12 10:10:33 +10:00
parent 0923b649e7
commit a3b500061a
2 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
resources/lib/Entrypoint.py
View file

@ -7,7 +7,7 @@ import os, sys
import threading import threading
import json import json
import urllib import urllib
import time
WINDOW = xbmcgui.Window(10000) WINDOW = xbmcgui.Window(10000)
@ -21,6 +21,7 @@ from API import API
##### Play items via plugin://plugin.video.emby/ ##### ##### Play items via plugin://plugin.video.emby/ #####
def doPlayback(id): def doPlayback(id):
checkService()
url = "{server}/mediabrowser/Users/{UserId}/Items/%s?format=json&ImageTypeLimit=1" % id url = "{server}/mediabrowser/Users/{UserId}/Items/%s?format=json&ImageTypeLimit=1" % id
result = DownloadUtils().downloadUrl(url) result = DownloadUtils().downloadUrl(url)
item = PlaybackUtils().PLAY(result, setup="default") item = PlaybackUtils().PLAY(result, setup="default")
@ -482,4 +483,31 @@ def doMainListing():
addDirectoryItem("Perform local database reset (full resync)", "plugin://plugin.video.emby/?mode=reset") addDirectoryItem("Perform local database reset (full resync)", "plugin://plugin.video.emby/?mode=reset")
xbmcplugin.endOfDirectory(int(sys.argv[1])) xbmcplugin.endOfDirectory(int(sys.argv[1]))
def checkService():
timeStamp = xbmcgui.Window(10000).getProperty("Emby_Service_Timestamp")
loops = 0
monitor = xbmc.Monitor()
while(timeStamp == ""):
timeStamp = xbmcgui.Window(10000).getProperty("Emby_Service_Timestamp")
loops = loops + 1
if(loops == 5):
xbmc.log("Emby Service Not Running, no time stamp, exiting")
addon = xbmcaddon.Addon(id='plugin.video.emby')
language = addon.getLocalizedString
xbmcgui.Dialog().ok(language(30135), language(30136), language(30137))
sys.exit()
if monitor.waitForAbort(1):
# Abort was requested while waiting. We should exit
return
xbmc.log("Emby Service Timestamp: " + timeStamp)
xbmc.log("Emby Current Timestamp: " + str(int(time.time())))
if((int(timeStamp) + 30) < int(time.time())):
xbmc.log("Emby Service Not Running, time stamp to old, exiting")
addon = xbmcaddon.Addon(id='plugin.video.emby')
language = addon.getLocalizedString
xbmcgui.Dialog().ok(language(30135), language(30136), language(30137))
sys.exit()

7
service.py
View file

@ -5,6 +5,7 @@ import os
import threading import threading
import json import json
from datetime import datetime from datetime import datetime
import time
cwd = xbmcaddon.Addon(id='plugin.video.emby').getAddonInfo('path') cwd = xbmcaddon.Addon(id='plugin.video.emby').getAddonInfo('path')
BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( cwd, 'resources', 'lib' ) ) BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( cwd, 'resources', 'lib' ) )
@ -66,7 +67,8 @@ class Service():
WINDOW = self.WINDOW WINDOW = self.WINDOW
WINDOW.setProperty("Server_online", "") WINDOW.setProperty("Server_online", "")
WINDOW.setProperty("Emby_Service_Timestamp", str(int(time.time())))
ConnectionManager().checkServer() ConnectionManager().checkServer()
lastProgressUpdate = datetime.today() lastProgressUpdate = datetime.today()
startupComplete = False startupComplete = False
@ -78,7 +80,8 @@ class Service():
lastFile = None lastFile = None
while not self.KodiMonitor.abortRequested(): while not self.KodiMonitor.abortRequested():
WINDOW.setProperty("Emby_Service_Timestamp", str(int(time.time())))
if self.KodiMonitor.waitForAbort(1): if self.KodiMonitor.waitForAbort(1):
# Abort was requested while waiting. We should exit # Abort was requested while waiting. We should exit
break break