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

Move pickl_window function

Browse source
This commit is contained in:
tomkat83 2017-09-10 15:06:46 +02:00
parent 0c20716c9b
commit cb39dbd19d
3 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
default.py
View file

@ -32,9 +32,9 @@ sys_path.append(_base_resource)
############################################################################### ###############################################################################
import entrypoint import entrypoint
from utils import window, pickl_window, reset, passwordsXML, language as lang,\ from utils import window, reset, passwordsXML, language as lang, dialog, \
dialog, plex_command plex_command
from pickler import unpickle_me from pickler import unpickle_me, pickl_window
from PKC_listitem import convert_PKC_to_listitem from PKC_listitem import convert_PKC_to_listitem
import variables as v import variables as v

27
resources/lib/pickler.py
View file

@ -1,13 +1,26 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################### ###############################################################################
import logging from logging import getLogger
import cPickle as Pickle from cPickle import dumps, loads
from utils import pickl_window from xbmcgui import Window
###############################################################################
log = getLogger("PLEX."+__name__)
WINDOW = Window(10000)
############################################################################### ###############################################################################
log = logging.getLogger("PLEX."+__name__)
###############################################################################
def pickl_window(property, value=None, clear=False):
"""
Get or set window property - thread safe! For use with Pickle
Property and value must be string
"""
if clear:
WINDOW.clearProperty(property)
elif value is not None:
WINDOW.setProperty(property, value)
else:
return WINDOW.getProperty(property)
def pickle_me(obj, window_var='plex_result'): def pickle_me(obj, window_var='plex_result'):
@ -20,7 +33,7 @@ def pickle_me(obj, window_var='plex_result'):
functions won't work. See the Pickle documentation functions won't work. See the Pickle documentation
""" """
log.debug('Start pickling: %s' % obj) log.debug('Start pickling: %s' % obj)
pickl_window(window_var, value=Pickle.dumps(obj)) pickl_window(window_var, value=dumps(obj))
log.debug('Successfully pickled') log.debug('Successfully pickled')
@ -32,7 +45,7 @@ def unpickle_me(window_var='plex_result'):
result = pickl_window(window_var) result = pickl_window(window_var)
pickl_window(window_var, clear=True) pickl_window(window_var, clear=True)
log.debug('Start unpickling') log.debug('Start unpickling')
obj = Pickle.loads(result) obj = loads(result)
log.debug('Successfully unpickled: %s' % obj) log.debug('Successfully unpickled: %s' % obj)
return obj return obj

18
resources/lib/utils.py
View file

@ -59,24 +59,6 @@ def window(property, value=None, clear=False, windowid=10000):
return tryDecode(win.getProperty(property)) return tryDecode(win.getProperty(property))
def pickl_window(property, value=None, clear=False, windowid=10000):
"""
Get or set window property - thread safe! For use with Pickle
Property and value must be string
"""
if windowid != 10000:
win = xbmcgui.Window(windowid)
else:
win = WINDOW
if clear:
win.clearProperty(property)
elif value is not None:
win.setProperty(property, value)
else:
return win.getProperty(property)
def plex_command(key, value): def plex_command(key, value):
""" """
Used to funnel states between different Python instances. NOT really thread Used to funnel states between different Python instances. NOT really thread