Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
marco
2020-10-08 20:43:17 +02:00
4 changed files with 22 additions and 14 deletions

View File

@@ -14,35 +14,35 @@
"animeworld": "https://www.animeworld.tv",
"casacinema": "https://www.casacinema.page",
"cb01anime": "https://www.cineblog01.red",
"cinemalibero": "https://www.cinemalibero.run",
"cinemalibero": "https://www.cinemalibero.space",
"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",
"filmpertutti": "https://www.filmpertutti.fun",
"filmsenzalimiticc": "https://www.filmsenzalimiti01.casa",
"filmstreaming01": "https://filmstreaming01.com",
"guardaserie_stream": "https://guardaserie.store",
"guardaserie_stream": "https://guardaserie.host",
"guardaseriecam": "https://guardaserie.cam",
"guardaserieclick": "https://www.guardaserie.guru",
"guardaserieclick": "https://www.guardaserie.blue",
"guardaserieicu": "https://guardaserie.us",
"hd4me": "https://hd4me.net",
"ilgeniodellostreaming": "https://ilgeniodellostreaming.lc",
"ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.cam",
"ilgeniodellostreaming": "https://ilgeniodellostreaming.fi",
"ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.tel",
"italiaserie": "https://italiaserie.org",
"mondoserietv": "https://mondoserietv.com",
"piratestreaming": "https://www.piratestreaming.cloud",
"mondoserietv": "https://mondoserietv.fun",
"piratestreaming": "https://www.piratestreaming.buzz",
"polpotv": "https://polpotv.life",
"raiplay": "https://www.raiplay.it",
"seriehd": "https://seriehd.group",
"serietvonline": "https://serietvonline.pw",
"serietvonline": "https://serietvonline.biz",
"serietvsubita": "http://serietvsubita.xyz",
"serietvu": "https://www.serietvu.link",
"streamingcommunity": "https://streamingcommunity.to",
"streamtime": "https://t.me/s/StreamTime",
"tantifilm": "https://www.tantifilm.fit",
"tantifilm": "https://www.tantifilm.tel",
"toonitalia": "https://toonitalia.org",
"vvvvid": "https://www.vvvvid.it"
}

View File

@@ -79,6 +79,7 @@ def peliculas(item):
anime = True
patronNext = r'href="([^"]+)" title="[^"]+" class="lcp_nextlink"'
action = 'findvideos'
# debug=True
if item.args == 'last':
patronBlock = r'<table>(?P<block>.*?)</table>'
patron = r'<tr><td><a href="(?P<url>[^"]+)">\s*[^>]+>(?P<title>.*?)(?:\s(?P<year>\d{4}))? (?:Streaming|</b>)'
@@ -98,7 +99,7 @@ def peliculas(item):
return item
else:
patronBlock = r'<div class="entry-content pagess">(?P<block>.*?)</ul>'
patron = r'<li><a href="(?P<url>[^"]+)" title="(?P<title>.*?)(?:\s(?P<year>\d{4}))?"[^>]*>'
patron = r'<li\s*><a href="(?P<url>[^"]+)" title="(?P<title>.*?)(?:\s(?P<year>\d{4}))?"[^>]*>'
if item.contentType == 'tvshow':
action = 'episodios'
anime = True

View File

@@ -16,6 +16,7 @@ session=requests.Session()
response = session.get(host)
csrf_token = support.match(response.text, patron= 'name="csrf-token" content="([^"]+)"').match
headers = {'content-type': 'application/json;charset=UTF-8',
'Referer': host,
'x-csrf-token': csrf_token,
'Cookie' : '; '.join([x.name + '=' + x.value for x in response.cookies])}
@@ -99,9 +100,10 @@ def peliculas(item):
records = json.loads(support.match(data, patron=r'slider-title titles-json="(.*?)" slider-name="').matches[item.args])
elif not item.search:
payload = json.dumps({'type': videoType, 'offset':offset, 'genre':item.args})
records = json.loads(requests.post(host + '/infinite/browse', headers=headers, data=payload).json()['records'])
records = requests.post(host + '/api/browse', headers=headers, data=payload).json()['records']
else:
records = requests.get(host + '/search?q=' + item.search + '&live=true', headers=headers).json()['records']
payload = json.dumps({'q': item.search})
records = requests.post(host + '/api/search', headers=headers, data=payload).json()['records']
if records and type(records[0]) == list:
js = []

View File

@@ -19,7 +19,12 @@ def test_video_exists(page_url):
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
video_urls = []
media_url = scrapertools.find_single_match(data, r'file:"([^"]+)"')
global data
new_data = scrapertools.find_single_match(data, r"<script type='text/javascript'>(eval.function.p,a,c,k,e,.*?)\s*</script>")
if new_data != "":
from lib import jsunpack
data = jsunpack.unpack(new_data)
media_url = scrapertools.find_single_match(data, r'file:"([^"]+)"') + '|Referer=' + page_url
video_urls.append(["%s [UPstream]" % media_url.split('.')[-1], media_url])
return video_urls