From 6d2760278c18e91ef4f501153c228bcc6368852e Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Sat, 14 Aug 2021 19:19:31 +0200
Subject: [PATCH] Fix streamtape, filmpertutti->aggiornamenti

---
 channels/filmpertutti.py |  2 +-
 servers/streamtape.py    | 10 ++++------
 tests/test_generic.py    |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py
index 87929750..e00961f5 100644
--- a/channels/filmpertutti.py
+++ b/channels/filmpertutti.py
@@ -45,7 +45,7 @@ def peliculas(item):
         patronNext = r'<a href="([^"]+)[^>]+>Pagina'
     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><div class="episode[^"]*"[^>]+>(?P<episode>[^<(]+)(?:\((?P<lang>[a-zA-Z\-]+)\))?'
+        patron = r'<li>\s?<a href="(?P<url>[^"]+)" data-thumbnail="(?P<thumb>[^"]+)">.*?<div class="title[^"]*">(?P<title>.+?)(?:\s\[(?P<quality>HD)\])?<\/div>\s*<div class="episode[^"]*"[^>]+>(?P<episode>[^<(]+)(?:\((?P<lang>[a-zA-Z\-]+)\))?'
 
     if item.args == 'search':
         action = 'select'
diff --git a/servers/streamtape.py b/servers/streamtape.py
index e1311620..6656d0aa 100644
--- a/servers/streamtape.py
+++ b/servers/streamtape.py
@@ -27,17 +27,15 @@ def test_video_exists(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.debug("url=" + page_url)
-    # from core .support import dbg;dbg()
 
     video_urls = []
-    possible_url = ''
-    find_url = match(data, patron=r'''innerHTML = ["']([^"]+)["'](?:\s*\+\s*['"]([^"']+))?''').match
-    for m in find_url:
-        possible_url += m
+    find_url = match(data, patron=r'''innerHTML = ["']([^"]+)["'](?:\s*\+\s*['"(]+([^"']+))?''').match
+    possible_url = find_url[0]
+    possible_url += find_url[1][2:]
 
     if not possible_url:
         possible_url = match(data, patron=r"innerHTML\\'\]=\\'([^']+)").match
     url = "https:" + possible_url
     url = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers.get("location", "")
     video_urls.append(['MP4 [Streamtape]', url])
-    return video_urls
\ No newline at end of file
+    return video_urls
diff --git a/tests/test_generic.py b/tests/test_generic.py
index 6d02caf4..3b2ebd1f 100644
--- a/tests/test_generic.py
+++ b/tests/test_generic.py
@@ -64,7 +64,7 @@ validUrlRegex = re.compile(
     r'(?::\d+)?'  # optional port
     r'(?:/?|[/?]\S+)$', re.IGNORECASE)
 
-chBlackList = ['url', 'mediasetplay']
+chBlackList = ['url', 'mediasetplay', 'metalvideo']
 srvBlacklist = ['mega', 'hdmario', 'torrent', 'youtube']
 chNumRis = {
     'altadefinizione01': {