diff --git a/channels/bleachportal.json b/channels/bleachportal.json index e5fcdcf3..59f84ee4 100644 --- a/channels/bleachportal.json +++ b/channels/bleachportal.json @@ -1,22 +1,15 @@ { "id": "bleachportal", "name": "BleachPortal", - "language": ["ita"], + "language": ["sub-ita"], "active": true, - "adult": false, - "fanart": "http://i39.tinypic.com/35ibvcx.jpg", - "thumbnail": "http://www.bleachportal.it/images/index_r1_c1.jpg", - "banner": "http://cgi.di.uoa.gr/~std05181/images/bleach.jpg", + "deprecated": true, + "adult": false, + "fanart": "https://www.thetvdb.com/banners/fanart/original/74796-29.jpg", + "thumbnail": "bleachportal.png", + "banner": "bleachportal.png", "categories": ["anime"], - "settings": [ - { - "id": "include_in_global_search", - "type": "bool", - "label": "Incluir en busqueda global", - "default": false, - "enabled": false, - "visible": false - } - ] + "not_active":["include_in_newests", "include_in_global_search"], + "settings": [] } diff --git a/channels/bleachportal.py b/channels/bleachportal.py index 3df421a0..9377fb9d 100644 --- a/channels/bleachportal.py +++ b/channels/bleachportal.py @@ -11,6 +11,7 @@ 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" @@ -19,17 +20,19 @@ def mainlist(item): logger.info("[BleachPortal.py]==> mainlist") itemlist = [Item(channel=item.channel, action="episodi", - title="[COLOR azure] Bleach [/COLOR] - [COLOR deepskyblue]Lista Episodi[/COLOR]", + title= support.typo('Bleach','bold'), url=host + "/streaming/bleach/stream_bleach.htm", - thumbnail="http://i45.tinypic.com/286xp3m.jpg", - fanart="http://i40.tinypic.com/5jsinb.jpg", + 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="[COLOR azure] D.Gray Man [/COLOR] - [COLOR deepskyblue]Lista Episodi[/COLOR]", + title=support.typo('D.Gray Man','bold'), url=host + "/streaming/d.gray-man/stream_dgray-man.htm", - thumbnail="http://i59.tinypic.com/9is3tf.jpg", - fanart="http://wallpapercraft.net/wp-content/uploads/2016/11/Cool-D-Gray-Man-Background.jpg", + 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 @@ -40,7 +43,7 @@ def episodi(item): itemlist = [] data = httptools.downloadpage(item.url).data - patron = '?[\D+([\d\-]+)\s?<[^<]+<[^<]+<[^<]+<[^<]+<.*?\s+?.*?([^<]+).*?\s?.*?' + 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" @@ -49,19 +52,19 @@ def episodi(item): itemlist.append( Item(channel=item.channel, action="findvideos", - title="[COLOR azure]%s Ep: [COLOR deepskyblue]%s[/COLOR][/COLOR]" % (animetitle, scrapednumber), + 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="[COLOR red]%s Ep: %s[/COLOR] | [COLOR deepskyblue]%s[/COLOR]" % (animetitle, scrapednumber, scrapedtitle))) + fulltitle="%s Ep: %s | %s" % (animetitle, scrapednumber, scrapedtitle))) if item.extra == "bleach": itemlist.append( Item(channel=item.channel, action="oav", - title="[B][COLOR azure] OAV e Movies [/COLOR][/B]", + 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, @@ -75,19 +78,19 @@ def oav(item): itemlist = [] data = httptools.downloadpage(item.url).data - patron = '?[-\s+(.*?)<[^<]+<[^<]+<[^<]+<[^<]+<.*?\s+?.*?([^<]+).*?\s?.*?' + 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="[COLOR deepskyblue] " + scrapednumber + " [/COLOR]", + title=support.typo(scrapednumber, 'bold'), url=item.url.replace("stream_bleach_movie_oav.htm", scrapedurl), plot=scrapedtitle, extra=item.extra, thumbnail=item.thumbnail, - fulltitle="[COLOR red]" + scrapednumber + "[/COLOR] | [COLOR deepskyblue]" + scrapedtitle + "[/COLOR]")) + fulltitle=scrapednumber + " | " + scrapedtitle)) return list(reversed(itemlist)) @@ -109,7 +112,7 @@ def findvideos(item): itemlist.append( Item(channel=item.channel, action="play", - title="[[COLOR orange]Diretto[/COLOR]] [B]%s[/B]" % item.title, + title="Diretto %s" % item.title, url=item.url.replace(item.url.split("/")[-1], "/" + video), thumbnail=item.thumbnail, fulltitle=item.fulltitle))