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

Alcuni Fix e cambiamenti

Browse Source
This commit is contained in:
Alhaziel01
2021-07-08 19:26:35 +02:00
parent 841c68fb86
commit 132301b06d
30 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/test-canale.md vendored
View File

@@ -67,7 +67,7 @@ Controlla sia presente qualcosa, tra le " " di thumbnail e banner, e che le imma
Riepilogo voci:
movie, tvshow, anime, documentary, vos, adult
movie, tvshow, anime, documentary, sub, adult
(se il sito contiene film e serie, devono esserci sia movie che tvshow, se contiene solo film, solo movie)

2
channels/0example.json.txt
View File

@@ -23,7 +23,7 @@ se vanno cancellati tutti deve rimanere la voce:
"active": false,
"thumbnail": "",
"banner": "",
"categories": ["movie", "tvshow", "anime", "vos", "documentary"],
"categories": ["movie", "tvshow", "anime", "sub, "documentary"],
"not_active": ["include_in_newest"],
"settings": [
{

2
channels/altadefinizione01.json
View File

@@ -5,6 +5,6 @@
"active": true,
"thumbnail": "altadefinizione01.png",
"banner": "altadefinizione01.png",
"categories": ["movie", "vos"],
"categories": ["movie", "sub"],
"settings": []
}

2
channels/altadefinizione01_link.json
View File

@@ -5,6 +5,6 @@
"language": ["ita","sub-ita"],
"thumbnail": "altadefinizione01_L.png",
"banner": "altadefinizione01_L.png",
"categories": ["movie","vos"],
"categories": ["movie","sub"],
"settings" :[]
}

2
channels/altadefinizioneclick.json
View File

@@ -5,7 +5,7 @@
"language": ["ita","sub-ita"],
"thumbnail": "altadefinizioneclick.png",
"bannermenu": "altadefinizioneciclk.png",
"categories": ["tvshow","movie","vos"],
"categories": ["tvshow","movie","sub"],
"not_active":["include_in_newest_series"],
"settings": []
}

2
channels/animeleggendari.json
View File

@@ -5,7 +5,7 @@
"language": ["ita", "sub-ita"],
"thumbnail": "animepertutti.png",
"bannermenu": "animepertutti.png",
"categories": ["anime", "vos"],
"categories": ["anime", "sub"],
"not_active":["include_in_newest_peliculas", "include_in_newest_series", "include_in_newest_anime"],
"settings": []
}

2
channels/animeworld.json
View File

@@ -5,7 +5,7 @@
"language": ["ita", "sub-ita"],
"thumbnail": "animeworld.png",
"banner": "animeworld.png",
"categories": ["anime", "vos"],
"categories": ["anime", "sub"],
"settings": [
{
"id": "order",

2
channels/casacinema.json
View File

@@ -5,7 +5,7 @@
"active": true,
"thumbnail": "casacinema.png",
"banner": "casacinema.png",
"categories": ["tvshow", "movie","vos"],
"categories": ["tvshow", "movie","sub"],
"settings": [
]
}

2
channels/cb01anime.json
View File

@@ -1,7 +1,7 @@
{
"id": "cb01anime",
"name": "Cb01anime",
"language": ["ita", "vos", "sub-ita"],
"language": ["ita", "sub, "sub-ita"],
"active": true,
"thumbnail": "cb01anime.png",
"banner": "cb01anime.png",

2
channels/cineblog01.json
View File

@@ -5,6 +5,6 @@
"active": true,
"thumbnail": "cb01.png",
"banner": "cb01.png",
"categories": ["tvshow", "movie", "vos", "documentary"],
"categories": ["tvshow", "movie", "sub, "documentary"],
"settings": []
}

2
channels/dreamsub.json
View File

@@ -5,6 +5,6 @@
"active": true,
"thumbnail": "dreamsub.png",
"banner": "dreamsub.png",
"categories": ["anime", "vos"],
"categories": ["anime", "sub"],
"settings": []
}

2
channels/eurostreaming.json
View File

@@ -5,6 +5,6 @@
"language": ["ita","sub-ita"],
"thumbnail": "eurostreaming.png",
"banner": "eurostreaming.png",
"categories": ["tvshow","anime","vos"],
"categories": ["tvshow","anime","sub"],
"settings": []
}

2
channels/fastsubita.json
View File

@@ -5,7 +5,7 @@
"active": false,
"thumbnail": "fastsubita.png",
"banner": "fastsubita.png",
"categories": ["tvshow", "vos"],
"categories": ["tvshow", "sub"],
"not_active": ["include_in_newest_peliculas", "include_in_newest_anime"],
"settings": []
}

