Revert "Use Plex Companion for Playstate Reporting"
This reverts commit f22369a14a.
This commit is contained in:
tomkat83
parent
f22369a14a
commit
8b04f6175d
4 changed files with 77 additions and 72 deletions
|
|
@ -22,17 +22,17 @@ class PlexCompanion(threading.Thread):
|
|||
self.client = plexgdm.plexgdm()
|
||||
self.client.clientDetails(self.settings)
|
||||
self.logMsg("Registration string is: %s "
|
||||
% self.client.getClientDetails(), 2)
|
||||
% self.client.getClientDetails(), 1)
|
||||
|
||||
threading.Thread.__init__(self)
|
||||
|
||||
def run(self):
|
||||
httpd = False
|
||||
# Cache for quicker while loops
|
||||
log = self.logMsg
|
||||
client = self.client
|
||||
threadStopped = self.threadStopped
|
||||
threadSuspended = self.threadSuspended
|
||||
start_count = 0
|
||||
|
||||
# Start up instances
|
||||
requestMgr = httppersist.RequestMgr()
|
||||
|
|
@ -40,10 +40,7 @@ class PlexCompanion(threading.Thread):
|
|||
subscriptionManager = subscribers.SubscriptionManager(
|
||||
jsonClass, requestMgr)
|
||||
|
||||
if utils.settings('plexCompanion') == 'true':
|
||||
self.logMsg('User activated Plex Companion', 0)
|
||||
# Start up httpd
|
||||
start_count = 0
|
||||
while True:
|
||||
try:
|
||||
httpd = listener.ThreadedHTTPServer(
|
||||
|
|
@ -67,8 +64,9 @@ class PlexCompanion(threading.Thread):
|
|||
break
|
||||
|
||||
start_count += 1
|
||||
else:
|
||||
self.logMsg('User deactivated Plex Companion', 0)
|
||||
|
||||
if not httpd:
|
||||
return
|
||||
|
||||
client.start_all()
|
||||
|
||||
|
|
@ -82,7 +80,7 @@ class PlexCompanion(threading.Thread):
|
|||
break
|
||||
xbmc.sleep(1000)
|
||||
try:
|
||||
if httpd:
|
||||
|
||||
httpd.handle_request()
|
||||
message_count += 1
|
||||
|
||||
|
|
@ -101,12 +99,11 @@ class PlexCompanion(threading.Thread):
|
|||
subscriptionManager.notify()
|
||||
xbmc.sleep(50)
|
||||
except:
|
||||
log("Error in loop, continuing anyway. Traceback:", 1)
|
||||
log("Error in loop, continuing anyway", 0)
|
||||
log(traceback.format_exc(), 1)
|
||||
xbmc.sleep(50)
|
||||
|
||||
client.stop_all()
|
||||
if httpd:
|
||||
try:
|
||||
httpd.socket.shutdown(socket.SHUT_RDWR)
|
||||
except:
|
||||
|
|
|
|||
|
|
@ -36,6 +36,14 @@ class Player(xbmc.Player):
|
|||
|
||||
self.logMsg("Starting playback monitor.", 2)
|
||||
|
||||
# Should we start notification or is this done by Plex Companion?
|
||||
self.doNotify = False if (utils.settings('plexCompanion') == 'true') \
|
||||
else True
|
||||
if self.doNotify:
|
||||
self.logMsg("PMS notifications not done by Plex Companion", 2)
|
||||
else:
|
||||
self.logMsg("PMS notifications done by Plex Companion", 2)
|
||||
|
||||
def GetPlayStats(self):
|
||||
return self.playStats
|
||||
|
||||
|
|
@ -66,8 +74,7 @@ class Player(xbmc.Player):
|
|||
else:
|
||||
count += 1
|
||||
if not currentFile:
|
||||
self.logMsg('Error getting a currently playing file; abort '
|
||||
'reporting', -1)
|
||||
log('Error getting a currently playing file; abort reporting', -1)
|
||||
return
|
||||
|
||||
# Save currentFile for cleanup later and for references
|
||||
|
|
@ -81,12 +88,11 @@ class Player(xbmc.Player):
|
|||
itemId = window("emby_%s.itemid" % currentFile)
|
||||
# try 20 times or about 10 seconds
|
||||
if count == 20:
|
||||
self.logMsg("Could not find itemId, cancelling playback "
|
||||
"report!", -1)
|
||||
log("Could not find itemId, cancelling playback report...", -1)
|
||||
return
|
||||
count += 1
|
||||
|
||||
self.logMsg("ONPLAYBACK_STARTED: %s itemid: %s"
|
||||
log("ONPLAYBACK_STARTED: %s itemid: %s"
|
||||
% (currentFile.decode('utf-8'), itemId), 0)
|
||||
|
||||
embyitem = "emby_%s" % currentFile
|
||||
|
|
@ -96,16 +102,16 @@ class Player(xbmc.Player):
|
|||
itemType = window("%s.type" % embyitem)
|
||||
window('emby_skipWatched%s' % itemId, value="true")
|
||||
|
||||
self.logMsg("Playing itemtype is: %s" % itemType, 1)
|
||||
log("Playing itemtype is: %s" % itemType, 1)
|
||||
|
||||
customseek = window('emby_customPlaylist.seektime')
|
||||
if (window('emby_customPlaylist') == "true" and customseek):
|
||||
# Start at, when using custom playlist (play to Kodi from webclient)
|
||||
self.logMsg("Seeking to: %s" % customseek, 1)
|
||||
self.xbmcplayer.seekTime(int(customseek))
|
||||
log("Seeking to: %s" % customseek, 1)
|
||||
xbmcplayer.seekTime(int(customseek))
|
||||
window('emby_customPlaylist.seektime', clear=True)
|
||||
|
||||
seekTime = self.xbmcplayer.getTime()
|
||||
seekTime = xbmcplayer.getTime()
|
||||
|
||||
# Get playback volume
|
||||
volume_query = {
|
||||
|
|
@ -185,8 +191,7 @@ class Player(xbmc.Player):
|
|||
|
||||
if mapping: # Set in playbackutils.py
|
||||
|
||||
self.logMsg("Mapping for external subtitles index: %s"
|
||||
% mapping, 2)
|
||||
log("Mapping for external subtitles index: %s" % mapping, 2)
|
||||
externalIndex = json.loads(mapping)
|
||||
|
||||
if externalIndex.get(str(indexSubs)):
|
||||
|
|
@ -252,7 +257,8 @@ class Player(xbmc.Player):
|
|||
self.playStats[playMethod] = 1'''
|
||||
|
||||
def reportPlayback(self):
|
||||
# Done by Plex Companion
|
||||
# Don't use if Plex Companion is enabled
|
||||
if not self.doNotify:
|
||||
return
|
||||
|
||||
self.logMsg("reportPlayback Called", 2)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ from xbmc import sleep
|
|||
|
||||
import downloadutils
|
||||
from PlexFunctions import PMSHttpsEnabled
|
||||
from utils import window, logging, settings
|
||||
from utils import window, logging
|
||||
|
||||
|
||||
@logging
|
||||
|
|
@ -60,7 +60,7 @@ class plexgdm:
|
|||
self.client_registered = False
|
||||
self.download = downloadutils.DownloadUtils().downloadUrl
|
||||
|
||||
def clientDetails(self, options):
|
||||
def clientDetails(self, settings):
|
||||
self.client_data = (
|
||||
"Content-Type: plex/media-player\r\n"
|
||||
"Resource-Identifier: %s\r\n"
|
||||
|
|
@ -74,13 +74,13 @@ class plexgdm:
|
|||
"mirror,playqueues\r\n"
|
||||
"Device-Class: HTPC"
|
||||
) % (
|
||||
options['uuid'],
|
||||
options['client_name'],
|
||||
options['myport'],
|
||||
options['addonName'],
|
||||
options['version']
|
||||
settings['uuid'],
|
||||
settings['client_name'],
|
||||
settings['myport'],
|
||||
settings['addonName'],
|
||||
settings['version']
|
||||
)
|
||||
self.client_id = options['uuid']
|
||||
self.client_id = settings['uuid']
|
||||
|
||||
def getClientDetails(self):
|
||||
if not self.client_data:
|
||||
|
|
@ -388,5 +388,4 @@ class plexgdm:
|
|||
|
||||
def start_all(self, daemon=False):
|
||||
self.start_discovery(daemon)
|
||||
if settings('plexCompanion') == 'true':
|
||||
self.start_registration(daemon)
|
||||
|
|
|
|||
|
|
@ -63,6 +63,8 @@ class Service():
|
|||
window('emby_kodiProfile', value=xbmc.translatePath("special://profile"))
|
||||
window('emby_pluginpath', value=utils.settings('useDirectPaths'))
|
||||
|
||||
self.runPlexCompanion = utils.settings('plexCompanion')
|
||||
|
||||
# Initial logging
|
||||
log("======== START %s ========" % self.addonName, 0)
|
||||
log("Platform: %s" % (self.clientInfo.getPlatform()), 0)
|
||||
|
|
@ -204,7 +206,8 @@ class Service():
|
|||
self.library_running = True
|
||||
library.start()
|
||||
# Start the Plex Companion thread
|
||||
if not self.plexCompanion_running:
|
||||
if not self.plexCompanion_running and \
|
||||
self.runPlexCompanion == "true":
|
||||
self.plexCompanion_running = True
|
||||
plexCompanion = PlexCompanion.PlexCompanion()
|
||||
plexCompanion.start()
|
||||
|
|
|
|||
Loading…
Reference in a new issue