stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix altadefinizionecommunity

Browse Source
This commit is contained in:
mac12m99
2021-08-17 12:56:06 +02:00
parent e38ec3527c
commit 664d1da7b7
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/altadefinizionecommunity.py
+12 -15
View File
@@ -6,8 +6,6 @@ from lib.fakeMail import Gmailnator
from platformcode import config, platformtools, logger from platformcode import config, platformtools, logger
from core import scrapertools, httptools from core import scrapertools, httptools
from lib import cloudscraper
def findhost(url): def findhost(url):
return support.match(url, patron=r'<a href="([^"]+)/\w+">Accedi').match return support.match(url, patron=r'<a href="([^"]+)/\w+">Accedi').match
@@ -17,7 +15,6 @@ host = config.get_channel_url(findhost)
register_url = 'https://altaregistrazione.com' register_url = 'https://altaregistrazione.com'
headers = {'Referer': host, 'x-requested-with': 'XMLHttpRequest'} headers = {'Referer': host, 'x-requested-with': 'XMLHttpRequest'}
cf = cloudscraper.create_scraper()
@support.menu @support.menu
def mainlist(item): def mainlist(item):
@@ -44,8 +41,8 @@ def mainlist(item):
def login(): def login():
r = cf.get(host) r = support.httptools.downloadpage(host, cloudscraper=True)
Token = support.match(r.text, patron=r'name=\s*"_token"\s*value=\s*"([^"]+)').match Token = support.match(r.data, patron=r'name=\s*"_token"\s*value=\s*"([^"]+)', cloudscraper=True).match
if 'id="logged"' in r.text: if 'id="logged"' in r.text:
logger.info('Già loggato') logger.info('Già loggato')
else: else:
@@ -55,7 +52,7 @@ def login():
'email': config.get_setting('username', channel='altadefinizionecommunity'), 'email': config.get_setting('username', channel='altadefinizionecommunity'),
'password':config.get_setting('password', channel='altadefinizionecommunity')} 'password':config.get_setting('password', channel='altadefinizionecommunity')}
r = cf.post(host + '/login', json=post, headers={'referer': host}) r = support.httptools.downloadpage(host + '/login', post=post, headers={'referer': host}, cloudscraper=True)
if not r.status_code in [200, 302] or 'Email o Password non validi' in r.text: if not r.status_code in [200, 302] or 'Email o Password non validi' in r.text:
platformtools.dialog_ok('AltadefinizioneCommunity', 'Username/password non validi') platformtools.dialog_ok('AltadefinizioneCommunity', 'Username/password non validi')
return False return False
@@ -95,7 +92,7 @@ def registerOrLogin():
reg = platformtools.dialog_register(register_url, email=True, password=True, email_default=mailbox.address, password_default=randPsw) reg = platformtools.dialog_register(register_url, email=True, password=True, email_default=mailbox.address, password_default=randPsw)
if not reg: if not reg:
return False return False
regPost = httptools.downloadpage(register_url, post={'email': reg['email'], 'password': reg['password']}) regPost = httptools.downloadpage(register_url, post={'email': reg['email'], 'password': reg['password']}, cloudscraper=True)
if regPost.url == register_url: if regPost.url == register_url:
error = scrapertools.htmlclean(scrapertools.find_single_match(regPost.data, 'Impossibile proseguire.*?</div>')) error = scrapertools.htmlclean(scrapertools.find_single_match(regPost.data, 'Impossibile proseguire.*?</div>'))
@@ -111,7 +108,7 @@ def registerOrLogin():
if mail: if mail:
checkUrl = scrapertools.find_single_match(mail.body, '<a href="([^"]+)[^>]+>Verifica').replace(r'\/', '/') checkUrl = scrapertools.find_single_match(mail.body, '<a href="([^"]+)[^>]+>Verifica').replace(r'\/', '/')
logger.debug('CheckURL: ' + checkUrl) logger.debug('CheckURL: ' + checkUrl)
httptools.downloadpage(checkUrl) httptools.downloadpage(checkUrl, cloudscraper=True)
config.set_setting('username', mailbox.address, channel='altadefinizionecommunity') config.set_setting('username', mailbox.address, channel='altadefinizionecommunity')
config.set_setting('password', randPsw, channel='altadefinizionecommunity') config.set_setting('password', randPsw, channel='altadefinizionecommunity')
platformtools.dialog_ok('AltadefinizioneCommunity', platformtools.dialog_ok('AltadefinizioneCommunity',
@@ -136,13 +133,13 @@ def peliculas(item):
support.info(item) support.info(item)
if '/load-more-film' not in item.url and '/search' not in item.url: # generi o altri menu, converto if '/load-more-film' not in item.url and '/search' not in item.url: # generi o altri menu, converto
import ast import ast
ajax = support.match(item.url, patron='ajax_data\s*=\s*"?\s*([^;]+)').match ajax = support.match(item.url, patron='ajax_data\s*=\s*"?\s*([^;]+)', cloudscraper=True).match
item.url = host + '/load-more-film?' + support.urlencode(ast.literal_eval(ajax)) + '&page=1' item.url = host + '/load-more-film?' + support.urlencode(ast.literal_eval(ajax)) + '&page=1'
if not '/search' in item.url: if not '/search' in item.url:
json = support.httptools.downloadpage(item.url, headers=headers).json json = support.httptools.downloadpage(item.url, headers=headers, cloudscraper=True).json
data = "\n".join(json['data']) data = "\n".join(json['data'])
else: else:
data = support.httptools.downloadpage(item.url, headers=headers).data data = support.httptools.downloadpage(item.url, headers=headers, cloudscraper=True).data
patron = r'wrapFilm">\s*<a href="(?P<url>[^"]+)">\s*<span class="year">(?P<year>[0-9]{4})</span>\s*<span[^>]+>[^<]+</span>\s*<span class="qual">(?P<quality>[^<]+).*?<img src="(?P<thumbnail>[^"]+)[^>]+>\s*<h3>(?P<title>[^<[]+)(?:\[(?P<lang>[sSuUbBiItTaA-]+))?' patron = r'wrapFilm">\s*<a href="(?P<url>[^"]+)">\s*<span class="year">(?P<year>[0-9]{4})</span>\s*<span[^>]+>[^<]+</span>\s*<span class="qual">(?P<quality>[^<]+).*?<img src="(?P<thumbnail>[^"]+)[^>]+>\s*<h3>(?P<title>[^<[]+)(?:\[(?P<lang>[sSuUbBiItTaA-]+))?'
# paginazione # paginazione
@@ -176,7 +173,7 @@ def search(item, texto):
@support.scrape @support.scrape
def genres(item): def genres(item):
support.info(item) support.info(item)
data = cf.get(item.url).text data = support.httptools.downloadpage(item.url, cloudscraper=True).data
patronMenu = r'<a href="(?P<url>[^"]+)">(?P<title>[^<]+)' patronMenu = r'<a href="(?P<url>[^"]+)">(?P<title>[^<]+)'
if item.args == 'quality': if item.args == 'quality':
@@ -209,7 +206,7 @@ def findvideos(item):
itemlist = [] itemlist = []
video_url = item.url video_url = item.url
if '/watch-unsubscribed' not in video_url: if '/watch-unsubscribed' not in video_url:
playWindow = support.match(cf.get(item.url).text, patron='playWindow" href="([^"]+)') playWindow = support.match(support.httptools.downloadpage(item.url, cloudscraper=True).data, patron='playWindow" href="([^"]+)')
video_url = playWindow.match video_url = playWindow.match
if '/tvshow' in video_url: if '/tvshow' in video_url:
item.data = playWindow.data item.data = playWindow.data
@@ -217,7 +214,7 @@ def findvideos(item):
return episodios(item) return episodios(item)
item.contentType = 'movie' item.contentType = 'movie'
itemlist.append(item.clone(action='play', url=support.match(video_url.replace('/watch-unsubscribed', '/watch-external'), itemlist.append(item.clone(action='play', url=support.match(video_url.replace('/watch-unsubscribed', '/watch-external'),
patron='allowfullscreen[^<]+src="([^"]+)"').match, quality='')) patron='allowfullscreen[^<]+src="([^"]+)"', cloudscraper=True).match, quality=''))
# itemlist.append(item.clone(action='play', server='directo', title=support.config.get_localized_string(30137), # itemlist.append(item.clone(action='play', server='directo', title=support.config.get_localized_string(30137),
# url=video_url.replace('/watch-unsubscribed', '/watch'))) # url=video_url.replace('/watch-unsubscribed', '/watch')))
return support.server(item, itemlist=itemlist) return support.server(item, itemlist=itemlist)
@@ -226,7 +223,7 @@ def findvideos(item):
def play(item): def play(item):
if host in item.url: # intercetto il server proprietario if host in item.url: # intercetto il server proprietario
if registerOrLogin(): if registerOrLogin():
return support.get_jwplayer_mediaurl(cf.get(item.url).text, 'Diretto') return support.get_jwplayer_mediaurl(support.httptools.downloadpage(item.url, cloudscraper=True).data, 'Diretto')
else: else:
platformtools.play_canceled = True platformtools.play_canceled = True
return [] return []
core/httptools.py
+9 -5
View File
@@ -285,12 +285,16 @@ def downloadpage(url, **opt):
parse = urlparse.urlparse(url) parse = urlparse.urlparse(url)
domain = parse.netloc domain = parse.netloc
from lib import requests if opt.get('cloudscraper'):
session = requests.session() from lib import cloudscraper
session = cloudscraper.create_scraper()
else:
from lib import requests
session = requests.session()
if config.get_setting('resolver_dns') and not opt.get('use_requests', False): if config.get_setting('resolver_dns') and not opt.get('use_requests', False):
from core import resolverdns from core import resolverdns
session.mount('https://', resolverdns.CipherSuiteAdapter(domain)) session.mount('https://', resolverdns.CipherSuiteAdapter(domain))
req_headers = default_headers.copy() req_headers = default_headers.copy()