From 8e0e9529b4cf08d4002269bafc4c7ea801136ad2 Mon Sep 17 00:00:00 2001
From: Alhaziel01 <alhaziel01@gmail.com>
Date: Mon, 4 Jan 2021 17:52:15 +0100
Subject: [PATCH] Fix Fembed e Streamtape

---
 servers/fembed.json   |  4 ++--
 servers/fembed.py     |  2 +-
 servers/streamtape.py | 10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/servers/fembed.json b/servers/fembed.json
index de73ab15..55158f3d 100644
--- a/servers/fembed.json
+++ b/servers/fembed.json
@@ -3,8 +3,8 @@
     "find_videos": {
         "ignore_urls": [],
         "patterns": [{
-            "pattern": "(?:fembed|divload|cercafilm|sonline|verystream|animeworld).(?:com|net|pro|info|biz)/((?:f|v)/[A-z0-9_-]+)",
-            "url": "https://www.feurl.com/\\1"
+            "pattern": "((?:fembed|divload|cercafilm|sonline|verystream|animeworld|tantifilm).([^/]+)/(?:f|v)/[A-z0-9_-]+)",
+            "url": "https://\\1"
         }]
     },
     "free": true,
diff --git a/servers/fembed.py b/servers/fembed.py
index ea96190c..699d3d47 100644
--- a/servers/fembed.py
+++ b/servers/fembed.py
@@ -9,7 +9,7 @@ def test_video_exists(page_url):
     logger.debug("(page_url='%s')" % page_url)
     global data
 
-    page_url = re.sub('://[^/]+/', '://feurl.com/', page_url)
+    # page_url = re.sub('://[^/]+/', '://feurl.com/', page_url)
     data = httptools.downloadpage(page_url).data
     if "Sorry 404 not found" in data or "This video is unavailable" in data or "Sorry this video is unavailable:" in data:
         return False,  config.get_localized_string(70449) % "fembed"
diff --git a/servers/streamtape.py b/servers/streamtape.py
index dab251d6..e1311620 100644
--- a/servers/streamtape.py
+++ b/servers/streamtape.py
@@ -4,6 +4,7 @@
 # --------------------------------------------------------
 from core import httptools, scrapertools
 from platformcode import logger, config
+from core.support import match
 import sys
 
 PY3 = False
@@ -26,11 +27,16 @@ 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 = scrapertools.find_single_match(data, 'innerHTML = "([^"]+)')
+    possible_url = ''
+    find_url = match(data, patron=r'''innerHTML = ["']([^"]+)["'](?:\s*\+\s*['"]([^"']+))?''').match
+    for m in find_url:
+        possible_url += m
+
     if not possible_url:
-        possible_url = scrapertools.find_single_match(data, "innerHTML\\'\]=\\'([^']+)")
+        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])