Merge remote-tracking branch 'origin/master'
This commit is contained in:
marco
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<settings>
|
||||
<!-- General -->
|
||||
<category label="70168">
|
||||
<setting id="player_mode" type="enum" values="Direct|SetResolvedUrl|Built-In|Download and Play" label="30044" default="1"/>
|
||||
<setting id="default_action" type="enum" lvalues="30006|30007|30008" label="30005" default="0"/>
|
||||
@@ -26,13 +27,7 @@
|
||||
<setting id="adult_aux_new_password2" type="text" label="70117" option="hidden" enable="!eq(-1,)" default=""/>
|
||||
</category>
|
||||
|
||||
<!-- Path downloads -->
|
||||
<category label="30153">
|
||||
<setting id="downloadenabled" type="bool" label="70689" default="false"/>
|
||||
<setting id="downloadpath" type="folder" label="30017" visible="eq(-1,true)" default=""/>
|
||||
<setting id="downloadlistpath" type="folder" label="30018" visible="eq(-2,true)" default=""/>
|
||||
</category>
|
||||
|
||||
<!-- Homepage -->
|
||||
<category label="70715">
|
||||
<setting label="70716" type="lsep"/>
|
||||
<setting id="enable_news_menu" label="30130" type="bool" default="true"/>
|
||||
@@ -44,6 +39,7 @@
|
||||
<setting id="enable_library_menu" label="30131" type="bool" default="true"/>
|
||||
</category>
|
||||
|
||||
<!-- Videolibrary -->
|
||||
<category label="30131">
|
||||
<!-- <setting id="downloadpath" type="folder" label="30017" default=""/>
|
||||
<setting id="downloadlistpath" type="folder" label="30018" default=""/> -->
|
||||
@@ -57,23 +53,23 @@
|
||||
<setting id="videolibrary_kodi" type="bool" label="70120" enable="lt(-1,2)+eq(0,false)" default="false"/>
|
||||
<setting id="videolibrary_max_quality" type="bool" label="70729" default="false" visible="true"/>
|
||||
</category>
|
||||
<category label="70121">
|
||||
<setting id="start_page" type="bool" label="70121" default="false"/>
|
||||
<setting id="custom_start" type="bool" label="70122" default="false"
|
||||
visible="eq(-1,True)"/>
|
||||
<setting id="news_start" type="bool" label="70123" default="false" visible="eq(-2,True)"
|
||||
enable="eq(-1,False)+eq(-2,True"/>
|
||||
<setting id="category" type="labelenum" label="70124"
|
||||
lvalues="70137|30123|30124|60513"
|
||||
default="Film" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/>
|
||||
</category>
|
||||
|
||||
|
||||
<!-- Downloads -->
|
||||
<category label="30153">
|
||||
<setting id="downloadenabled" type="bool" label="70689" default="false"/>
|
||||
<setting id="downloadpath" type="folder" label="30017" visible="eq(-1,true)" default=""/>
|
||||
<setting id="downloadlistpath" type="folder" label="30018" visible="eq(-2,true)" default=""/>
|
||||
</category>
|
||||
|
||||
<!-- Visual -->
|
||||
<category label="70126">
|
||||
<setting id="icon_set" type="labelenum" label="70108" values="default|light|dark|alfa|mike" default="default"/>
|
||||
<setting id="enable_custom_theme" type="bool" label="70564" default="false"/>
|
||||
<setting id="custom_theme" type="folder" label="70565" default="" visible="eq(-1,true)"/>
|
||||
<setting id="infoplus_set" type="labelenum" label="70128" lvalues="70129|70130" default="70129"/>
|
||||
<setting id="video_thumbnail_type" type="enum" label="70131" lvalues="70132|70133" default="0"/>
|
||||
<setting label="70167" type="lsep"/>
|
||||
<!-- <setting label="70167" type="lsep"/>
|
||||
<setting id="unify" type="bool" label="70134" default="false"/>
|
||||
<setting id="title_color" type="bool" label="70135" default="false" visible="eq(-1,true)"/>
|
||||
<setting id="movie_color" type="labelenum" label="70137"
|
||||
@@ -126,14 +122,15 @@
|
||||
default="white" visible="eq(-16,true)+eq(-17,true)"/>
|
||||
<setting id="no_update_color" type="labelenum" label="70148"
|
||||
values="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
|
||||
default="white" visible="eq(-17,true)+eq(-18,true)"/>
|
||||
</category>
|
||||
default="white" visible="eq(-17,true)+eq(-18,true)"/> -->
|
||||
</category>
|
||||
<!-- Other -->
|
||||
<category label="70149">
|
||||
<setting label="70150" type="lsep"/>
|
||||
<setting id="infoplus" type="bool" label="70151" default="true"/>
|
||||
<setting id="extended_info" type="bool" label="70152" default="false"/>
|
||||
|
||||
<setting label="70153" type="lsep"/>
|
||||
<setting label="70153" type="lsep"/>
|
||||
<setting id="shortcut_key" type="action" label="30999" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAia2V5bWFwIg0KfQ==)"/>
|
||||
<setting id="delete_key" type="action" label="31000" action="RunPlugin(plugin://plugin.video.kod/?ewogICAgImFjdGlvbiI6ICJkZWxldGVfa2V5Igp9==)"/>
|
||||
|
||||
@@ -148,16 +145,28 @@
|
||||
<setting type="sep"/>
|
||||
<setting label="70578" type="lsep"/>
|
||||
<setting id="httptools_timeout" type="labelenum" values="0|5|10|15|20|25|30" label="70580" default="15"/>
|
||||
|
||||
|
||||
<setting type="sep"/>
|
||||
<setting label="70579" type="lsep"/>
|
||||
<setting id="addon_update_enabled" type="bool" label="70581" default="true"/>
|
||||
<setting id="addon_update_message" type="bool" label="70582" default="true"/>
|
||||
|
||||
<setting label="Lista activa" type="text" id="lista_activa" default="kodfavorites-default.json" visible="false"/>
|
||||
|
||||
<setting type="sep"/>
|
||||
|
||||
<!-- <setting type="sep"/>
|
||||
<setting label="70583" type="lsep"/>
|
||||
<setting id="addon_quasar_update" type="bool" label="70584" default="false"/>
|
||||
<setting id="addon_quasar_update" type="bool" label="70584" default="false"/> -->
|
||||
</category>
|
||||
<!-- Custom Start -->
|
||||
<category label="70121">
|
||||
<setting id="start_page" type="bool" label="70121" default="false"/>
|
||||
<setting id="custom_start" type="bool" label="70122" default="false"
|
||||
visible="eq(-1,True)"/>
|
||||
<setting id="news_start" type="bool" label="70123" default="false" visible="eq(-2,True)"
|
||||
enable="eq(-1,False)+eq(-2,True"/>
|
||||
<setting id="category" type="labelenum" label="70124"
|
||||
lvalues="70137|30123|30124|60513"
|
||||
default="Film" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/>
|
||||
|
||||
</category>
|
||||
</settings>
|
||||
|
||||
@@ -66,7 +66,6 @@ def show_channels(item):
|
||||
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()
|
||||
else:
|
||||
support.log('KEY=',key)
|
||||
item.channel_id = key
|
||||
remove_channel(item)
|
||||
file_url=''
|
||||
@@ -81,15 +80,15 @@ def show_channels(item):
|
||||
plot = json_url['plot'] if json_url.has_key('plot') else ''
|
||||
|
||||
itemlist.append(Item(channel=item.channel,
|
||||
title=typo(channel['channel_name'],'bold'),
|
||||
url=file_path,
|
||||
thumbnail=thumbnail,
|
||||
fanart=fanart,
|
||||
plot=plot,
|
||||
action='show_menu',
|
||||
channel_id = key,
|
||||
context=context,
|
||||
path=path))
|
||||
title=typo(channel['channel_name'],'bold'),
|
||||
url=file_path,
|
||||
thumbnail=thumbnail,
|
||||
fanart=fanart,
|
||||
plot=plot,
|
||||
action='show_menu',
|
||||
channel_id = key,
|
||||
context=context,
|
||||
path=path))
|
||||
|
||||
autoplay.show_option(item.channel, itemlist)
|
||||
support.channel_config(item, itemlist)
|
||||
@@ -119,21 +118,21 @@ def show_menu(item):
|
||||
plot = ''
|
||||
|
||||
itemlist.append(Item(channel=item.channel,
|
||||
title=typo(title,'submenu' if not url else 'bold'),
|
||||
url=url if url else item.url,
|
||||
path=item.path,
|
||||
thumbnail=thumbnail,
|
||||
plot=plot,
|
||||
action='submenu' if not url else 'show_menu',
|
||||
filterkey=key if not url else '' ))
|
||||
title=typo(title,'submenu' if not url else 'bold'),
|
||||
url=url if url else item.url,
|
||||
path=item.path,
|
||||
thumbnail=thumbnail,
|
||||
plot=plot,
|
||||
action='submenu' if not url else 'show_menu',
|
||||
filterkey=key if not url else '' ))
|
||||
|
||||
if menu.has_key('search'):
|
||||
itemlist.append(Item(channel=item.channel,
|
||||
title=typo('Cerca ' + item.fulltitle +'...','color kod bold'),
|
||||
thumbnail=get_thumb('search.png'),
|
||||
action='search',
|
||||
url=item.url,
|
||||
path=item.path))
|
||||
title=typo('Cerca ' + item.fulltitle +'...','color kod bold'),
|
||||
thumbnail=get_thumb('search.png'),
|
||||
action='search',
|
||||
url=item.url,
|
||||
path=item.path))
|
||||
return itemlist
|
||||
|
||||
else:
|
||||
@@ -148,15 +147,15 @@ def show_menu(item):
|
||||
submenu = option['submenu'] if option.has_key('submenu') else []
|
||||
level2 = option['level2'] if option.has_key('level2') else []
|
||||
itemlist.append(Item(channel=item.channel,
|
||||
title=format_title(option['title']),
|
||||
fulltitle=option['title'],
|
||||
thumbnail=thumbnail,
|
||||
fanart=fanart,
|
||||
plot=plot,
|
||||
action='show_menu',
|
||||
url=url,
|
||||
path=item.path,
|
||||
menu=level2))
|
||||
title=format_title(option['title']),
|
||||
fulltitle=option['title'],
|
||||
thumbnail=thumbnail,
|
||||
fanart=fanart,
|
||||
plot=plot,
|
||||
action='show_menu',
|
||||
url=url,
|
||||
path=item.path,
|
||||
menu=level2))
|
||||
|
||||
if submenu:
|
||||
for key in submenu:
|
||||
@@ -169,22 +168,21 @@ def show_menu(item):
|
||||
title = submenu[key]
|
||||
thumbnail = item.thumbnail
|
||||
plot = ''
|
||||
|
||||
itemlist.append(Item(channel=item.channel,
|
||||
title=typo(title,'submenu'),
|
||||
url=url,
|
||||
path=item.path,
|
||||
thumbnail=thumbnail,
|
||||
plot=plot,
|
||||
action='submenu',
|
||||
filterkey=key))
|
||||
title=typo(title,'submenu'),
|
||||
url=url,
|
||||
path=item.path,
|
||||
thumbnail=thumbnail,
|
||||
plot=plot,
|
||||
action='submenu',
|
||||
filterkey=key))
|
||||
if submenu.has_key('search'):
|
||||
itemlist.append(Item(channel=item.channel,
|
||||
title=typo('Cerca ' + option['title'] +'...','color kod bold'),
|
||||
thumbnail=get_thumb('search.png'),
|
||||
action='search',
|
||||
url=url,
|
||||
path=item.path))
|
||||
title=typo('Cerca ' + option['title'] +'...','color kod bold'),
|
||||
thumbnail=get_thumb('search.png'),
|
||||
action='search',
|
||||
url=url,
|
||||
path=item.path))
|
||||
|
||||
elif 'list' in key:
|
||||
# select type of list
|
||||
@@ -205,7 +203,7 @@ def show_menu(item):
|
||||
elif key == "generic_list":
|
||||
item.media_type= 'generic_list'
|
||||
itemlist += list_all(item)
|
||||
|
||||
|
||||
# add Search
|
||||
if 'channel_name' in json_data:
|
||||
itemlist.append(Item(channel=item.channel,
|
||||
@@ -233,7 +231,7 @@ def submenu(item):
|
||||
media_type = item.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:
|
||||
filter_list.append(media[item.filterkey])
|
||||
elif type(media[item.filterkey]) == list:
|
||||
@@ -241,6 +239,7 @@ def submenu(item):
|
||||
if f not in filter_list:
|
||||
filter_list.append(f)
|
||||
filter_list.sort()
|
||||
support.log(filter_list)
|
||||
|
||||
for filter in filter_list:
|
||||
thumbnail = ''
|
||||
@@ -262,14 +261,14 @@ def submenu(item):
|
||||
action='list_filtered',
|
||||
thumbnail=thumbnail,
|
||||
plot=plot,
|
||||
path=item.path,
|
||||
filterkey=item.filterkey,
|
||||
filter=filter))
|
||||
return itemlist
|
||||
|
||||
|
||||
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']:
|
||||
pagination = int(defp) if defp.isdigit() else ''
|
||||
else: pagination = ''
|
||||
@@ -333,15 +332,16 @@ def list_all(item):
|
||||
if inspect.stack()[1][3] != 'get_newest':
|
||||
itemlist.append(
|
||||
Item(channel=item.channel,
|
||||
action = item.action,
|
||||
contentType=contentType,
|
||||
title=typo(config.get_localized_string(30992), 'color kod bold'),
|
||||
fulltitle= item.fulltitle,
|
||||
show= item.show,
|
||||
url=item.url,
|
||||
args=item.args,
|
||||
page=pag + 1,
|
||||
thumbnail=support.thumb()))
|
||||
action = item.action,
|
||||
contentType=contentType,
|
||||
title=typo(config.get_localized_string(30992), 'color kod bold'),
|
||||
fulltitle= item.fulltitle,
|
||||
show= item.show,
|
||||
url=item.url,
|
||||
args=item.args,
|
||||
page=pag + 1,
|
||||
path=item.path,
|
||||
thumbnail=support.thumb()))
|
||||
|
||||
if not 'generic_list' in json_data:
|
||||
tmdb.set_infoLabels(itemlist, seekTmdb=True)
|
||||
@@ -398,35 +398,36 @@ def list_filtered(item):
|
||||
action = 'episodios'
|
||||
|
||||
itemlist.append(Item(channel=item.channel,
|
||||
contentType=contentType,
|
||||
title=format_title(title),
|
||||
fulltitle=fulltitle,
|
||||
show=fulltitle,
|
||||
quality=quality,
|
||||
language=language,
|
||||
plot=plot,
|
||||
personal_plot=plot,
|
||||
thumbnail=poster,
|
||||
path=item.path,
|
||||
url=url,
|
||||
contentTitle=contentTitle,
|
||||
contentSerieName=contentSerieName,
|
||||
infoLabels=infoLabels,
|
||||
action=action))
|
||||
contentType=contentType,
|
||||
title=format_title(title),
|
||||
fulltitle=fulltitle,
|
||||
show=fulltitle,
|
||||
quality=quality,
|
||||
language=language,
|
||||
plot=plot,
|
||||
personal_plot=plot,
|
||||
thumbnail=poster,
|
||||
path=item.path,
|
||||
url=url,
|
||||
contentTitle=contentTitle,
|
||||
contentSerieName=contentSerieName,
|
||||
infoLabels=infoLabels,
|
||||
action=action))
|
||||
|
||||
if pagination and len(json_data[media_type]) >= pag * pagination and len(itemlist) >= pag * pagination:
|
||||
if inspect.stack()[1][3] != 'get_newest':
|
||||
itemlist.append(
|
||||
Item(channel=item.channel,
|
||||
action = item.action,
|
||||
contentType=contentType,
|
||||
title=typo(config.get_localized_string(30992), 'color kod bold'),
|
||||
fulltitle= item.fulltitle,
|
||||
show= item.show,
|
||||
url=item.url,
|
||||
args=item.args,
|
||||
page=pag + 1,
|
||||
thumbnail=support.thumb()))
|
||||
action = item.action,
|
||||
contentType=contentType,
|
||||
title=typo(config.get_localized_string(30992), 'color kod bold'),
|
||||
fulltitle= item.fulltitle,
|
||||
show= item.show,
|
||||
url=item.url,
|
||||
args=item.args,
|
||||
page=pag + 1,
|
||||
path=item.path,
|
||||
thumbnail=support.thumb()))
|
||||
|
||||
if not 'generic_list' in json_data:
|
||||
tmdb.set_infoLabels(itemlist, seekTmdb=True)
|
||||
@@ -457,7 +458,8 @@ def get_seasons(item):
|
||||
action='episodios',
|
||||
contentSeason=season['season'],
|
||||
infoLabels=infoLabels,
|
||||
contentType='tvshow'))
|
||||
contentType='tvshow',
|
||||
path=item.path))
|
||||
|
||||
|
||||
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)
|
||||
if season_number == item.filter or not item.filterseason:
|
||||
itemlist.append(Item(channel= item.channel,
|
||||
title= format_title(title),
|
||||
fulltitle = item.fulltitle,
|
||||
show = item.show,
|
||||
url= episode,
|
||||
action= 'findvideos',
|
||||
plot= plot,
|
||||
thumbnail= thumbnail,
|
||||
contentSeason= season_number,
|
||||
contentEpisode= episode_number,
|
||||
infoLabels= infoLabels,
|
||||
contentType= 'episode'))
|
||||
title= format_title(title),
|
||||
fulltitle = item.fulltitle,
|
||||
show = item.show,
|
||||
url= episode,
|
||||
action= 'findvideos',
|
||||
plot= plot,
|
||||
thumbnail= thumbnail,
|
||||
contentSeason= season_number,
|
||||
contentEpisode= episode_number,
|
||||
infoLabels= infoLabels,
|
||||
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:
|
||||
@@ -569,7 +572,8 @@ def episodios(item):
|
||||
action='episodios',
|
||||
contentSeason=season,
|
||||
infoLabels=infoLabels,
|
||||
filterseason=season))
|
||||
filterseason=season,
|
||||
path=item.path))
|
||||
|
||||
elif pagination and len(json_data['episodes_list']) >= pag * pagination:
|
||||
if inspect.stack()[1][3] != 'get_newest':
|
||||
@@ -583,7 +587,8 @@ def episodios(item):
|
||||
url=item.url,
|
||||
args=item.args,
|
||||
page=pag + 1,
|
||||
thumbnail=support.thumb()))
|
||||
thumbnail=support.thumb(),
|
||||
path=item.path))
|
||||
|
||||
tmdb.set_infoLabels(itemlist, seekTmdb=True)
|
||||
return itemlist
|
||||
|
||||
Reference in New Issue
Block a user