casacinema cambio dominio, popcornstream eliminato (chiuso) e fix altadefinizione01

This commit is contained in:
marco
2020-08-14 10:19:21 +02:00
parent 2e765654cf
commit a5ce165bda
8 changed files with 9 additions and 20 deletions
+1 -1
View File
@@ -12,7 +12,7 @@
"animeunity": "https://www.animeunity.it", "animeunity": "https://www.animeunity.it",
"animeuniverse" : "https://www.animeuniverse.it/", "animeuniverse" : "https://www.animeuniverse.it/",
"animeworld": "https://www.animeworld.tv", "animeworld": "https://www.animeworld.tv",
"casacinema": "https://www.casacinema.rest", "casacinema": "https://www.casacinema.page",
"cb01anime": "https://www.cineblog01.red", "cb01anime": "https://www.cineblog01.red",
"cinemalibero": "https://cinemalibero.plus", "cinemalibero": "https://cinemalibero.plus",
"cinetecadibologna": "http://cinestore.cinetecadibologna.it", "cinetecadibologna": "http://cinestore.cinetecadibologna.it",
+2 -5
View File
@@ -52,10 +52,7 @@ def peliculas(item):
## deflang = 'ITA' ## deflang = 'ITA'
action="findvideos" action="findvideos"
patron = r'<div class="cover boxcaption"> <h2>.<a href="(?P<url>[^"]+)">.*?<.*?src="(?P<thumb>[^"]+)"'\ patron = r'<div class="cover boxcaption"> <h2>\s*<a href="(?P<url>[^"]+)">(?P<title>[^<]+).*?src="(?P<thumb>[^"]+).*?<div class="trdublaj">(?P<quality>[^<]+).*?<span class="ml-label">(?P<year>[0-9]+).*?<span class="ml-label">(?P<duration>[^<]+).*?<p>(?P<plot>[^<]+)'
'.+?[^>]+>[^>]+<div class="trdublaj"> (?P<quality>[A-Z/]+)<[^>]+>(?:.[^>]+>(?P<lang>.*?)<[^>]+>).*?'\
'<p class="h4">(?P<title>.*?)</p>[^>]+> [^>]+> [^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> [^>]+> '\
'[^>]+>[^>]+>(?P<year>\d{4})[^>]+>[^>]+> [^>]+>[^>]+>(?P<duration>\d+).+?>.*?<p>(?P<plot>[^<]+)<'
if item.args == "search": if item.args == "search":
patronBlock = r'</script> <div class="boxgrid caption">(?P<block>.*)<div id="right_bar">' patronBlock = r'</script> <div class="boxgrid caption">(?P<block>.*)<div id="right_bar">'
@@ -67,7 +64,7 @@ def peliculas(item):
patronBlock = r'<div class="cover_kapsul ml-mask">(?P<block>.*)<div class="page_nav">' patronBlock = r'<div class="cover_kapsul ml-mask">(?P<block>.*)<div class="page_nav">'
patronNext = '<span>\d</span> <a href="([^"]+)">' patronNext = '<span>\d</span> <a href="([^"]+)">'
## debug = True # debug = True
return locals() return locals()
@support.scrape @support.scrape
-1
View File
@@ -18,7 +18,6 @@ host = config.get_channel_url(findhost)
headers = [['Referer', host]] headers = [['Referer', host]]
@support.menu @support.menu
def mainlist(item): def mainlist(item):
+1 -4
View File
@@ -29,9 +29,6 @@ host = config.get_channel_url(findhost)
headers = [['Referer', host]] headers = [['Referer', host]]
@support.menu @support.menu
def mainlist(item): def mainlist(item):
support.log() support.log()
@@ -76,7 +73,7 @@ def peliculas(item):
elif item.contentType == 'tvshow': elif item.contentType == 'tvshow':
# SEZIONE Serie TV- Anime - Documentari # SEZIONE Serie TV- Anime - Documentari
# pagination = 35 pagination = 35
if not item.args and 'anime' not in item.url: if not item.args and 'anime' not in item.url:
patron = r'<div class="movie">[^>]+>.+?src="(?P<thumb>[^"]+)" alt="[^"]+".+?href="(?P<url>[^"]+)">[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[ ](?P<rating>\d+.\d+|\d+)<[^>]+>[^>]+><h2>(?P<title>[^"]+)</h2>[ ]?(?:<span class="year">(?P<year>\d+|\-\d+))?<' patron = r'<div class="movie">[^>]+>.+?src="(?P<thumb>[^"]+)" alt="[^"]+".+?href="(?P<url>[^"]+)">[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[ ](?P<rating>\d+.\d+|\d+)<[^>]+>[^>]+><h2>(?P<title>[^"]+)</h2>[ ]?(?:<span class="year">(?P<year>\d+|\-\d+))?<'
+3 -4
View File
@@ -19,7 +19,6 @@ IDIOMAS = {'Italiano': 'IT'}
list_language = IDIOMAS.values() list_language = IDIOMAS.values()
@support.menu @support.menu
def mainlist(item): def mainlist(item):
log() log()
@@ -100,8 +99,8 @@ def lista_serie(item):
item.url, p = item.url.split('{}') item.url, p = item.url.split('{}')
p = int(p) p = int(p)
if '||' in item.url: if '||' in item.data:
series = item.url.split('\n\n') series = item.data.split('\n\n')
matches = [] matches = []
for i, serie in enumerate(series): for i, serie in enumerate(series):
matches.append(serie.split('||')) matches.append(serie.split('||'))
@@ -338,7 +337,7 @@ def list_az(item):
for letter in sorted(alphabet): for letter in sorted(alphabet):
itemlist.append( itemlist.append(
item.clone(action="lista_serie", item.clone(action="lista_serie",
url='\n\n'.join(alphabet[letter]), data='\n\n'.join(alphabet[letter]),
title=letter, title=letter,
fulltitle=letter)) fulltitle=letter))
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "streamingaltadefinizione", "id": "streamingaltadefinizione",
"name": "Popcorn Stream", "name": "Popcorn Stream",
"language": ["ita"], "language": ["ita"],
"active": true, "active": false,
"thumbnail": "popcornstream.png", "thumbnail": "popcornstream.png",
"banner": "popcornstream.png", "banner": "popcornstream.png",
"categories": ["movie","tvshow","anime"], "categories": ["movie","tvshow","anime"],
-3
View File
@@ -13,9 +13,6 @@ else:
from urllib import unquote from urllib import unquote
def findhost(): def findhost():
data = httptools.downloadpage('https://www.popcornstream-nuovo-indirizzo.online/').data data = httptools.downloadpage('https://www.popcornstream-nuovo-indirizzo.online/').data
return support.scrapertools.find_single_match(data, '<a href="([^"]+)') return support.scrapertools.find_single_match(data, '<a href="([^"]+)')
+1 -1
View File
@@ -224,7 +224,7 @@ class GenericChannelMenuItemTest(unittest.TestCase):
break break
for resIt in self.itemlist: for resIt in self.itemlist:
print resIt.title + ' -> ' + resIt.url logger.info(resIt.title + ' -> ' + resIt.url)
self.assertLess(len(resIt.fulltitle), 110, self.assertLess(len(resIt.fulltitle), 110,
'channel ' + self.ch + ' -> ' + self.title + ' might contain wrong titles<br>' + resIt.fulltitle) 'channel ' + self.ch + ' -> ' + self.title + ' might contain wrong titles<br>' + resIt.fulltitle)
if resIt.url: if resIt.url: