diff --git a/addon.xml b/addon.xml index 5fc0fc3e..6904408f 100644 --- a/addon.xml +++ b/addon.xml @@ -1,4 +1,4 @@ - + @@ -19,12 +19,10 @@ resources/media/themes/ss/2.png resources/media/themes/ss/3.png - -Ridefinito il modo in cui vengono scritti i canali, per assicurare migliore stabilità, debuggabilità e coerenza - -Riscritti di conseguenza molti canali, corregendo di fatto moltissimi problemi che avete segnalato - -Quando aggiungi in videoteca da fonti in più lingue (ita/sub ita) o più qualità, ti viene chiesto quale tipo di fonte vuoi. - -Per gli amanti degli anime, aggiunto VVVVID (senza bisogno di account!) - -Aggiunti i server supervideo e hdload, fixato wstream - -migliorie varie + -override DNS di default + -nuovi canali: streamtime e netfreex + -fixato cloudflare + -aggiunta opzione "apri nel browser" Naviga velocemente sul web e guarda i contenuti presenti [COLOR red]The owners and submitters to this addon do not host or distribute any of the content displayed by these addons nor do they have any affiliation with the content providers.[/COLOR] [COLOR yellow]Kodi © is a registered trademark of the XBMC Foundation. We are not connected to or in any other way affiliated with Kodi, Team Kodi, or the XBMC Foundation. Furthermore, any software, addons, or products offered by us will receive no support in official Kodi channels, including the Kodi forums and various social networks.[/COLOR] diff --git a/channels.json b/channels.json index a4bd048c..a2faac40 100644 --- a/channels.json +++ b/channels.json @@ -17,27 +17,22 @@ "documentaristreamingda": "https://documentari-streaming-da.com", "dreamsub": "https://www.dreamsub.stream", "eurostreaming": "https://eurostreaming.pink", - "fastsubita": "https://fastsubita.com", + "fastsubita": "http://fastsubita.com", "filmgratis": "https://www.filmaltadefinizione.net", "filmigratis": "https://filmigratis.org", "filmpertutti": "https://www.filmpertutti.link", - "filmsenzalimiti": "https://filmsenzalimiti.best", - "filmsenzalimiticc": "https://www.filmsenzalimiti.press", + "filmsenzalimiticc": "https://www.filmsenzalimiti.press", "filmstreaming01": "https://filmstreaming01.com", - "guardafilm": "http://www.guardafilm.top", - "guardarefilm": "https://www.guardarefilm.red", + "guardarefilm": "https://www.guardarefilm.red", "guardaserie_stream": "https://guardaserie.co", - "guardaseriecc": "https://guardaserie.site", - "guardaserieclick": "https://www.guardaserie.media", - "guardogratis": "https://guardogratis.net", - "ilgeniodellostreaming": "https://igds.red", - "italiafilm": "https://www.italia-film.video", + "guardaserieclick": "https://www.guardaserie.media", + "ilgeniodellostreaming": "https://igds.red", + "italiafilm": "https://www.italia-film.pw", "italiaserie": "https://italiaserie.org", - "itastreaming": "https://itastreaming.film", - "mondolunatico": "http://mondolunatico.org", + "mondolunatico": "http://mondolunatico.org", "mondolunatico2": "https://mondolunatico.org:443/stream", "mondoserietv": "https://mondoserietv.com", - "piratestreaming": "https://www.piratestreaming.media", + "piratestreaming": "https://www.piratestreaming.top", "polpotv": "https://polpo.tv", "seriehd": "https://www.seriehd.moda", "serietvonline": "https://serietvonline.best", @@ -48,5 +43,6 @@ "tantifilm": "https://www.tantifilm.eu", "toonitalia": "https://toonitalia.org", "vedohd": "https://vedohd.video", - "vvvvid": "https://www.vvvvid.it" + "vvvvid": "https://www.vvvvid.it", + "netfreex": "https://www.netfreex.online" } \ No newline at end of file diff --git a/channels/animesaturn.py b/channels/animesaturn.py index 61b440a9..fd51ec44 100644 --- a/channels/animesaturn.py +++ b/channels/animesaturn.py @@ -124,3 +124,12 @@ def findvideos(item): contentType=item.contentType, folder=False)) return support.server(item, itemlist=itemlist) + + + + + + + + + diff --git a/channels/bleachportal.json b/channels/bleachportal.json deleted file mode 100644 index 59f84ee4..00000000 --- a/channels/bleachportal.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "bleachportal", - "name": "BleachPortal", - "language": ["sub-ita"], - "active": true, - "deprecated": true, - "adult": false, - "fanart": "https://www.thetvdb.com/banners/fanart/original/74796-29.jpg", - "thumbnail": "bleachportal.png", - "banner": "bleachportal.png", - "categories": ["anime"], - "not_active":["include_in_newests", "include_in_global_search"], - "settings": [] -} - diff --git a/channels/bleachportal.py b/channels/bleachportal.py deleted file mode 100644 index 9377fb9d..00000000 --- a/channels/bleachportal.py +++ /dev/null @@ -1,119 +0,0 @@ -# -*- coding: utf-8 -*- -# Ringraziamo Icarus crew -# ------------------------------------------------------------ -# XBMC Plugin -# Canale per http://bleachportal.it -# ------------------------------------------------------------ - -import re - -from core import scrapertools, httptools -from core.item import Item -from platformcode import logger -from platformcode import config -from core import support - -host = "http://www.bleachportal.it" - - -def mainlist(item): - logger.info("[BleachPortal.py]==> mainlist") - itemlist = [Item(channel=item.channel, - action="episodi", - title= support.typo('Bleach','bold'), - url=host + "/streaming/bleach/stream_bleach.htm", - thumbnail="https://www.thetvdb.com/banners/posters/74796-14.jpg", - banner="https://www.thetvdb.com/banners/graphical/74796-g6.jpg", - fanart="https://www.thetvdb.com/banners/fanart/original/74796-30.jpg", - extra="bleach"), - Item(channel=item.channel, - action="episodi", - title=support.typo('D.Gray Man','bold'), - url=host + "/streaming/d.gray-man/stream_dgray-man.htm", - thumbnail="https://www.thetvdb.com/banners/posters/79635-1.jpg", - banner="https://www.thetvdb.com/banners/graphical/79635-g4.jpg", - fanart="https://www.thetvdb.com/banners/fanart/original/79635-6.jpg", - extra="dgrayman")] - - return itemlist - - -def episodi(item): - logger.info("[BleachPortal.py]==> episodi") - itemlist = [] - - data = httptools.downloadpage(item.url).data - patron = r'?[\D+([\d\-]+)\s?<[^<]+<[^<]+<[^<]+<[^<]+<.*?\s+?.*?([^<]+).*?\s?.*?' - matches = re.compile(patron, re.DOTALL).findall(data) - - animetitle = "Bleach" if item.extra == "bleach" else "D.Gray Man" - for scrapednumber, scrapedtitle, scrapedurl in matches: - scrapedtitle = scrapedtitle.decode('latin1').encode('utf8') - itemlist.append( - Item(channel=item.channel, - action="findvideos", - title=support.typo("%s Episodio %s" % (animetitle, scrapednumber),'bold'), - url=item.url.replace("stream_bleach.htm",scrapedurl) if "stream_bleach.htm" in item.url else item.url.replace("stream_dgray-man.htm", scrapedurl), - plot=scrapedtitle, - extra=item.extra, - thumbnail=item.thumbnail, - fanart=item.fanart, - fulltitle="%s Ep: %s | %s" % (animetitle, scrapednumber, scrapedtitle))) - - if item.extra == "bleach": - itemlist.append( - Item(channel=item.channel, - action="oav", - title=support.typo("OAV e Movies",'bold color kod'), - url=item.url.replace("stream_bleach.htm", "stream_bleach_movie_oav.htm"), - extra=item.extra, - thumbnail=item.thumbnail, - fanart=item.fanart)) - - return list(reversed(itemlist)) - - -def oav(item): - logger.info("[BleachPortal.py]==> oav") - itemlist = [] - - data = httptools.downloadpage(item.url).data - patron = r'?[-\s+(.*?)<[^<]+<[^<]+<[^<]+<[^<]+<.*?\s+?.*?([^<]+).*?\s?.*?' - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapednumber, scrapedtitle, scrapedurl in matches: - itemlist.append( - Item(channel=item.channel, - action="findvideos", - title=support.typo(scrapednumber, 'bold'), - url=item.url.replace("stream_bleach_movie_oav.htm", scrapedurl), - plot=scrapedtitle, - extra=item.extra, - thumbnail=item.thumbnail, - fulltitle=scrapednumber + " | " + scrapedtitle)) - - return list(reversed(itemlist)) - - -def findvideos(item): - logger.info("[BleachPortal.py]==> findvideos") - itemlist = [] - - if "bleach//" in item.url: - item.url = re.sub(r'\w+//', "", item.url) - - data = httptools.downloadpage(item.url).data - - if "bleach" in item.extra: - video = scrapertools.find_single_match(data, 'file: "(.*?)",') - else: - video = scrapertools.find_single_match(data, 'file=(.*?)&').rsplit('/', 1)[-1] - - itemlist.append( - Item(channel=item.channel, - action="play", - title="Diretto %s" % item.title, - url=item.url.replace(item.url.split("/")[-1], "/" + video), - thumbnail=item.thumbnail, - fulltitle=item.fulltitle)) - return itemlist diff --git a/channels/casacinema.py b/channels/casacinema.py index 564d5a81..4761c55a 100644 --- a/channels/casacinema.py +++ b/channels/casacinema.py @@ -199,11 +199,9 @@ def findvideos(item): if item.contentType != 'movie': return support.server(item, item.url) else: - block = r'
(.+?)