diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py index f3ae02b2..a3a9c194 100644 --- a/channels/mondoserietv.py +++ b/channels/mondoserietv.py @@ -111,7 +111,7 @@ def episodios(item): anime = True pagination = 50 patronBlock = r'(?P.*?)
' - patron = r'(?P(?:\d+)?.*?)\s*(?:(?P<episode>(?:\d+x\d+|\d+)))\s*(?P<title2>[^<]+)(?P<url>.*?)<tr>' + patron = r'<tr><td><b>(?P<title>(?:\d+)?.*?)\s*(?:(?P<episode>(?:\d+x\d+|\d+)))\s*(?P<title2>[^<]+)(?P<data>.*?)<tr>' def itemHook(item): clear = support.re.sub(r'\[[^\]]+\]', '', item.title) if clear.isdigit(): @@ -121,4 +121,4 @@ def episodios(item): def findvideos(item): if item.contentType == 'movie': return support.server(item) - else: return support.server(item, item.url) + else: return support.server(item, item.data) diff --git a/channels/paramount.json b/channels/paramount.json index 6a59a33a..cbc87415 100644 --- a/channels/paramount.json +++ b/channels/paramount.json @@ -1,7 +1,7 @@ { "id": "paramount", "name": "Paramount Network", - "active": true, + "active": false, "language": ["ita"], "thumbnail": "paramount.png", "banner": "paramount.png", diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py index ce3f5cab..dd6fe970 100644 --- a/channels/serietvsubita.py +++ b/channels/serietvsubita.py @@ -337,7 +337,8 @@ def list_az(item): item.clone(action="lista_serie", data='\n\n'.join(alphabet[letter]), title=letter, - fulltitle=letter)) + fulltitle=letter, + args='')) return itemlist diff --git a/core/support.py b/core/support.py index 5a7cadab..acc5a7a7 100755 --- a/core/support.py +++ b/core/support.py @@ -364,7 +364,7 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t fulltitle=item.fulltitle if function == 'episodios' else title, show=item.show if function == 'episodios' else title, quality=quality, - url=scraped["url"], + url=scraped["url"] if scraped["url"] else item.url, infoLabels=infolabels, thumbnail=item.prevthumb if item.prevthumb else item.thumbnail if not scraped["thumb"] else scraped["thumb"], args=item.args, diff --git a/servers/vvvvid.py b/servers/vvvvid.py index 50635aa1..b24af9a7 100644 --- a/servers/vvvvid.py +++ b/servers/vvvvid.py @@ -10,12 +10,18 @@ from platformcode import logger, config # Creating persistent session current_session = requests.Session() -headers = {'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0'} +headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36'} # Getting conn_id token from vvvvid and creating payload login_page = 'https://www.vvvvid.it/user/login' -conn_id = current_session.get(login_page, headers=headers).json()['data']['conn_id'] -payload = {'conn_id': conn_id} +try: + res = current_session.get(login_page, headers=headers) + conn_id = res.json()['data']['conn_id'] + payload = {'conn_id': conn_id} + headers = {'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14', 'Cookie': res.headers['set-cookie']} +except: + conn_id = '' + def test_video_exists(page_url):