2
channels/guardaserieclick.json
View File

@@ -2,7 +2,7 @@
"id": "guardaserieclick",
"name": "GuardaSerie.click",
"active": true,
"language": ["ita", "vos"],
"language": ["ita", "sub"],
"thumbnail": "guardaserieclick.png",
"bannermenu": "guardaserieclick.png",
"categories": ["tvshow", "anime"],

2
channels/hd4me.json
View File

@@ -5,7 +5,7 @@
"active": true,
"thumbnail": "hd4me.png",
"banner": "hd4me.png",
"categories": ["movie", "vos"],
"categories": ["movie", "sub"],
"not_active": ["include_in_newest"],
"settings": []
}

2
channels/ilgeniodellostreaming.json
View File

@@ -5,6 +5,6 @@
"language": ["ita", "sub-ita"],
"thumbnail": "ilgeniodellostreaming.png",
"banner": "ilgeniodellostreaming.png",
"categories": ["movie", "tvshow", "anime", "vos"],
"categories": ["movie", "tvshow", "anime", "sub"],
"settings": ["include_in_newest_anime"]
}

2
channels/italiaserie.json
View File

@@ -5,7 +5,7 @@
"language": ["ita","sub-ita"],
"thumbnail": "italiaserie.png",
"bannermenu": "italiaserie.png",
"categories": ["tvshow", "vos"],
"categories": ["tvshow", "sub"],
"not_active": ["include_in_newest_peliculas", "include_in_newest_anime"],
"settings": []
}

2
channels/serietvu.json
View File

@@ -5,7 +5,7 @@
"language": ["ita", "sub-ita"],
"thumbnail": "serietvu.png",
"banner": "serietvu.png",
"categories": ["tvshow", "vos"],
"categories": ["tvshow", "sub"],
"not_active": ["include_in_newest_peliculas", "include_in_newest_anime"],
"settings": []
}

2
channels/toonitalia.json
View File

@@ -5,7 +5,7 @@
"active": true,
"thumbnail": "toonitalia.png",
"banner": "toonitalia.png",
"categories": ["tvshow", "movie", "vos", "anime"],
"categories": ["tvshow", "movie", "sub, "anime"],
"not_active":["include_in_newest_peliculas", "include_in_newest_series"],
"default_off":["include_in_newest"],
"settings": []

4
channels/vvvvid.json
View File

@@ -2,9 +2,9 @@
"id": "vvvvid",
"name": "VVVVID",
"active": true,
"language": ["ita","vos"],
"language": ["ita","sub"],
"thumbnail": "vvvvid.png",
"banner": "vvvvid.png",
"categories": ["anime","tvshow","movie","vos"],
"categories": ["anime","tvshow","movie","sub"],
"settings": []
}

37
channelselector.py
View File

@@ -15,46 +15,45 @@ def getmainlist(view="thumb_"):
# Main Menu Channels
if addon.getSetting('enable_news_menu') == "true":
itemlist.append(Item(title=config.get_localized_string(30130), channel="news", action="mainlist",
thumbnail=get_thumb("news.png", view), category=config.get_localized_string(30119), viewmode="thumbnails",
thumbnail=get_thumb("news.png"), category=config.get_localized_string(30119), viewmode="thumbnails",
context=[{"title": config.get_localized_string(70285), "channel": "shortcuts", "action": "SettingOnPosition", "category":7, "setting":1}]))
if addon.getSetting('enable_channels_menu') == "true":
itemlist.append(Item(title=config.get_localized_string(30118), channel="channelselector", action="getchanneltypes",
thumbnail=get_thumb("channels.png", view), view=view, category=config.get_localized_string(30119), viewmode="thumbnails"))
thumbnail=get_thumb("channels.png"), view=view, category=config.get_localized_string(30119), viewmode="thumbnails"))
if addon.getSetting('enable_search_menu') == "true":
itemlist.append(Item(title=config.get_localized_string(30103), channel="search", path='special', action="mainlist",
thumbnail=get_thumb("search.png", view), category=config.get_localized_string(30119), viewmode="list",
thumbnail=get_thumb("search.png"), category=config.get_localized_string(30119), viewmode="list",
context = [{"title": config.get_localized_string(60412), "action": "setting_channel_new", "channel": "search"},
{"title": config.get_localized_string(70286), "channel": "shortcuts", "action": "SettingOnPosition", "category":5 , "setting":1}]))
if addon.getSetting('enable_onair_menu') == "true":
itemlist.append(Item(channel="filmontv", action="mainlist", title=config.get_localized_string(50001),
thumbnail=get_thumb("on_air.png"), viewmode="thumbnails"))
thumbnail=get_thumb("live.png"), viewmode="thumbnails"))
if addon.getSetting('enable_link_menu') == "true":
itemlist.append(Item(title=config.get_localized_string(70527), channel="kodfavorites", action="mainlist", thumbnail=get_thumb("mylink.png", view),
itemlist.append(Item(title=config.get_localized_string(70527), channel="kodfavorites", action="mainlist", thumbnail=get_thumb("mylink.png"),
view=view, category=config.get_localized_string(70527), viewmode="thumbnails"))
if addon.getSetting('enable_fav_menu') == "true":
itemlist.append(Item(title=config.get_localized_string(30102), channel="favorites", action="mainlist",
thumbnail=get_thumb("favorites.png", view), category=config.get_localized_string(30102), viewmode="thumbnails"))
thumbnail=get_thumb("favorites.png"), category=config.get_localized_string(30102), viewmode="thumbnails"))
if config.get_videolibrary_support() and addon.getSetting('enable_library_menu') == "true":
itemlist.append(Item(title=config.get_localized_string(30131), channel="videolibrary", action="mainlist",
thumbnail=get_thumb("videolibrary.png", view), category=config.get_localized_string(30119), viewmode="thumbnails",
thumbnail=get_thumb("videolibrary.png"), category=config.get_localized_string(30119), viewmode="thumbnails",
context=[{"title": config.get_localized_string(70287), "channel": "shortcuts", "action": "SettingOnPosition", "category":2, "setting":1},
{"title": config.get_localized_string(60568), "channel": "videolibrary", "action": "update_videolibrary"}]))
if downloadenabled != "false":
itemlist.append(Item(title=config.get_localized_string(30101), channel="downloads", action="mainlist", thumbnail=get_thumb("download.png", view), viewmode="list",
itemlist.append(Item(title=config.get_localized_string(30101), channel="downloads", action="mainlist", thumbnail=get_thumb("download.png"), viewmode="list",
context=[{"title": config.get_localized_string(70288), "channel": "shortcuts", "action": "SettingOnPosition", "category":6}]))
thumb_setting = "setting_%s.png" % 0 # config.get_setting("plugin_updates_available")
itemlist.append(Item(title=config.get_localized_string(30100), channel="setting", action="settings",
thumbnail=get_thumb(thumb_setting, view), category=config.get_localized_string(30100), viewmode="list", folder=False))
thumbnail=get_thumb('setting.png'), category=config.get_localized_string(30100), viewmode="list", folder=False))
itemlist.append(Item(title=config.get_localized_string(30104) + " (v" + config.get_addon_version(with_fix=True) + ")", channel="help", action="mainlist",
thumbnail=get_thumb("help.png", view), category=config.get_localized_string(30104), viewmode="list"))
thumbnail=get_thumb("help.png"), category=config.get_localized_string(30104), viewmode="list"))
return itemlist
@@ -62,7 +61,7 @@ def getchanneltypes(view="thumb_"):
logger.debug()
# Category List
channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "live", "torrent", "music"] #, "direct"
channel_types = ["movie", "tvshow", "anime", "documentary", "sub", "live", "torrent", "music"] #, "direct"
# Channel Language
channel_language = auto_filter()
@@ -72,17 +71,17 @@ def getchanneltypes(view="thumb_"):
itemlist = list()
title = config.get_localized_string(30121)
itemlist.append(Item(title=title, channel="channelselector", action="filterchannels", view=view,
category=title, channel_type="all", thumbnail=get_thumb("all.png", view),
category=title, channel_type="all", thumbnail=get_thumb("all.png"),
viewmode="thumbnails"))
for channel_type in channel_types:
title = config.get_localized_category(channel_type)
itemlist.append(Item(title=title, channel="channelselector", action="filterchannels", category=title,
channel_type=channel_type, viewmode="thumbnails",
thumbnail=get_thumb("%s.png" % channel_type, view)))
thumbnail=get_thumb("{}.png".format(channel_type))))
itemlist.append(Item(title=config.get_localized_string(70685), channel="community", action="mainlist", view=view,
category=config.get_localized_string(70685), channel_type="all", thumbnail=get_thumb("community.png", view),
category=config.get_localized_string(70685), channel_type="all", thumbnail=get_thumb("community.png"),
viewmode="thumbnails"))
return itemlist
@@ -126,8 +125,8 @@ def filterchannels(category, view="thumb_"):
logger.debug("channel_parameters=%s" % repr(channel_parameters))
# If you prefer the banner and the channel has it, now change your mind
if view == "banner_" and "banner" in channel_parameters:
channel_parameters["thumbnail"] = channel_parameters["banner"]
# if view == "banner_" and "banner" in channel_parameters:
# channel_parameters["thumbnail"] = channel_parameters["banner"]
# if the channel is deactivated the channel is not shown in the list
if not channel_parameters["active"]:
@@ -181,8 +180,8 @@ def filterchannels(category, view="thumb_"):
if category == "all":
channel_parameters = channeltools.get_channel_parameters('url')
# If you prefer the banner and the channel has it, now change your mind
if view == "banner_" and "banner" in channel_parameters:
channel_parameters["thumbnail"] = channel_parameters["banner"]
# if view == "banner_" and "banner" in channel_parameters:
# channel_parameters["thumbnail"] = channel_parameters["banner"]
channelslist.insert(0, Item(title=config.get_localized_string(60088), action="mainlist", channel="url",
thumbnail=channel_parameters["thumbnail"], type="generic", viewmode="list"))

