From d7ab122d3157283792754a201637ef4ec93f78da Mon Sep 17 00:00:00 2001 From: marco <10120390+mac12m99@users.noreply.github.com> Date: Sun, 4 Dec 2022 14:33:15 +0100 Subject: [PATCH] Riattivato filmstreaming, fix minori --- channels.json | 2 +- channels/animesaturn.py | 2 +- channels/animeunity.py | 21 +++++++++++---------- channels/filmstreaming.json | 2 +- lib/unshortenit.py | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/channels.json b/channels.json index f21a118c..8f2018ad 100644 --- a/channels.json +++ b/channels.json @@ -16,7 +16,7 @@ "dreamsub": "https://www.animeworld.tv", "eurostreaming": "https://eurostreaming.autos", "eurostreaming_actor": "https://eurostreaming.taxi", - "filmstreaming": "https://filmstreaming.media", + "filmstreaming": "https://filmstreaming.sbs", "guardaseriecam": "https://guardaserie.baby", "hd4me": "https://hd4me.net", "ilcorsaronero": "https://ilcorsaronero.link", diff --git a/channels/animesaturn.py b/channels/animesaturn.py index eecc547e..ebb9b668 100644 --- a/channels/animesaturn.py +++ b/channels/animesaturn.py @@ -143,7 +143,7 @@ def peliculas(item): return itemlist else: - pagination = '' + # pagination = '' if item.args == 'incorso': patron = r']+>(?P[^<(]+)(?:\s*\((?P<year>\d+)\))?(?:\s*\((?P<lang>[A-za-z-]+)\))?</a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s*<img width="[^"]+" height="[^"]+" src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<plot>[^<]+)<' else: diff --git a/channels/animeunity.py b/channels/animeunity.py index 79c51155..79954d89 100644 --- a/channels/animeunity.py +++ b/channels/animeunity.py @@ -124,16 +124,17 @@ def news(item): js = fullJs['data'] for it in js: - itemlist.append( - item.clone(title= support.typo(it['anime']['title'] + ' - EP. ' + it['number'], 'bold'), - fulltitle=it['anime']['title'], - thumbnail=it['anime']['imageurl'], - forcethumb = True, - scws_id=it.get('scws_id', ''), - # video_url=it.get('link', ''), - plot=it['anime']['plot'], - action='findvideos') - ) + if it.get('anime', {}).get('title'): + itemlist.append( + item.clone(title= support.typo(it['anime']['title'] + ' - EP. ' + it['number'], 'bold'), + fulltitle=it['anime']['title'], + thumbnail=it['anime']['imageurl'], + forcethumb = True, + scws_id=it.get('scws_id', ''), + # video_url=it.get('link', ''), + plot=it['anime']['plot'], + action='findvideos') + ) if 'next_page_url' in fullJs: itemlist.append(item.clone(title=support.typo(support.config.get_localized_string(30992), 'color kod bold'),thumbnail=support.thumb(), url=fullJs['next_page_url'])) return itemlist diff --git a/channels/filmstreaming.json b/channels/filmstreaming.json index 33c72e49..54030798 100644 --- a/channels/filmstreaming.json +++ b/channels/filmstreaming.json @@ -2,7 +2,7 @@ "id": "filmstreaming", "name": "Film Streaming", "language": ["ita"], - "active": false, + "active": true, "thumbnail": "filmstreaming.png", "banner": "filmstreaming.png", "categories": ["movie"], diff --git a/lib/unshortenit.py b/lib/unshortenit.py index 95885783..13f823ba 100644 --- a/lib/unshortenit.py +++ b/lib/unshortenit.py @@ -506,11 +506,11 @@ class UnshortenIt(object): r = httptools.downloadpage(uri, timeout=self._timeout, cookies=False) html = r.data - uri = re.findall(r'<iframe\s+src="([^"]+)', html)[0] - if not uri and 'Questo video è in conversione' in html: + n_uri = re.findall(r'<iframe\s+src="([^"]+)', html) + if not n_uri and 'Questo video è in conversione' in html: return uri, 404 - return uri, r.code + return n_uri[0], r.code except Exception as e: return uri, str(e)