From 38774a6f8b82ac09205206ac30c397b6a24aa132 Mon Sep 17 00:00:00 2001
From: mac12m99 <m.toma99@gmail.com>
Date: Sun, 17 Mar 2019 11:42:47 +0100
Subject: [PATCH] fix scrapertoolsV2 issues on cineblog01

---
 plugin.video.alfa/channels/cineblog01.py | 25 ++++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/plugin.video.alfa/channels/cineblog01.py b/plugin.video.alfa/channels/cineblog01.py
index e9039158..2bc9f5ff 100644
--- a/plugin.video.alfa/channels/cineblog01.py
+++ b/plugin.video.alfa/channels/cineblog01.py
@@ -468,27 +468,26 @@ def play(item):
     logger.debug("##############################################################")
     if "go.php" in item.url:
         data = httptools.downloadpage(item.url).data
-        try:
-            data = scrapertoolsV2.get_match(data, 'window.location.href = "([^"]+)";')
-        except IndexError:
-            try:
-                # data = scrapertoolsV2.get_match(data, r'<a href="([^"]+)">clicca qui</a>')
-                # In alternativa, dato che a volte compare "Clicca qui per proseguire":
-                data = scrapertoolsV2.get_match(data, r'<a href="([^"]+)".*?class="btn-wrapper">.*?licca.*?</a>')
-            except IndexError:
-                data = httptools.downloadpage(item.url, only_headers=True, follow_redirects=False).headers.get(
+        match = scrapertoolsV2.get_match(data, 'window.location.href = "([^"]+)";')
+        if match=="":
+            # data = scrapertoolsV2.get_match(data, r'<a href="([^"]+)">clicca qui</a>')
+            # In alternativa, dato che a volte compare "Clicca qui per proseguire":
+            match = scrapertoolsV2.get_match(data, r'<a href="([^"]+)".*?class="btn-wrapper">.*?licca.*?</a>')
+            if match=="":
+                match = httptools.downloadpage(item.url, only_headers=True, follow_redirects=False).headers.get(
                     "location", "")
+        data = match
         data, c = unshortenit.unwrap_30x_only(data)
         logger.debug("##### play go.php data ##\n%s\n##" % data)
     elif "/link/" in item.url:
         data = httptools.downloadpage(item.url).data
         from lib import jsunpack
 
-        try:
-            data = scrapertoolsV2.get_match(data, r"(eval\(function\(p,a,c,k,e,d.*?)</script>")
-            data = jsunpack.unpack(data)
+        match = scrapertoolsV2.get_match(data, r"(eval\(function\(p,a,c,k,e,d.*?)</script>")
+        if match:
+            match = jsunpack.unpack(match)
             logger.debug("##### play /link/ unpack ##\n%s\n##" % data)
-        except IndexError:
+        else:
             logger.debug("##### The content is yet unpacked ##\n%s\n##" % data)
 
         data = scrapertoolsV2.find_single_match(data, r'var link(?:\s)?=(?:\s)?"([^"]+)";')