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

Optimize companion imports

Browse source
This commit is contained in:
tomkat83 2016-12-20 16:38:04 +01:00
parent 9d2cf86091
commit 95c87065ed
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
resources/lib/PlexCompanion.py
View file

@ -1,11 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import logging import logging
import threading from threading import Thread
import traceback
import socket
import Queue import Queue
from socket import SHUT_RDWR
import xbmc from xbmc import sleep
from utils import settings, ThreadMethodsAdditionalSuspend, ThreadMethods from utils import settings, ThreadMethodsAdditionalSuspend, ThreadMethods
from plexbmchelper import listener, plexgdm, subscribers, functions, \ from plexbmchelper import listener, plexgdm, subscribers, functions, \
@ -24,7 +23,7 @@ log = logging.getLogger("PLEX."+__name__)
@ThreadMethodsAdditionalSuspend('plex_serverStatus') @ThreadMethodsAdditionalSuspend('plex_serverStatus')
@ThreadMethods @ThreadMethods
class PlexCompanion(threading.Thread): class PlexCompanion(Thread):
""" """
Initialize with a Queue for callbacks Initialize with a Queue for callbacks
""" """
@ -41,7 +40,7 @@ class PlexCompanion(threading.Thread):
# kodi player instance # kodi player instance
self.player = player.Player() self.player = player.Player()
threading.Thread.__init__(self) Thread.__init__(self)
def _getStartItem(self, string): def _getStartItem(self, string):
""" """
@ -151,9 +150,10 @@ class PlexCompanion(threading.Thread):
break break
except: except:
log.error("Unable to start PlexCompanion. Traceback:") log.error("Unable to start PlexCompanion. Traceback:")
import traceback
log.error(traceback.print_exc()) log.error(traceback.print_exc())
xbmc.sleep(3000) sleep(3000)
if start_count == 3: if start_count == 3:
log.error("Error: Unable to start web helper.") log.error("Error: Unable to start web helper.")
@ -168,7 +168,7 @@ class PlexCompanion(threading.Thread):
message_count = 0 message_count = 0
if httpd: if httpd:
t = threading.Thread(target=httpd.handle_request) t = Thread(target=httpd.handle_request)
while not threadStopped(): while not threadStopped():
# If we are not authorized, sleep # If we are not authorized, sleep
@ -177,13 +177,13 @@ class PlexCompanion(threading.Thread):
while threadSuspended(): while threadSuspended():
if threadStopped(): if threadStopped():
break break
xbmc.sleep(1000) sleep(1000)
try: try:
message_count += 1 message_count += 1
if httpd: if httpd:
if not t.isAlive(): if not t.isAlive():
# Use threads cause the method will stall # Use threads cause the method will stall
t = threading.Thread(target=httpd.handle_request) t = Thread(target=httpd.handle_request)
t.start() t.start()
if message_count == 3000: if message_count == 3000:
@ -202,6 +202,7 @@ class PlexCompanion(threading.Thread):
message_count = 0 message_count = 0
except: except:
log.warn("Error in loop, continuing anyway. Traceback:") log.warn("Error in loop, continuing anyway. Traceback:")
import traceback
log.warn(traceback.format_exc()) log.warn(traceback.format_exc())
# See if there's anything we need to process # See if there's anything we need to process
try: try:
@ -214,12 +215,12 @@ class PlexCompanion(threading.Thread):
queue.task_done() queue.task_done()
# Don't sleep # Don't sleep
continue continue
xbmc.sleep(20) sleep(20)
client.stop_all() client.stop_all()
if httpd: if httpd:
try: try:
httpd.socket.shutdown(socket.SHUT_RDWR) httpd.socket.shutdown(SHUT_RDWR)
except: except:
pass pass
finally: finally: