diff --git a/channels.json b/channels.json index d21677f3..3a946f66 100644 --- a/channels.json +++ b/channels.json @@ -1,50 +1,48 @@ { - "altadefinizione01": "https://www.altadefinizione01.photo", - "altadefinizione01_link": "https://altadefinizione01.wine", - "altadefinizioneclick": "https://altadefinizione.group", - "animealtadefinizione": "https://www.animealtadefinizione.it", - "animeforce": "https://ww1.animeforce.org", - "animeleggendari": "https://animeora.com", - "animesaturn": "https://www.animesaturn.it", - "animestream": "https://www.animeworld.it", - "animesubita": "http://www.animesubita.org", - "animetubeita": "http://www.animetubeita.com", - "animeunity": "https://www.animeunity.it", - "animeuniverse" : "https://www.animeuniverse.it/", - "animeworld": "https://www.animeworld.tv", - "casacinema": "https://www.casacinema.page", - "cb01anime": "https://www.cineblog01.red", - "cinemalibero": "https://cinemalibero.plus", - "cinetecadibologna": "http://cinestore.cinetecadibologna.it", - "dreamsub": "https://dreamsub.stream", - "dsda": "https://www.dsda.press", - "fastsubita": "https://fastsubita.online", - "filmgratis": "https://www.filmaltadefinizione.tv", - "filmigratis": "https://filmigratis.org", - "filmpertutti": "https://www.filmpertutti.site", - "filmsenzalimiticc": "https://www.filmsenzalimiti01.casa", - "filmstreaming01": "https://filmstreaming01.com", - "guardaseriecam": "https://guardaserie.cam", - "guardaserieicu": "https://guardaserie.icu", - "guardaserie_stream": "https://guardaserie.store", - "guardaserieclick": "https://www.guardaserie.fit", - "hd4me": "https://hd4me.net", - "ilgeniodellostreaming": "https://ilgeniodellostreaming.gy", - "ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.cam", - "italiaserie": "https://italiaserie.org", - "mondoserietv": "https://mondoserietv.com", - "netfreex": "https://www.netfreex.top", - "piratestreaming": "https://www.piratestreaming.movie", - "polpotv": "https://polpotv.life", - "raiplay": "https://www.raiplay.it", - "seriehd": "https://seriehd.group", - "serietvonline": "https://serietvonline.press", - "serietvsubita": "http://serietvsubita.xyz", - "serietvu": "https://www.serietvu.link", - "streamingcommunity":"https://streamingcommunity.to", - "streamtime": "https://t.me/s/StreamTime", - "tantifilm": "https://www.tantifilm.rest", - "toonitalia": "https://toonitalia.org", - "vedohd": "https://vedohd.uno", - "vvvvid": "https://www.vvvvid.it" + "altadefinizione01": "https://www.altadefinizione01.green", + "altadefinizione01_link": "https://altadefinizione01.energy", + "altadefinizioneclick": "https://altadefinizione.vote", + "animealtadefinizione": "https://www.animealtadefinizione.it", + "animeforce": "https://ww1.animeforce.org", + "animeleggendari": "https://animeora.com", + "animesaturn": "https://www.animesaturn.it", + "animestream": "https://www.animeworld.tv", + "animesubita": "http://www.animesubita.org", + "animetubeita": "http://www.animetubeita.com", + "animeunity": "https://www.animeunity.it", + "animeuniverse": "https://www.animeuniverse.it/", + "animeworld": "https://www.animeworld.tv", + "casacinema": "https://www.casacinema.page", + "cb01anime": "https://www.cineblog01.red", + "cinemalibero": "https://www.cinemalibero.run", + "cinetecadibologna": "http://cinestore.cinetecadibologna.it", + "dreamsub": "https://dreamsub.stream", + "dsda": "https://www.dsda.press", + "fastsubita": "https://fastsubita.online", + "filmgratis": "https://www.filmaltadefinizione.tv", + "filmigratis": "https://filmigratis.org", + "filmpertutti": "https://www.filmpertutti.icu", + "filmsenzalimiticc": "https://www.filmsenzalimiti01.casa", + "filmstreaming01": "https://filmstreaming01.com", + "guardaserie_stream": "https://guardaserie.store", + "guardaseriecam": "https://guardaserie.cam", + "guardaserieclick": "https://www.guardaserie.guru", + "guardaserieicu": "https://guardaserie.icu", + "hd4me": "https://hd4me.net", + "ilgeniodellostreaming": "https://ilgeniodellostreaming.lc", + "ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.cam", + "italiaserie": "https://italiaserie.org", + "mondoserietv": "https://mondoserietv.com", + "piratestreaming": "https://www.piratestreaming.cloud", + "polpotv": "https://polpotv.life", + "raiplay": "https://www.raiplay.it", + "seriehd": "https://seriehd.group", + "serietvonline": "https://serietvonline.pw", + "serietvsubita": "http://serietvsubita.xyz", + "serietvu": "https://www.serietvu.link", + "streamingcommunity": "https://streamingcommunity.to", + "streamtime": "https://t.me/s/StreamTime", + "tantifilm": "https://www.tantifilm.fit", + "toonitalia": "https://toonitalia.org", + "vvvvid": "https://www.vvvvid.it" } \ No newline at end of file diff --git a/channels/animesaturn.py b/channels/animesaturn.py index da6dccdf..67307412 100644 --- a/channels/animesaturn.py +++ b/channels/animesaturn.py @@ -126,7 +126,7 @@ def peliculas(item): if item.args == 'incorso': patron = r']+>(?P[^<(]+)(?:\s*\((?P<year>\d+)\))?(?:\s*\((?P<lang>[A-za-z-]+)\))?</a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s*<img width="[^"]+" height="[^"]+" src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<plot>[^<]+)<' else: - debug=True + # debug=True patron = r'<img src="(?P<thumb>[^"]+)" alt="(?P<title>[^"\(]+)(?:\((?P<lang>[Ii][Tt][Aa])\))?(?:\s*\((?P<year>\d+)\))?[^"]*"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><a class="[^"]+" href="(?P<url>[^"]+)">[^>]+>[^>]+>[^>]+><p[^>]+>(?:(?P<plot>[^<]+))?<' return locals() diff --git a/channelselector.py b/channelselector.py index 5c57098e..9f810eff 100644 --- a/channelselector.py +++ b/channelselector.py @@ -2,18 +2,18 @@ import glob, os -from core import channeltools from core.item import Item from platformcode import config, logger addon = config.__settings__ downloadenabled = addon.getSetting('downloadenabled') + def getmainlist(view="thumb_"): logger.info() itemlist = list() if config.dev_mode(): - itemlist.append(Item(title="Redirect", channel="checkhost", action="check_channels", thumbnail='', + itemlist.append(Item(title="Redirect", action="check_channels", thumbnail='', category=config.get_localized_string(30119), viewmode="thumbnails")) # Main Menu Channels if addon.getSetting('enable_news_menu') == "true": diff --git a/platformcode/config.py b/platformcode/config.py index 3d160bb7..2a69dab0 100644 --- a/platformcode/config.py +++ b/platformcode/config.py @@ -76,7 +76,7 @@ def get_platform(full_version=False): code_db = {'10': 'MyVideos37.db', '11': 'MyVideos60.db', '12': 'MyVideos75.db', '13': 'MyVideos78.db', '14': 'MyVideos90.db', '15': 'MyVideos93.db', '16': 'MyVideos99.db', '17': 'MyVideos107.db', '18': 'MyVideos116.db', - '19': 'MyVideos116.db'} + '19': 'MyVideos119.db'} num_version = xbmc.getInfoLabel('System.BuildVersion') num_version = re.match("\d+\.\d+", num_version).group(0) diff --git a/platformcode/launcher.py b/platformcode/launcher.py index b670d33e..8bfcc231 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -157,6 +157,9 @@ def run(item=None): short = urllib.urlopen('https://u.nu/api.php?action=shorturl&format=simple&url=' + item.url).read().decode('utf-8') platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(70740) % short) # Action in certain channel specified in "action" and "channel" parameters + elif item.action == "check_channels": + from platformcode import checkhost + checkhost.check_channels() else: # Checks if channel exists if os.path.isfile(os.path.join(config.get_runtime_path(), 'channels', item.channel + ".py")): diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index 60518125..a0b729c3 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -2,8 +2,8 @@ # ------------------------------------------------------------ # XBMC Library Tools # ------------------------------------------------------------ -from future import standard_library -standard_library.install_aliases() +# from future import standard_library +# standard_library.install_aliases() #from builtins import str import sys, os, threading, time, re, math, xbmc, xbmcgui PY3 = False