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

Fix Community path

Browse Source
This commit is contained in:
Alhaziel
2019-11-27 16:37:44 +01:00
parent f90b913f09
commit a933ac584c
1 changed files with 100 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
specials/community.py
+100 -95
View File
@@ -66,7 +66,6 @@ def show_channels(item):
if file_path.startswith('http'): file_url = httptools.downloadpage(file_path, follow_redirects=True).data if file_path.startswith('http'): file_url = httptools.downloadpage(file_path, follow_redirects=True).data
elif os.path.isfile(file_path): file_url = open(file_path, "r").read() elif os.path.isfile(file_path): file_url = open(file_path, "r").read()
else: else:
support.log('KEY=',key)
item.channel_id = key item.channel_id = key
remove_channel(item) remove_channel(item)
file_url='' file_url=''
@@ -81,15 +80,15 @@ def show_channels(item):
plot = json_url['plot'] if json_url.has_key('plot') else '' plot = json_url['plot'] if json_url.has_key('plot') else ''
itemlist.append(Item(channel=item.channel, itemlist.append(Item(channel=item.channel,
title=typo(channel['channel_name'],'bold'), title=typo(channel['channel_name'],'bold'),
url=file_path, url=file_path,
thumbnail=thumbnail, thumbnail=thumbnail,
fanart=fanart, fanart=fanart,
plot=plot, plot=plot,
action='show_menu', action='show_menu',
channel_id = key, channel_id = key,
context=context, context=context,
path=path)) path=path))
autoplay.show_option(item.channel, itemlist) autoplay.show_option(item.channel, itemlist)
support.channel_config(item, itemlist) support.channel_config(item, itemlist)
@@ -119,21 +118,21 @@ def show_menu(item):
plot = '' plot = ''
itemlist.append(Item(channel=item.channel, itemlist.append(Item(channel=item.channel,
title=typo(title,'submenu' if not url else 'bold'), title=typo(title,'submenu' if not url else 'bold'),
url=url if url else item.url, url=url if url else item.url,
path=item.path, path=item.path,
thumbnail=thumbnail, thumbnail=thumbnail,
plot=plot, plot=plot,
action='submenu' if not url else 'show_menu', action='submenu' if not url else 'show_menu',
filterkey=key if not url else '' )) filterkey=key if not url else '' ))
if menu.has_key('search'): if menu.has_key('search'):
itemlist.append(Item(channel=item.channel, itemlist.append(Item(channel=item.channel,
title=typo('Cerca ' + item.fulltitle +'...','color kod bold'), title=typo('Cerca ' + item.fulltitle +'...','color kod bold'),
thumbnail=get_thumb('search.png'), thumbnail=get_thumb('search.png'),
action='search', action='search',
url=item.url, url=item.url,
path=item.path)) path=item.path))
return itemlist return itemlist
else: else:
@@ -148,15 +147,15 @@ def show_menu(item):
submenu = option['submenu'] if option.has_key('submenu') else [] submenu = option['submenu'] if option.has_key('submenu') else []
level2 = option['level2'] if option.has_key('level2') else [] level2 = option['level2'] if option.has_key('level2') else []
itemlist.append(Item(channel=item.channel, itemlist.append(Item(channel=item.channel,
title=format_title(option['title']), title=format_title(option['title']),
fulltitle=option['title'], fulltitle=option['title'],
thumbnail=thumbnail, thumbnail=thumbnail,
fanart=fanart, fanart=fanart,
plot=plot, plot=plot,
action='show_menu', action='show_menu',
url=url, url=url,
path=item.path, path=item.path,
menu=level2)) menu=level2))
if submenu: if submenu:
for key in submenu: for key in submenu:
@@ -169,22 +168,21 @@ def show_menu(item):
title = submenu[key] title = submenu[key]
thumbnail = item.thumbnail thumbnail = item.thumbnail
plot = '' plot = ''
itemlist.append(Item(channel=item.channel, itemlist.append(Item(channel=item.channel,
title=typo(title,'submenu'), title=typo(title,'submenu'),
url=url, url=url,
path=item.path, path=item.path,
thumbnail=thumbnail, thumbnail=thumbnail,
plot=plot, plot=plot,
action='submenu', action='submenu',
filterkey=key)) filterkey=key))
if submenu.has_key('search'): if submenu.has_key('search'):
itemlist.append(Item(channel=item.channel, itemlist.append(Item(channel=item.channel,
title=typo('Cerca ' + option['title'] +'...','color kod bold'), title=typo('Cerca ' + option['title'] +'...','color kod bold'),
thumbnail=get_thumb('search.png'), thumbnail=get_thumb('search.png'),
action='search', action='search',
url=url, url=url,
path=item.path)) path=item.path))
elif 'list' in key: elif 'list' in key:
# select type of list # select type of list
@@ -205,7 +203,7 @@ def show_menu(item):
elif key == "generic_list": elif key == "generic_list":
item.media_type= 'generic_list' item.media_type= 'generic_list'
itemlist += list_all(item) itemlist += list_all(item)
# add Search # add Search
if 'channel_name' in json_data: if 'channel_name' in json_data:
itemlist.append(Item(channel=item.channel, itemlist.append(Item(channel=item.channel,
@@ -233,7 +231,7 @@ def submenu(item):
media_type = item.media_type media_type = item.media_type
for media in json_data[media_type]: for media in json_data[media_type]:
if media.has_key(item.filterkey): if media.has_key(item.filterkey) and media[item.filterkey]:
if type(media[item.filterkey]) == str and media[item.filterkey] not in filter_list: if type(media[item.filterkey]) == str and media[item.filterkey] not in filter_list:
filter_list.append(media[item.filterkey]) filter_list.append(media[item.filterkey])
elif type(media[item.filterkey]) == list: elif type(media[item.filterkey]) == list:
@@ -241,6 +239,7 @@ def submenu(item):
if f not in filter_list: if f not in filter_list:
filter_list.append(f) filter_list.append(f)
filter_list.sort() filter_list.sort()
support.log(filter_list)
for filter in filter_list: for filter in filter_list:
thumbnail = '' thumbnail = ''
@@ -262,14 +261,14 @@ def submenu(item):
action='list_filtered', action='list_filtered',
thumbnail=thumbnail, thumbnail=thumbnail,
plot=plot, plot=plot,
path=item.path,
filterkey=item.filterkey, filterkey=item.filterkey,
filter=filter)) filter=filter))
return itemlist return itemlist
def list_all(item): def list_all(item):
support.log('CONTENT TYPE ', item.contentType) support.log()
if inspect.stack()[1][3] not in ['add_tvshow', 'get_episodes', 'update', 'find_episodes']: if inspect.stack()[1][3] not in ['add_tvshow', 'get_episodes', 'update', 'find_episodes']:
pagination = int(defp) if defp.isdigit() else '' pagination = int(defp) if defp.isdigit() else ''
else: pagination = '' else: pagination = ''
@@ -333,15 +332,16 @@ def list_all(item):
if inspect.stack()[1][3] != 'get_newest': if inspect.stack()[1][3] != 'get_newest':
itemlist.append( itemlist.append(
Item(channel=item.channel, Item(channel=item.channel,
action = item.action, action = item.action,
contentType=contentType, contentType=contentType,
title=typo(config.get_localized_string(30992), 'color kod bold'), title=typo(config.get_localized_string(30992), 'color kod bold'),
fulltitle= item.fulltitle, fulltitle= item.fulltitle,
show= item.show, show= item.show,
url=item.url, url=item.url,
args=item.args, args=item.args,
page=pag + 1, page=pag + 1,
thumbnail=support.thumb())) path=item.path,
thumbnail=support.thumb()))
if not 'generic_list' in json_data: if not 'generic_list' in json_data:
tmdb.set_infoLabels(itemlist, seekTmdb=True) tmdb.set_infoLabels(itemlist, seekTmdb=True)
@@ -398,35 +398,36 @@ def list_filtered(item):
action = 'episodios' action = 'episodios'
itemlist.append(Item(channel=item.channel, itemlist.append(Item(channel=item.channel,
contentType=contentType, contentType=contentType,
title=format_title(title), title=format_title(title),
fulltitle=fulltitle, fulltitle=fulltitle,
show=fulltitle, show=fulltitle,
quality=quality, quality=quality,
language=language, language=language,
plot=plot, plot=plot,
personal_plot=plot, personal_plot=plot,
thumbnail=poster, thumbnail=poster,
path=item.path, path=item.path,
url=url, url=url,
contentTitle=contentTitle, contentTitle=contentTitle,
contentSerieName=contentSerieName, contentSerieName=contentSerieName,
infoLabels=infoLabels, infoLabels=infoLabels,
action=action)) action=action))
if pagination and len(json_data[media_type]) >= pag * pagination and len(itemlist) >= pag * pagination: if pagination and len(json_data[media_type]) >= pag * pagination and len(itemlist) >= pag * pagination:
if inspect.stack()[1][3] != 'get_newest': if inspect.stack()[1][3] != 'get_newest':
itemlist.append( itemlist.append(
Item(channel=item.channel, Item(channel=item.channel,
action = item.action, action = item.action,
contentType=contentType, contentType=contentType,
title=typo(config.get_localized_string(30992), 'color kod bold'), title=typo(config.get_localized_string(30992), 'color kod bold'),
fulltitle= item.fulltitle, fulltitle= item.fulltitle,
show= item.show, show= item.show,
url=item.url, url=item.url,
args=item.args, args=item.args,
page=pag + 1, page=pag + 1,
thumbnail=support.thumb())) path=item.path,
thumbnail=support.thumb()))
if not 'generic_list' in json_data: if not 'generic_list' in json_data:
tmdb.set_infoLabels(itemlist, seekTmdb=True) tmdb.set_infoLabels(itemlist, seekTmdb=True)
@@ -457,7 +458,8 @@ def get_seasons(item):
action='episodios', action='episodios',
contentSeason=season['season'], contentSeason=season['season'],
infoLabels=infoLabels, infoLabels=infoLabels,
contentType='tvshow')) contentType='tvshow',
path=item.path))
if inspect.stack()[1][3] in ['add_tvshow', "get_seasons"] or show_seasons == False: if inspect.stack()[1][3] in ['add_tvshow', "get_seasons"] or show_seasons == False:
@@ -539,17 +541,18 @@ def episodios(item):
title = '%sx%s%s' % (season_number, episode_number, title) title = '%sx%s%s' % (season_number, episode_number, title)
if season_number == item.filter or not item.filterseason: if season_number == item.filter or not item.filterseason:
itemlist.append(Item(channel= item.channel, itemlist.append(Item(channel= item.channel,
title= format_title(title), title= format_title(title),
fulltitle = item.fulltitle, fulltitle = item.fulltitle,
show = item.show, show = item.show,
url= episode, url= episode,
action= 'findvideos', action= 'findvideos',
plot= plot, plot= plot,
thumbnail= thumbnail, thumbnail= thumbnail,
contentSeason= season_number, contentSeason= season_number,
contentEpisode= episode_number, contentEpisode= episode_number,
infoLabels= infoLabels, infoLabels= infoLabels,
contentType= 'episode')) contentType= 'episode',
path=item.path))
if show_seasons == True and inspect.stack()[1][3] not in ['add_tvshow', 'get_episodes', 'update', 'find_episodes'] and not item.filterseason: if show_seasons == True and inspect.stack()[1][3] not in ['add_tvshow', 'get_episodes', 'update', 'find_episodes'] and not item.filterseason:
@@ -569,7 +572,8 @@ def episodios(item):
action='episodios', action='episodios',
contentSeason=season, contentSeason=season,
infoLabels=infoLabels, infoLabels=infoLabels,
filterseason=season)) filterseason=season,
path=item.path))
elif pagination and len(json_data['episodes_list']) >= pag * pagination: elif pagination and len(json_data['episodes_list']) >= pag * pagination:
if inspect.stack()[1][3] != 'get_newest': if inspect.stack()[1][3] != 'get_newest':
@@ -583,7 +587,8 @@ def episodios(item):
url=item.url, url=item.url,
args=item.args, args=item.args,
page=pag + 1, page=pag + 1,
thumbnail=support.thumb())) thumbnail=support.thumb(),
path=item.path))
tmdb.set_infoLabels(itemlist, seekTmdb=True) tmdb.set_infoLabels(itemlist, seekTmdb=True)
return itemlist return itemlist