From 929e2ec42db3c1b74b7b2f20b4ae70bc236b4a32 Mon Sep 17 00:00:00 2001
From: marco <m.toma99@gmail.com>
Date: Sun, 17 May 2020 11:34:09 +0200
Subject: [PATCH] aggiunto server Streamtape

---
 core/support.py         |  3 ++-
 servers/streamtape.json | 42 +++++++++++++++++++++++++++++++++++++++++
 servers/streamtape.py   | 28 +++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 servers/streamtape.json
 create mode 100644 servers/streamtape.py

diff --git a/core/support.py b/core/support.py
index 589e1b0b..5e9f89f7 100755
--- a/core/support.py
+++ b/core/support.py
@@ -40,6 +40,7 @@ def hdpass_get_servers(item):
 
         for mir_url, srv in scrapertools.find_multiple_matches(mir, patron_option):
             mir_url = scrapertools.decodeHtmlentities(mir_url)
+            log(mir_url)
             ret.append(Item(channel=item.channel,
                             action="play",
                             fulltitle=item.fulltitle,
@@ -58,7 +59,7 @@ def hdpass_get_servers(item):
     else:
         data = httptools.downloadpage(item.url).data.replace('\n', '')
         patron = r'<iframe(?: id="[^"]+")? width="[^"]+" height="[^"]+" src="([^"]+)"[^>]+><\/iframe>'
-        url = scrapertools.find_single_match(data, patron).replace("?alta", "")
+        url = scrapertools.find_single_match(data, patron)
         url = url.replace("&download=1", "")
         if 'hdpass' not in url and 'hdplayer' not in url:
             return itemlist
diff --git a/servers/streamtape.json b/servers/streamtape.json
new file mode 100644
index 00000000..749961b7
--- /dev/null
+++ b/servers/streamtape.json
@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "https?://streamtape\\.com/e/(\\w+)",
+        "url": "https://streamtape.com/e/\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "streamtape",
+  "name": "Streamtape",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": ""
+}
diff --git a/servers/streamtape.py b/servers/streamtape.py
new file mode 100644
index 00000000..ea0bc879
--- /dev/null
+++ b/servers/streamtape.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector Mixdrop By Alfa development Group
+# --------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger, config
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    global data
+    data = httptools.downloadpage(page_url).data
+    if "Video not found" in data:
+        return False, config.get_localized_string(70449) % "Streamtape"
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    logger.info("url=" + page_url)
+    video_urls = []
+    global data
+
+    media_url = 'https://' + scrapertools.find_single_match(data, 'id="videolink"[^>]+>\n?\s*//(.*?)<') + '&stream=1'
+    video_urls.append([".mp4 [Streamtape]", media_url])
+
+    return video_urls