From 98a03439f117eca94bd22c79d2b2e3f6a89f46a1 Mon Sep 17 00:00:00 2001
From: marco <m.toma99@gmail.com>
Date: Thu, 13 Aug 2020 20:13:43 +0200
Subject: [PATCH] fix parziale tantifilm e fix guardaserie cam/icu in libreria

---
 channels.json                                 |  4 +-
 ...uardaserieCam.json => guardaseriecam.json} |  2 +-
 .../{guardaserieCam.py => guardaseriecam.py}  |  3 --
 ...uardaserieIcu.json => guardaserieicu.json} |  2 +-
 .../{guardaserieIcu.py => guardaserieicu.py}  |  0
 channels/ilgeniodellostreaming.py             |  2 -
 channels/tantifilm.py                         | 54 +++++++++++++------
 core/support.py                               |  1 +
 8 files changed, 44 insertions(+), 24 deletions(-)
 rename channels/{guardaserieCam.json => guardaseriecam.json} (91%)
 rename channels/{guardaserieCam.py => guardaseriecam.py} (99%)
 rename channels/{guardaserieIcu.json => guardaserieicu.json} (91%)
 rename channels/{guardaserieIcu.py => guardaserieicu.py} (100%)

diff --git a/channels.json b/channels.json
index 8f4e94ce..e677f9ee 100644
--- a/channels.json
+++ b/channels.json
@@ -23,8 +23,8 @@
   "filmigratis": "https://filmigratis.org",
   "filmsenzalimiticc": "https://www.filmsenzalimiti01.casa",
   "filmstreaming01": "https://filmstreaming01.com",
-  "guardaserieCam": "https://guardaserie.cam",
-  "guardaserieIcu": "https://guardaserie.icu",
+  "guardaseriecam": "https://guardaserie.cam",
+  "guardaserieicu": "https://guardaserie.icu",
   "guardaserie_stream": "https://guardaserie.store",
   "guardaserieclick": "https://www.guardaserie.fit",
   "hd4me": "https://hd4me.net",
