stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
marco
2019-12-12 18:23:19 +01:00
parent 8b6d5049a0 3b04a93363
commit e2b6ff47cf
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channelselector.py
View File

@@ -187,7 +187,10 @@ def get_thumb(thumb_name, view="thumb_", auto=False):
if config.get_setting('enable_custom_theme') and config.get_setting('custom_theme') and os.path.isfile(config.get_setting('custom_theme') + view + thumb_name):
media_path = config.get_setting('custom_theme')
thumbnail = os.path.join(media_path, view + thumb_name)
if thumb_name.startswith('http'):
thumbnail = thumb_name
else:
thumbnail = os.path.join(media_path, view + thumb_name)
if 'http' in thumbnail:
thumbnail = thumbnail.replace('\\','/')
return thumbnail

2
core/channeltoolsDB.py
View File

@@ -22,7 +22,7 @@ def filter(category, language='all', adult=False):
if channel[col] and col in ['categories', 'language']:
el[col] = channel[col].split(',')
elif col == 'thumbnail': # remote thumbnail
el[col] = os.path.join(thumb_path, 'resources', "thumb", channel[col])
el[col] = channel[col] if channel[col].startswith('http') else os.path.join(thumb_path, 'resources', "thumb", channel[col])
elif channel[col]:
el[col] = channel[col]
else: