Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove log and __init__ functions from API()

This commit is contained in:
faush01 2015-03-20 11:58:58 +11:00
parent 83213e745e
commit d1aabaf803
1 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
resources/lib/API.py
View File

@ -7,31 +7,6 @@ import xbmcgui
import xbmcaddon import xbmcaddon
class API(): class API():
logLevel = 0
addonSettings = None
getString = None
LogCalls = False
TrackLog = ""
TotalUrlCalls = 0
def __init__(self, *args):
self.addonSettings = xbmcaddon.Addon(id='plugin.video.mb3sync')
self.getString = self.addonSettings.getLocalizedString
level = self.addonSettings.getSetting('logLevel')
self.logLevel = 0
if(level != None and level != ""):
self.logLevel = int(level)
if(self.logLevel == 2):
self.LogCalls = True
def logMsg(self, msg, level = 1):
if(self.logLevel >= level):
try:
xbmc.log("mb3sync DownloadUtils -> " + str(msg))
except UnicodeEncodeError:
try:
xbmc.log("mb3sync DownloadUtils -> " + str(msg.encode('utf-8')))
except: pass
def getPeople(self, item): def getPeople(self, item):
# Process People # Process People
@ -277,6 +252,7 @@ class API():
def getArtwork(self, data, type, index = "0", userParentInfo = False): def getArtwork(self, data, type, index = "0", userParentInfo = False):
addonSettings = xbmcaddon.Addon(id='plugin.video.mb3sync')
id = data.get("Id") id = data.get("Id")
getSeriesData = False getSeriesData = False
userData = data.get("UserData") userData = data.get("UserData")
@ -285,7 +261,7 @@ class API():
if data.get("Type") == "Season" or data.get("Type")== "Episode": if data.get("Type") == "Season" or data.get("Type")== "Episode":
id = data.get("SeriesId") id = data.get("SeriesId")
getSeriesData = True getSeriesData = True
elif type == "poster" and data.get("Type") == "Episode" and self.addonSettings.getSetting('useSeasonPoster')=='true': # Change the Id to the Season to get the season poster elif type == "poster" and data.get("Type") == "Episode" and addonSettings.getSetting('useSeasonPoster')=='true': # Change the Id to the Season to get the season poster
id = data.get("SeasonId") id = data.get("SeasonId")
if type == "poster" or type == "tvshow.poster": # Now that the Ids are right, change type to MB3 name if type == "poster" or type == "tvshow.poster": # Now that the Ids are right, change type to MB3 name
type="Primary" type="Primary"
@ -338,21 +314,19 @@ class API():
index = str(randrange(0,totalbackdrops)) index = str(randrange(0,totalbackdrops))
# use the local image proxy server that is made available by this addons service # use the local image proxy server that is made available by this addons service
port = self.addonSettings.getSetting('port') port = addonSettings.getSetting('port')
host = self.addonSettings.getSetting('ipaddress') host = addonSettings.getSetting('ipaddress')
server = host + ":" + port server = host + ":" + port
if self.addonSettings.getSetting('compressArt')=='true': if addonSettings.getSetting('compressArt')=='true':
query = query + "&Quality=90" query = query + "&Quality=90"
if imageTag == None: if imageTag == None:
imageTag = "e3ab56fe27d389446754d0fb04910a34" imageTag = "e3ab56fe27d389446754d0fb04910a34"
artwork = "http://" + server + "/mediabrowser/Items/" + str(id) + "/Images/" + type + "/" + index + "/" + imageTag + "/original/" + width + "/" + height + "/" + played + "?" + query artwork = "http://" + server + "/mediabrowser/Items/" + str(id) + "/Images/" + type + "/" + index + "/" + imageTag + "/original/" + width + "/" + height + "/" + played + "?" + query
if self.addonSettings.getSetting('disableCoverArt')=='true': if addonSettings.getSetting('disableCoverArt')=='true':
artwork = artwork + "&EnableImageEnhancers=false" artwork = artwork + "&EnableImageEnhancers=false"
self.logMsg("getArtwork : " + artwork, level=2)
# do not return non-existing images # do not return non-existing images
if ( (type!="Backdrop" and imageTag=="e3ab56fe27d389446754d0fb04910a34") | #Remember, this is the placeholder tag, meaning we didn't find a valid tag if ( (type!="Backdrop" and imageTag=="e3ab56fe27d389446754d0fb04910a34") | #Remember, this is the placeholder tag, meaning we didn't find a valid tag
(type=="Backdrop" and data.get("BackdropImageTags") != None and len(data.get("BackdropImageTags")) == 0) | (type=="Backdrop" and data.get("BackdropImageTags") != None and len(data.get("BackdropImageTags")) == 0) |
@ -365,9 +339,10 @@ class API():
def getUserArtwork(self, data, type, index = "0"): def getUserArtwork(self, data, type, index = "0"):
addonSettings = xbmcaddon.Addon(id='plugin.video.mb3sync')
id = data.get("Id") id = data.get("Id")
port = self.addonSettings.getSetting('port') port = addonSettings.getSetting('port')
host = self.addonSettings.getSetting('ipaddress') host = addonSettings.getSetting('ipaddress')
server = host + ":" + port server = host + ":" + port
artwork = "http://" + server + "/mediabrowser/Users/" + str(id) + "/Images/" + type + "?Format=original" artwork = "http://" + server + "/mediabrowser/Users/" + str(id) + "/Images/" + type + "?Format=original"