diff --git a/channels/guardaserieCam.json b/channels/guardaseriecam.json
similarity index 91%
rename from channels/guardaserieCam.json
rename to channels/guardaseriecam.json
index 83a4730d..f0e78dfd 100644
--- a/channels/guardaserieCam.json
+++ b/channels/guardaseriecam.json
@@ -1,5 +1,5 @@
 {
-    "id": "guardaserieCam",
+    "id": "guardaseriecam",
     "name": "GuardaSerie Cam",
     "language": ["ita", "sub-ita"],
     "active": true,
diff --git a/channels/guardaserieCam.py b/channels/guardaseriecam.py
similarity index 99%
rename from channels/guardaserieCam.py
rename to channels/guardaseriecam.py
index 03b27fd2..3fb78a62 100644
--- a/channels/guardaserieCam.py
+++ b/channels/guardaseriecam.py
@@ -18,9 +18,6 @@ host = config.get_channel_url()
 headers = [['Referer', host]]
 
 
-
-
-
 @support.menu
 def mainlist(item):
     tvshow = ['/serietv-streaming',
diff --git a/channels/guardaserieIcu.json b/channels/guardaserieicu.json
similarity index 91%
rename from channels/guardaserieIcu.json
rename to channels/guardaserieicu.json
index 2c31f617..88ed70ae 100644
--- a/channels/guardaserieIcu.json
+++ b/channels/guardaserieicu.json
@@ -1,5 +1,5 @@
 {
-    "id": "guardaserieIcu",
+    "id": "guardaserieicu",
     "name": "Guarda Serie Icu",
     "language": ["ita", "sub-ita"],
     "active": true,
diff --git a/channels/guardaserieIcu.py b/channels/guardaserieicu.py
similarity index 100%
rename from channels/guardaserieIcu.py
rename to channels/guardaserieicu.py
diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py
index 9c754543..08a88d70 100644
--- a/channels/ilgeniodellostreaming.py
+++ b/channels/ilgeniodellostreaming.py
@@ -5,8 +5,6 @@
 # ------------------------------------------------------------
 
 
-import re
-
 from core import support
 from core.support import log
 from core.item import Item
diff --git a/channels/tantifilm.py b/channels/tantifilm.py
index 5e0e0e1d..ab038597 100644
--- a/channels/tantifilm.py
+++ b/channels/tantifilm.py
@@ -20,6 +20,7 @@ def findhost():
 host = config.get_channel_url(findhost)
 headers = [['Referer', host]]
 
+player_iframe = r'<iframe src="([^"]+)"[^>]+></iframe>\s?<div class="player'
 
 @support.menu
 def mainlist(item):
@@ -53,7 +54,7 @@ def peliculas(item):
         # support.regexDbg(item, patron, headers)
     else:
         patronNext = r'<a class="nextpostslink" rel="next" href="([^"]+)">'
-        patron = r'<div class="mediaWrap mediaWrapAlt">\s*<a href="(?P<url>[^"]+)"(?:[^>]+>)>?\s*<img[^s]+src="([^"]+)"[^>]+>\s*<\/a>[^>]+>[^>]+>[^>]+>(?P<title>.+?)(?P<lang>[sSuUbB\-iItTaA]+)?(?:[ ]?\((?P<year>\d{4})-?(?:\d{4})?)\).[^<]+[^>]+><\/a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s*(?P<quality>[a-zA-Z-0-9\.]+)'
+        patron = r'<div class="mediaWrap mediaWrapAlt">\s*<a href="(?P<url>[^"]+)"(?:[^>]+)?>?\s*<img[^s]+src="([^"]+)"[^>]+>\s*<\/a>[^>]+>[^>]+>[^>]+>(?P<title>.+?)(?P<lang>[sSuUbB\-iItTaA]+)?(?:[ ]?\((?P<year>\d{4})-?(?:\d{4})?)\).[^<]+[^>]+><\/a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s*(?P<quality>[a-zA-Z-0-9\.]+)'
         patronBlock = r'<div id="main_col">(?P<block>.*?)<!\-\- main_col \-\->'
 
     # if item.args != 'all' and item.args != 'search':
@@ -72,20 +73,20 @@ def episodios(item):
         data_check = re.sub(r'>\s+<', '> <', data_check)
     else:
         data_check = item.data
-    patron_check = r'<iframe src="([^"]+)"'
-    data = httptools.downloadpage(scrapertools.find_single_match(data_check, patron_check), headers=headers).data
+    data = httptools.downloadpage(scrapertools.find_single_match(data_check, player_iframe), headers=headers).data
     data = data.replace("'", '"')
     data = re.sub('\n|\t', ' ', data)
     data = re.sub(r'>\s+<', '> <', data)
 
     patronBlock = r'Stagioni<\/a>.*?<ul class="nav navbar-nav">(?P<block>.*?)<\/ul>'
     patron = r'<a href="(?P<url>[^"]+)"\s*>\s*<i[^>]+><\/i>\s*(?P<episode>\d+)<\/a>'
-    # debug = True
+    # debugBlock = True
 
     otherLinks = support.match(data_check, patronBlock='<div class="content-left-film">.*?Keywords', patron='([0-9]+)(?:×|x)([0-9]+(?:-[0-9]+)?)(.*?)(?:<br|$)').matches
 
     def itemlistHook(itemlist):
         retItemlist = []
+
         for item in itemlist:
             item.contentType = 'episode'
 
@@ -93,8 +94,8 @@ def episodios(item):
             season_data = httptools.downloadpage(item.url).data
             season_data = re.sub('\n|\t', ' ', season_data)
             season_data = re.sub(r'>\s+<', '> <', season_data)
-            block = scrapertools.find_single_match(season_data, 'Episodi.*?<ul class="nav navbar-nav">(.*?)</ul>')
-            episodes = scrapertools.find_multiple_matches(block, '<a href="([^"]+)"\s*>\s*<i[^>]+><\/i>\s*(\d+)<\/a>')
+            # block = scrapertools.find_single_match(season_data, 'Episodi.*?<ul class="nav navbar-nav">(.*?)</ul>')
+            episodes = scrapertools.find_multiple_matches(season_data, '<a.*?href="(?P<url>[^"]+)"[^>]+>Episodio (?P<episode>[0-9]+)(?::\s*(?P<title2>[^<]+))?')
             for url, episode in episodes:
                 i = item.clone()
                 i.action = 'findvideos'
@@ -110,7 +111,7 @@ def episodios(item):
         retItemlist.sort(key=lambda e: (int(e.contentSeason), int(e.contentEpisodeNumber)))
         return retItemlist
 
-    #debug = True
+    # debugBlock = True
     return locals()
 
 
@@ -153,10 +154,20 @@ def newest(categoria):
     return locals()
 
 
+@support.scrape
+def hdpass(item):
+    patronBlock = r'<ul class="nav navbar-nav">(?P<block>.*?)</ul>'
+    patron = r'<a.*?href="(?P<url>[^"]+)">'
+
+    def itemHook(item):
+        url = support.match(item.url, patron='<iframe.*?src="([^"]+)').match
+        return Item(url=url)
+
+    return locals()
+
+
 def findvideos(item):
     log()
-    listurl = set()
-    itemlist = []
     support.log("ITEMLIST: ", item)
     data = support.match(item.url, headers=headers).data
     check = support.match(data, patron=r'<div class="category-film">(.*?)</div>').match
@@ -190,11 +201,24 @@ def findvideos(item):
     #             listurl.add(url)
     # data += '\n'.join(listurl)
     log(data)
-    urls = support.match(data, patron=r'<iframe.*?src="([^"]+)"').matches
-    if item.otherLinks:
-        urls += support.match(item.otherLinks, patron=r'href="([^"]+)').matches
-    log('URLS',urls)
+    itemlist = []
+    # support.dbg()
 
-    itemlist = support.server(item, urls)
-    support.addQualityTag(item, itemlist, data, 'Keywords:\s*(?:<span>)?([^<]+)')
+    if '/serietv/series/names' in item.url:
+        itemlist.extend(support.server(item, itemlist=hdpass(Item(url=item.url))))
+    else:
+        urls = support.match(data, patron=player_iframe).matches
+        # support.dbg()
+        if item.otherLinks:
+            urls += support.match(item.otherLinks, patron=r'href="([^"]+)').matches
+
+        log('URLS', urls)
+        for u in urls:
+            if 'hdplayer.casa/series/' in u:
+                urls.remove(u)
+                itemlist.extend(support.server(item, itemlist=hdpass(Item(url=u))))
+                break
+        else:
+            itemlist.extend(support.server(item, urls))
+        support.addQualityTag(item, itemlist, data, 'Keywords:\s*(?:<span>)?([^<]+)')
     return itemlist
diff --git a/core/support.py b/core/support.py
index 43a77b9c..95622ae7 100755
--- a/core/support.py
+++ b/core/support.py
@@ -1200,6 +1200,7 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
         videoitem.contentType = item.contentType
         videoitem.infoLabels = item.infoLabels
         videoitem.quality = quality
+        videoitem.action = "play"
         # videoitem.nfo = item.nfo
         # videoitem.strm_path = item.strm_path
         return videoitem