From c65c924d1f5f0ba2dda096b00f0d1601ea3b9930 Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Wed, 27 Oct 2021 20:31:38 +0200
Subject: [PATCH] Fix guardaserieicu

---
 channels/casacinema.py     |  4 +---
 channels/guardaserieicu.py | 12 +++++++++---
 servers/upstream.py        |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/channels/casacinema.py b/channels/casacinema.py
index 90bb2376..eb1b8b1b 100644
--- a/channels/casacinema.py
+++ b/channels/casacinema.py
@@ -146,9 +146,7 @@ def findvideos(item):
         matchData = item.data if item.data else item
         links = support.match(matchData, patron=r'(?:SRC|href)="([^"]+)"', patronBlock=r'<div class="col-md-10">(.+?)<div class="ads">').matches
     data = ''
-    from lib.unshortenit import unshorten_only
     for link in links:
         support.info('URL=',link)
-        url, c = unshorten_only(link.replace('#', 'speedvideo.net'))
-        data += url + '\n'
+        data += link + '\n'
     return support.server(item, data)
diff --git a/channels/guardaserieicu.py b/channels/guardaserieicu.py
index 4d60f951..e2249a80 100644
--- a/channels/guardaserieicu.py
+++ b/channels/guardaserieicu.py
@@ -18,27 +18,32 @@ host = config.get_channel_url()
 headers = [['Referer', host]]
 
 
-
-
 @support.menu
 def mainlist(item):
     tvshow = ['/serie']
     return locals()
 
+
 @support.scrape
 def peliculas(item):
+    # debug = True
     patronBlock = r'movies-list movies-list-full(?P<block>.*?)footer>'
-    patron = r'<div data-movie-id[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>[^>]+>[^>]+><img src="(?P<thumbnail>[^"]+)[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^<]+).*?jt-info[^>]+>[^:]+:\s*(?P<rating>[^<]+)[^>]+>[^>]+>[^>]+>(?P<year>\d*)[^>]+>[^>]+>[^>]+>(?P<duration>\d*)'
+    if item.args == 'search':
+        patron = r'<div data-movie-id[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>\s*<img src="(?P<thumbnail>[^"]+)[^>]+>[^>]+>[^>]+>(?P<title>[^<]+).*?jt-info[^>]+>[^:]+:\s*(?P<rating>[^<]+)[^>]+>[^>]+>[^>]+>(?P<year>\d*)[^>]+>[^>]+>[^>]+>(?P<duration>\d*).*?"f-desc">\s*<p>(?P<plot>[^<]+)'
+    else:
+        patron = r'<div data-movie-id[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>[^>]+>[^>]+><img src="(?P<thumbnail>[^"]+)[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^<]+).*?jt-info[^>]+>[^:]+:\s*(?P<rating>[^<]+)[^>]+>[^>]+>[^>]+>(?P<year>\d*)[^>]+>[^>]+>[^>]+>(?P<duration>\d*)'
     patronNext = '<li class=.active.>.*?href=.(.*?).>'
     action = 'episodios'
     return locals()
 
+
 @support.scrape
 def episodios(item):
     patronBlock = r'<strong>Stagione (?P<season>[0-9]+)(?P<block>.*?)</div></div>'
     patron = r'<a href="(?P<url>[^"]+)">\s*Episodio\s*(?P<episode>[0-9]+)'
     return locals()
 
+
 def search(item, text):
     info(text)
     item.contentType = 'tvshow'
@@ -53,6 +58,7 @@ def search(item, text):
 
     return []
 
+
 def findvideos(item):
     support.info('findvideos', item)
     data = support.match(item, headers=headers, patron=r'div class="movieplay">([^>]+)').matches
diff --git a/servers/upstream.py b/servers/upstream.py
index 9ac6fbb1..73520f21 100644
--- a/servers/upstream.py
+++ b/servers/upstream.py
@@ -12,7 +12,7 @@ def test_video_exists(page_url):
 	logger.debug("(page_url='%s')" % page_url)
 	global data
 	data = httptools.downloadpage(page_url).data
-	if "as it expired or has been deleted" in data:
+	if "as it expired or has been deleted" in data or "Video is processing now" in data:
 		return False, config.get_localized_string(70449) % "UPstream"
 	return True, ""