2
core/support.py
View File

@@ -1276,7 +1276,7 @@ def channel_config(item, itemlist):
title=typo(config.get_localized_string(60587), 'color kod bold'),
config=item.channel,
folder=False,
thumbnail=thumb('setting_0'))
thumbnail=thumb('setting'))
)

2
platformcode/envtal.py
View File

@@ -409,7 +409,7 @@ def paint_env(item, environment={}):
itemlist = []
thumb = get_thumb("setting_0.png")
thumb = get_thumb("setting.png")
cabecera = """\
It shows the [COLOR yellow] variables [/ COLOR] of the Kodi ecosystem that may be relevant to the problem diagnosis in Alpha:

9
platformcode/xbmc_videolibrary.py
View File

@@ -2,12 +2,7 @@
# ------------------------------------------------------------
# XBMC Library Tools
# ------------------------------------------------------------
# from future import standard_library
# standard_library.install_aliases()
#from builtins import str
from specials import videolibrary
from platformcode.contextmenu.update_tv_show import join
from core.item import Item
import sys, os, threading, time, re, math, xbmc, xbmcgui, sqlite3
PY3 = False
if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
@@ -17,7 +12,7 @@ if PY3:
else:
import urllib2 # Usamos el nativo de PY2 que es más rápido
from core import filetools, jsontools, support, videolibrarydb
from core import filetools, jsontools, videolibrarydb
from platformcode import config, logger, platformtools
from core import scrapertools
from xml.dom import minidom

2
specials/downloads.py
View File

@@ -124,7 +124,7 @@ def mainlist(item):
itemlist.insert(0, Item(channel=item.channel, action="browser", title=support.typo(config.get_localized_string(70222),'bold'), thumbnail=get_thumb('search.png'), url=DOWNLOAD_PATH))
if not item.contentType == "tvshow":
itemlist.append(Item(channel='shortcuts', action="SettingOnPosition", category=6, setting=0, title= support.typo(config.get_localized_string(70288),'bold color kod'), thumbnail=get_thumb('setting_0.png')))
itemlist.append(Item(channel='shortcuts', action="SettingOnPosition", category=6, setting=0, title= support.typo(config.get_localized_string(70288),'bold color kod'), thumbnail=get_thumb('setting.png')))
# Reload
if estados:

4
specials/filmontv.py
View File

@@ -27,7 +27,7 @@ def mainlist(item):
Item(title=support.typo('Canali live', 'bold'),
channel=item.channel,
action='live',
thumbnail=support.thumb('tvshow_on_air')),
thumbnail=support.thumb('tvshow_live')),
Item(channel=item.channel,
title=config.get_setting("film1", channel="filmontv"),
action="now_on_tv",
@@ -83,7 +83,7 @@ def mainlist(item):
action="server_config",
config="filmontv",
folder=False,
thumbnail=item.thumbnail)]
thumbnail=support.thumb('setting'))]
return itemlist

4
specials/news.py
View File

@@ -551,7 +551,7 @@ def show_channels(item):
def menu_opciones(item):
itemlist = list()
itemlist.append(Item(channel=item.channel, title=config.get_localized_string(60525),
text_bold = True, thumbnail=get_thumb("setting_0.png"),
text_bold = True, thumbnail=get_thumb("setting.png"),
folder=False))
itemlist.append(Item(channel=item.channel, action="setting_channel", extra="peliculas", title=config.get_localized_string(60526),
thumbnail=get_thumb("movie.png"),
@@ -584,7 +584,7 @@ def menu_opciones(item):
thumbnail=get_thumb("documentary.png"),
folder=False))
itemlist.append(Item(channel=item.channel, action="settings", title=config.get_localized_string(60531),
thumbnail=get_thumb("setting_0.png"),
thumbnail=get_thumb("setting.png"),
folder=False))
return itemlist

4
specials/search.py
View File

@@ -50,8 +50,8 @@ def mainlist(item):
itemlist += [Item(channel=item.channel, title=config.get_localized_string(59995), action='saved_search', thumbnail=get_thumb('search.png')),
Item(channel=item.channel, title=config.get_localized_string(60420), action='sub_menu', thumbnail=get_thumb('search.png')),
Item(channel="tvmoviedb", title=config.get_localized_string(70274), action="mainlist", thumbnail=get_thumb("search.png")),
Item(channel=item.channel, title=typo(config.get_localized_string(59994) + '{config}', 'color kod bold'), action='setting_channel_new', thumbnail=get_thumb('setting_0.png'), folder=False),
Item(channel='shortcuts', title=typo(config.get_localized_string(70286), 'color kod bold'), action='SettingOnPosition', category=5, setting=1, thumbnail=get_thumb('setting_0.png'), folder=False)]
Item(channel=item.channel, title=typo(config.get_localized_string(59994) + '{config}', 'color kod bold'), action='setting_channel_new', thumbnail=get_thumb('setting.png'), folder=False),
Item(channel='shortcuts', title=typo(config.get_localized_string(70286), 'color kod bold'), action='SettingOnPosition', category=5, setting=1, thumbnail=get_thumb('setting.png'), folder=False)]
itemlist = set_context(itemlist)
support.thumb(itemlist)

2
specials/tvmoviedb.py
View File

@@ -2235,7 +2235,7 @@ def details_mal(item):
token_auth = config.get_setting("token_trakt", "trakt")
if token_auth and ob_tmdb.result:
itemlist.append(item.clone(title=config.get_localized_string(70323), action="menu_trakt", thumbnail=thumb('setting_0')))
itemlist.append(item.clone(title=config.get_localized_string(70323), action="menu_trakt", thumbnail=thumb('setting')))
# Prequels, sequels and alternative series are listed
prequel = match(data, patron=r'Prequel:</td>(.*?)</td>').match

2
specials/videolibrary.py
View File

@@ -30,7 +30,7 @@ def mainlist(item):
context=[{'channel':'videolibrary', 'action':'update_videolibrary', 'title':config.get_localized_string(70269)}]),
item.clone(title=typo(config.get_localized_string(70741) % config.get_localized_string(30123) + '...', 'submenu'),contentType='tvshow', action='search_list', thumbnail=thumb('search_tvshow')),
item.clone(channel='shortcuts', title=typo(config.get_localized_string(70287),'bold color kod'), action='SettingOnPosition',
category=2, setting=1, thumbnail = thumb('setting_0'),folder=False)]
category=2, setting=1, thumbnail = thumb('setting'),folder=False)]
support.thumb(itemlist)
return itemlist