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

Merge conflicts clientinfo.py

Browse source
This commit is contained in:
tomkat83 2016-08-29 19:45:26 +02:00
parent ea35c473cb
commit b2f38c1a57
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
resources/lib/clientinfo.py
View file

@ -3,18 +3,20 @@
############################################################################### ###############################################################################
import logging import logging
import os
from uuid import uuid4 from uuid import uuid4
import xbmc import xbmc
import xbmcaddon import xbmcaddon
from utils import logging, window, settings, tryDecode from utils import window, settings, tryDecode
###############################################################################
log = logging.getLogger("PLEX."+__name__)
############################################################################### ###############################################################################
@logging
class ClientInfo(): class ClientInfo():
def __init__(self): def __init__(self):
@ -114,13 +116,12 @@ class ClientInfo():
# Because Kodi appears to cache file settings!! # Because Kodi appears to cache file settings!!
if clientId != "" and reset is False: if clientId != "" and reset is False:
window('plex_client_Id', value=clientId) window('plex_client_Id', value=clientId)
self.logMsg("Unique device Id plex_client_Id loaded: %s" log.warn("Unique device Id plex_client_Id loaded: %s" % clientId)
% clientId, 1)
return clientId return clientId
self.logMsg("Generating a new deviceid.", 0) log.warn("Generating a new deviceid.")
clientId = str(uuid4()) clientId = str(uuid4())
settings('plex_client_Id', value=clientId) settings('plex_client_Id', value=clientId)
window('plex_client_Id', value=clientId) window('plex_client_Id', value=clientId)
self.logMsg("Unique device Id plex_client_Id loaded: %s" % clientId, 1) log.warn("Unique device Id plex_client_Id loaded: %s" % clientId)
return clientId return clientId