From 71a75044d8e22770bf6eadd7fe920a4d8f5cbf99 Mon Sep 17 00:00:00 2001
From: marco <m.toma99@gmail.com>
Date: Thu, 1 Oct 2020 21:08:53 +0200
Subject: [PATCH] piccoli fix, rimosso guardaserieicu(chiuso)

---
 channels.json                    |  1 -
 channels/animealtadefinizione.py |  2 +-
 channels/filmpertutti.py         |  4 +++-
 channels/guardaserieicu.json     |  2 +-
 core/support.py                  | 20 ++++++++++++--------
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/channels.json b/channels.json
index 3a946f66..fc70e105 100644
--- a/channels.json
+++ b/channels.json
@@ -27,7 +27,6 @@
     "guardaserie_stream": "https://guardaserie.store",
     "guardaseriecam": "https://guardaserie.cam",
     "guardaserieclick": "https://www.guardaserie.guru",
-    "guardaserieicu": "https://guardaserie.icu",
     "hd4me": "https://hd4me.net",
     "ilgeniodellostreaming": "https://ilgeniodellostreaming.lc",
     "ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.cam",
diff --git a/channels/animealtadefinizione.py b/channels/animealtadefinizione.py
index d3add57e..f78a9abe 100644
--- a/channels/animealtadefinizione.py
+++ b/channels/animealtadefinizione.py
@@ -81,7 +81,7 @@ def peliculas(item):
     # debug = True
     anime = True
     data = support.match(host + '/wp-admin/admin-ajax.php', post='action=itajax-sort&loop=main+loop&location=&thumbnail=1&rating=1sorter=recent&columns=4&numarticles='+perpage+'&paginated='+str(item.pag)+'&currentquery%5B'+query+'%5D='+searchtext).data.replace('\\','')
-    patron = '<a href="(?P<url>[^"]+)"><img width="[^"]+" height="[^"]+" src="(?P<thumb>[^"]+)" class="[^"]+" alt="" title="(?P<title>.*?)\s+(?P<type>Movie)?\s*(?P<lang>Sub Ita|Ita)?\s*[sS]treaming'
+    patron = r'<a href="(?P<url>[^"]+)"><img width="[^"]+" height="[^"]+" src="(?P<thumb>[^"]+)" class="[^"]+" alt="" title="(?P<title>[^"]+?)\s+(?P<type>Movie)?\s*(?P<lang>Sub Ita|Ita)?\s*[sS]treaming'
     typeContentDict = {'movie':['movie']}
     typeActionDict = {'findvideos':['movie']}
 
diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py
index b3822d9b..a368aa96 100644
--- a/channels/filmpertutti.py
+++ b/channels/filmpertutti.py
@@ -31,9 +31,11 @@ def mainlist(item):
     search = ''
     return locals()
 
+
 @support.scrape
 def peliculas(item):
     support.info()
+    # debug = True
 
     if item.args != 'newest':
         patronBlock = r'<ul class="posts">(?P<block>.*)<\/ul>'
@@ -42,7 +44,7 @@ def peliculas(item):
 
     else:
         patronBlock = r'<ul class="posts">(?P<block>.*)<div class="clear">'
-        patron = r'<li>\s?<a href="(?P<url>[^"]+)" data-thumbnail="(?P<thumb>[^"]+)">.*?<div class="title">(?P<title>.+?)(?:\s\[(?P<quality>HD)\])?<\/div>[^>]+>(?:[\dx]+)\s?(?:[ ]\((?P<lang>[a-zA-Z\-]+)\))?.+?</div>'
+        patron = r'<li>\s?<a href="(?P<url>[^"]+)" data-thumbnail="(?P<thumb>[^"]+)">.*?<div class="title">(?P<title>.+?)(?:\s\[(?P<quality>HD)\])?<\/div><div class="episode"[^>]+>(?P<episode>[^<(]+)(?:\((?P<lang>[a-zA-Z\-]+)\))?'
         pagination = ''
 
     if item.args == 'search':
diff --git a/channels/guardaserieicu.json b/channels/guardaserieicu.json
index 88ed70ae..321fb280 100644
--- a/channels/guardaserieicu.json
+++ b/channels/guardaserieicu.json
@@ -2,7 +2,7 @@
     "id": "guardaserieicu",
     "name": "Guarda Serie Icu",
     "language": ["ita", "sub-ita"],
-    "active": true,
+    "active": false,
     "thumbnail": "https://raw.githubusercontent.com/32Dexter/DexterRepo/master/media/guarda_serie.jpg",
     "banner": "",
     "categories": ["tvshow"],
diff --git a/core/support.py b/core/support.py
index 489eb00a..e29b02e0 100755
--- a/core/support.py
+++ b/core/support.py
@@ -206,7 +206,7 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
                 elif val.startswith('/'):
                     domain = scrapertools.find_single_match(item.url, 'https?://[a-z0-9.-]+')
                 val = domain + val
-            scraped[kk] = val
+            scraped[kk] = val.strip() if type(val) == str else val
 
         if scraped['season']:
             stagione = scraped['season']
@@ -229,13 +229,17 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
             episode = ''
         else:
             episode = unifyEp(scraped['episode']) if scraped['episode'] else ''
-            if 'x' in episode:
-                ep = episode.split('x')
-                episode = str(int(ep[0])).zfill(1) + 'x' + str(int(ep[1])).zfill(2)
-                item.infoLabels['season'] = int(ep[0])
-                item.infoLabels['episode'] = int(ep[1])
-            second_episode = scrapertools.find_single_match(episode, r'x\d+x(\d+)')
-            if second_episode: episode = re.sub(r'(\d+x\d+)x\d+',r'\1-', episode) + second_episode.zfill(2)
+            try:
+                if 'x' in episode:
+                    ep = episode.split('x')
+                    episode = str(int(ep[0])).zfill(1) + 'x' + str(int(ep[1])).zfill(2)
+                    item.infoLabels['season'] = int(ep[0])
+                    item.infoLabels['episode'] = int(ep[1])
+                second_episode = scrapertools.find_single_match(episode, r'x\d+x(\d+)')
+                if second_episode: episode = re.sub(r'(\d+x\d+)x\d+',r'\1-', episode) + second_episode.zfill(2)
+            except:
+                logger.debug('invalid episode: ' + episode)
+                pass
 
         #episode = re.sub(r'\s-\s|-|x|&#8211|&#215;', 'x', scraped['episode']) if scraped['episode'] else ''
         title = cleantitle(scraped['title']) if scraped['title'] else ''