Move Companion processing to companion thread
This commit is contained in:
tomkat83
parent
8a58c885e9
commit
a26526c146
2 changed files with 96 additions and 96 deletions
|
|
@ -2,12 +2,16 @@
|
||||||
import threading
|
import threading
|
||||||
import traceback
|
import traceback
|
||||||
import socket
|
import socket
|
||||||
|
import Queue
|
||||||
|
|
||||||
import xbmc
|
import xbmc
|
||||||
|
|
||||||
import utils
|
import utils
|
||||||
from plexbmchelper import listener, plexgdm, subscribers, functions, \
|
from plexbmchelper import listener, plexgdm, subscribers, functions, \
|
||||||
httppersist, settings
|
httppersist, settings
|
||||||
|
from PlexFunctions import ParseContainerKey, GetPlayQueue, \
|
||||||
|
ConvertPlexToKodiTime
|
||||||
|
import playlist
|
||||||
|
|
||||||
|
|
||||||
@utils.logging
|
@utils.logging
|
||||||
|
|
@ -17,7 +21,7 @@ class PlexCompanion(threading.Thread):
|
||||||
"""
|
"""
|
||||||
Initialize with a Queue for callbacks
|
Initialize with a Queue for callbacks
|
||||||
"""
|
"""
|
||||||
def __init__(self, queue):
|
def __init__(self):
|
||||||
self.logMsg("----===## Starting PlexCompanion ##===----", 1)
|
self.logMsg("----===## Starting PlexCompanion ##===----", 1)
|
||||||
self.settings = settings.getSettings()
|
self.settings = settings.getSettings()
|
||||||
|
|
||||||
|
|
@ -27,10 +31,85 @@ class PlexCompanion(threading.Thread):
|
||||||
self.logMsg("Registration string is: %s "
|
self.logMsg("Registration string is: %s "
|
||||||
% self.client.getClientDetails(), 2)
|
% self.client.getClientDetails(), 2)
|
||||||
|
|
||||||
self.queue = queue
|
# Initialize playlist/queue stuff
|
||||||
|
self.queueId = None
|
||||||
|
self.playlist = None
|
||||||
|
|
||||||
threading.Thread.__init__(self)
|
threading.Thread.__init__(self)
|
||||||
|
|
||||||
|
def _getStartItem(self, string):
|
||||||
|
"""
|
||||||
|
Grabs the Plex id from e.g. '/library/metadata/12987'
|
||||||
|
|
||||||
|
and returns the tuple (typus, id) where typus is either 'queueId' or
|
||||||
|
'plexId' and id is the corresponding id as a string
|
||||||
|
"""
|
||||||
|
typus = 'plexId'
|
||||||
|
if string.startswith('/library/metadata'):
|
||||||
|
try:
|
||||||
|
string = string.split('/')[3]
|
||||||
|
except IndexError:
|
||||||
|
string = ''
|
||||||
|
else:
|
||||||
|
self.logMsg('Unknown string! %s' % string, -1)
|
||||||
|
return typus, string
|
||||||
|
|
||||||
|
def processTasks(self, task):
|
||||||
|
"""
|
||||||
|
Processes tasks picked up e.g. by Companion listener
|
||||||
|
|
||||||
|
task = {
|
||||||
|
'action': 'playlist'
|
||||||
|
'data': as received from Plex companion
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
self.logMsg('Processing: %s' % task, 2)
|
||||||
|
data = task['data']
|
||||||
|
|
||||||
|
if task['action'] == 'playlist':
|
||||||
|
try:
|
||||||
|
_, queueId, query = ParseContainerKey(data['containerKey'])
|
||||||
|
except Exception as e:
|
||||||
|
self.logMsg('Exception while processing: %s' % e, -1)
|
||||||
|
import traceback
|
||||||
|
self.logMsg("Traceback:\n%s" % traceback.format_exc(), -1)
|
||||||
|
return
|
||||||
|
if self.playlist is not None:
|
||||||
|
if self.playlist.typus != data.get('type'):
|
||||||
|
self.logMsg('Switching to Kodi playlist of type %s'
|
||||||
|
% data.get('type'), 1)
|
||||||
|
self.playlist = None
|
||||||
|
self.queueId = None
|
||||||
|
if self.playlist is None:
|
||||||
|
if data.get('type') == 'music':
|
||||||
|
self.playlist = playlist.Playlist('music')
|
||||||
|
elif data.get('type') == 'video':
|
||||||
|
self.playlist = playlist.Playlist('video')
|
||||||
|
else:
|
||||||
|
self.playlist = playlist.Playlist()
|
||||||
|
if queueId != self.queueId:
|
||||||
|
self.logMsg('New playlist received, updating!', 1)
|
||||||
|
self.queueId = queueId
|
||||||
|
xml = GetPlayQueue(queueId)
|
||||||
|
if xml in (None, 401):
|
||||||
|
self.logMsg('Could not download Plex playlist.', -1)
|
||||||
|
return
|
||||||
|
# Clear existing playlist on the Kodi side
|
||||||
|
self.playlist.clear()
|
||||||
|
items = []
|
||||||
|
for item in xml:
|
||||||
|
items.append({
|
||||||
|
'queueId': item.get('playQueueItemID'),
|
||||||
|
'plexId': item.get('ratingKey'),
|
||||||
|
'kodiId': None
|
||||||
|
})
|
||||||
|
self.playlist.playAll(
|
||||||
|
items,
|
||||||
|
startitem=self._getStartItem(data.get('key', '')),
|
||||||
|
offset=ConvertPlexToKodiTime(data.get('offset', 0)))
|
||||||
|
else:
|
||||||
|
self.logMsg('This has never happened before!', -1)
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
httpd = False
|
httpd = False
|
||||||
# Cache for quicker while loops
|
# Cache for quicker while loops
|
||||||
|
|
@ -45,6 +124,8 @@ class PlexCompanion(threading.Thread):
|
||||||
subscriptionManager = subscribers.SubscriptionManager(
|
subscriptionManager = subscribers.SubscriptionManager(
|
||||||
jsonClass, requestMgr)
|
jsonClass, requestMgr)
|
||||||
|
|
||||||
|
queue = Queue.Queue(maxsize=100)
|
||||||
|
|
||||||
if utils.settings('plexCompanion') == 'true':
|
if utils.settings('plexCompanion') == 'true':
|
||||||
self.logMsg('User activated Plex Companion', 0)
|
self.logMsg('User activated Plex Companion', 0)
|
||||||
# Start up httpd
|
# Start up httpd
|
||||||
|
|
@ -56,7 +137,7 @@ class PlexCompanion(threading.Thread):
|
||||||
subscriptionManager,
|
subscriptionManager,
|
||||||
jsonClass,
|
jsonClass,
|
||||||
self.settings,
|
self.settings,
|
||||||
self.queue,
|
queue,
|
||||||
('', self.settings['myport']),
|
('', self.settings['myport']),
|
||||||
listener.MyHandler)
|
listener.MyHandler)
|
||||||
httpd.timeout = 0.95
|
httpd.timeout = 0.95
|
||||||
|
|
@ -105,11 +186,19 @@ class PlexCompanion(threading.Thread):
|
||||||
subscriptionManager.serverlist = client.getServerList()
|
subscriptionManager.serverlist = client.getServerList()
|
||||||
|
|
||||||
subscriptionManager.notify()
|
subscriptionManager.notify()
|
||||||
xbmc.sleep(50)
|
|
||||||
except:
|
except:
|
||||||
log("Error in loop, continuing anyway. Traceback:", 1)
|
log("Error in loop, continuing anyway. Traceback:", 1)
|
||||||
log(traceback.format_exc(), 1)
|
log(traceback.format_exc(), 1)
|
||||||
xbmc.sleep(50)
|
# See if there's anything we need to process
|
||||||
|
try:
|
||||||
|
task = queue.get(block=False)
|
||||||
|
except Queue.Empty:
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
# Got instructions, process them
|
||||||
|
self.processTasks(task)
|
||||||
|
queue.task_done()
|
||||||
|
xbmc.sleep(10)
|
||||||
|
|
||||||
client.stop_all()
|
client.stop_all()
|
||||||
if httpd:
|
if httpd:
|
||||||
|
|
|
||||||
93
service.py
93
service.py
|
|
@ -43,11 +43,9 @@ import player
|
||||||
import videonodes
|
import videonodes
|
||||||
import websocket_client as wsc
|
import websocket_client as wsc
|
||||||
import downloadutils
|
import downloadutils
|
||||||
import playlist
|
|
||||||
|
|
||||||
import PlexAPI
|
import PlexAPI
|
||||||
import PlexCompanion
|
import PlexCompanion
|
||||||
import PlexFunctions as PF
|
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
|
@ -111,10 +109,6 @@ class Service():
|
||||||
# Set the minimum database version
|
# Set the minimum database version
|
||||||
window('plex_minDBVersion', value="1.1.5")
|
window('plex_minDBVersion', value="1.1.5")
|
||||||
|
|
||||||
# Initialize playlist/queue stuff
|
|
||||||
self.queueId = None
|
|
||||||
self.playlist = None
|
|
||||||
|
|
||||||
def getLogLevel(self):
|
def getLogLevel(self):
|
||||||
try:
|
try:
|
||||||
logLevel = int(utils.settings('logLevel'))
|
logLevel = int(utils.settings('logLevel'))
|
||||||
|
|
@ -122,79 +116,6 @@ class Service():
|
||||||
logLevel = 0
|
logLevel = 0
|
||||||
return logLevel
|
return logLevel
|
||||||
|
|
||||||
def _getStartItem(self, string):
|
|
||||||
"""
|
|
||||||
Grabs the Plex id from e.g. '/library/metadata/12987'
|
|
||||||
|
|
||||||
and returns the tuple (typus, id) where typus is either 'queueId' or
|
|
||||||
'plexId' and id is the corresponding id as a string
|
|
||||||
"""
|
|
||||||
typus = 'plexId'
|
|
||||||
if string.startswith('/library/metadata'):
|
|
||||||
try:
|
|
||||||
string = string.split('/')[3]
|
|
||||||
except IndexError:
|
|
||||||
string = ''
|
|
||||||
else:
|
|
||||||
self.logMsg('Unknown string! %s' % string, -1)
|
|
||||||
return typus, string
|
|
||||||
|
|
||||||
def processTasks(self, task):
|
|
||||||
"""
|
|
||||||
Processes tasks picked up e.g. by Companion listener
|
|
||||||
|
|
||||||
task = {
|
|
||||||
'action': 'playlist'
|
|
||||||
'data': as received from Plex companion
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
self.logMsg('Processing: %s' % task, 2)
|
|
||||||
data = task['data']
|
|
||||||
|
|
||||||
if task['action'] == 'playlist':
|
|
||||||
try:
|
|
||||||
_, queueId, query = PF.ParseContainerKey(data['containerKey'])
|
|
||||||
except Exception as e:
|
|
||||||
self.logMsg('Exception while processing: %s' % e, -1)
|
|
||||||
import traceback
|
|
||||||
self.logMsg("Traceback:\n%s" % traceback.format_exc(), -1)
|
|
||||||
return
|
|
||||||
if self.playlist is not None:
|
|
||||||
if self.playlist.typus != data.get('type'):
|
|
||||||
self.logMsg('Switching to Kodi playlist of type %s'
|
|
||||||
% data.get('type'), 1)
|
|
||||||
self.playlist = None
|
|
||||||
self.queueId = None
|
|
||||||
if self.playlist is None:
|
|
||||||
if data.get('type') == 'music':
|
|
||||||
self.playlist = playlist.Playlist('music')
|
|
||||||
elif data.get('type') == 'video':
|
|
||||||
self.playlist = playlist.Playlist('video')
|
|
||||||
else:
|
|
||||||
self.playlist = playlist.Playlist()
|
|
||||||
if queueId != self.queueId:
|
|
||||||
self.logMsg('New playlist received, updating!', 1)
|
|
||||||
self.queueId = queueId
|
|
||||||
xml = PF.GetPlayQueue(queueId)
|
|
||||||
if xml in (None, 401):
|
|
||||||
self.logMsg('Could not download Plex playlist.', -1)
|
|
||||||
return
|
|
||||||
# Clear existing playlist on the Kodi side
|
|
||||||
self.playlist.clear()
|
|
||||||
items = []
|
|
||||||
for item in xml:
|
|
||||||
items.append({
|
|
||||||
'queueId': item.get('playQueueItemID'),
|
|
||||||
'plexId': item.get('ratingKey'),
|
|
||||||
'kodiId': None
|
|
||||||
})
|
|
||||||
self.playlist.playAll(
|
|
||||||
items,
|
|
||||||
startitem=self._getStartItem(data.get('key', '')),
|
|
||||||
offset=PF.ConvertPlexToKodiTime(data.get('offset', 0)))
|
|
||||||
else:
|
|
||||||
self.logMsg('This has never happened before!', -1)
|
|
||||||
|
|
||||||
def ServiceEntryPoint(self):
|
def ServiceEntryPoint(self):
|
||||||
|
|
||||||
log = self.logMsg
|
log = self.logMsg
|
||||||
|
|
@ -211,8 +132,6 @@ class Service():
|
||||||
|
|
||||||
# Queue for background sync
|
# Queue for background sync
|
||||||
queue = Queue.Queue(maxsize=200)
|
queue = Queue.Queue(maxsize=200)
|
||||||
# Queue for PlexCompanion listener
|
|
||||||
companionQueue = Queue.Queue(maxsize=100)
|
|
||||||
|
|
||||||
connectMsg = True if utils.settings('connectMsg') == 'true' else False
|
connectMsg = True if utils.settings('connectMsg') == 'true' else False
|
||||||
|
|
||||||
|
|
@ -276,14 +195,7 @@ class Service():
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log("Exception in Playback Monitor Service: %s" % e, 1)
|
log("Exception in Playback Monitor Service: %s" % e, 1)
|
||||||
pass
|
pass
|
||||||
try:
|
|
||||||
task = companionQueue.get(block=False)
|
|
||||||
except Queue.Empty:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
# Got instructions from Plex Companions, process them
|
|
||||||
self.processTasks(task)
|
|
||||||
companionQueue.task_done()
|
|
||||||
if not self.kodimonitor_running:
|
if not self.kodimonitor_running:
|
||||||
# Start up events
|
# Start up events
|
||||||
self.warn_auth = True
|
self.warn_auth = True
|
||||||
|
|
@ -311,8 +223,7 @@ class Service():
|
||||||
# Start the Plex Companion thread
|
# Start the Plex Companion thread
|
||||||
if not self.plexCompanion_running:
|
if not self.plexCompanion_running:
|
||||||
self.plexCompanion_running = True
|
self.plexCompanion_running = True
|
||||||
plexCompanion = PlexCompanion.PlexCompanion(
|
plexCompanion = PlexCompanion.PlexCompanion()
|
||||||
companionQueue)
|
|
||||||
plexCompanion.start()
|
plexCompanion.start()
|
||||||
else:
|
else:
|
||||||
if (user.currUser is None) and self.warn_auth:
|
if (user.currUser is None) and self.warn_auth:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue