KoD 1.7.4

- Nuove visualizzazioni Server\n- Fix Gestione Viste\n- Aggiunto Pluto TV\n- Fix e migliorie varie\n\n

servers/dailymotion.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from core import httptools
+from core import httptools, support
 from platformcode import logger, config
 
 
@@ -19,8 +19,13 @@ def test_video_exists(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
+    video_urls = []
     data = response.json
 
     url = data.get('qualities', {}).get('auto', [{}])[0].get('url','')
 
-    return [["m3u8 [dailymotion]", url]]
+    urls = support.match(url, patron=r'NAME="([^"]+)"\s*,\s*PROGRESSIVE-URI="([^"]+)').matches
+    for quality, uri in urls:
+        video_urls.append(["mp4 [{}p] [dailymotion]".format(quality), uri])
+
+    return video_urls

servers/deltabit.py

@@ -14,7 +14,7 @@ def test_video_exists(page_url):
     data = page.data.replace('"', "'")
     real_url = page.url
 
-    if "Not Found" in data or "File Does not Exist" in data:
+    if "Not Found" in data or "File Does not Exist" in data or "File doesn't exits" in data:
         return False, config.get_localized_string(70449) % "DeltaBit"
     return True, ""
 

servers/directo.py

@@ -10,6 +10,6 @@ def test_video_exists(page_url):
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.debug("(page_url='%s')" % page_url)
 
-    video_urls = [["%s %s" % (page_url[-4:], config.get_localized_string(30137)), page_url]]
+    video_urls = [["%s %s" % (page_url.split('|')[0][-4:], config.get_localized_string(30137)), page_url]]
 
     return video_urls

servers/rapidgator.json

@@ -1,29 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(rapidgator.net/file/\\w+(?:\\.html|))",
-        "url": "http://\\1"
-      }
-    ]
-  },
-  "free": false,
-  "id": "rapidgator",
-  "name": "Rapid Gator",
-  "premium": [
-    "realdebrid",
-    "alldebrid"
-  ],
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@70708",
-      "type": "bool",
-      "visible": true
-    }
-  ]
-}

servers/rapidgator.py

@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.debug("(page_url='%s')" % page_url)
-    video_urls = []
-    return video_urls

servers/streamsb.json

@@ -4,12 +4,12 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "(?:streamsb|sbembed|sbembed1|sbplay1|sbplay|pelistop|tubesb|playersb|embedsb|watchsb).\\w{2,4}/(?:embed-|d/|e/)?([A-z0-9]+)",
-        "url": "https://streamsb.net/\\1"
+        "pattern": "(?:streamsb|sbembed|sbembed1|sbplay1|sbplay|pelistop|tubesb|playersb|embedsb|watchsb|streamas).\\w{2,5}/(?:embed-|d/|e/)?([A-z0-9]+)",
+        "url": "https://streamsb.net/d/\\1"
       },
       {
         "pattern": "(?:cloudemb.com)/([A-z0-9]+)",
-        "url": "https://streamsb.net/\\1"
+        "url": "https://streamsb.net/d/\\1"
       }
     ]
   },

servers/streamsb.py

@@ -2,10 +2,8 @@
 # https://github.com/tvaddonsco/script.module.urlresolver/blob/master/lib/urlresolver/plugins/streamsb.py
 
 from core import httptools, scrapertools
-from platformcode import config, logger
-import time
-
-host = 'streamsb.net'
+from platformcode import config
+import base64
 
 
 def test_video_exists(page_url):
@@ -21,8 +19,8 @@ def test_video_exists(page_url):
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     video_urls = []
     global data
+    host = scrapertools.get_domain_from_url(page_url)
     sources = scrapertools.find_multiple_matches(data, r'download_video([^"]+)[^\d]+\d+x(\d+)')
-    time.sleep(1)
     if sources:
         sources.sort(key=lambda x: int(x[1]), reverse=True)
         sources = [(x[1] + 'p', x[0]) for x in sources]
@@ -30,9 +28,14 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
             code, mode, hash = eval(s[1])
             dl_url = 'https://{0}/dl?op=download_orig&id={1}&mode={2}&hash={3}'.format(host, code, mode, hash)
             data = httptools.downloadpage(dl_url).data
-            media_url = scrapertools.find_single_match(data, 'href="([^"]+)">Direct')
-            if media_url:
-                video_urls.append([s[0], media_url])
+
+            captcha = scrapertools.girc(data, 'https://{0}/'.format(host), base64.b64encode('https://{0}:443'.format(host).encode('utf-8')).decode('utf-8').replace('=', ''))
+            if captcha:
+                data = httptools.downloadpage(dl_url, post={'op': 'download_orig', 'id': code, 'mode': mode,
+                                                            'hash': hash, 'g-recaptcha-response': captcha}, timeout=10).data
+                media_url = scrapertools.find_single_match(data, 'href="([^"]+)">Direct')
+                if media_url:
+                    video_urls.append([s[0], media_url])
     return video_urls
 
 

servers/torrent.json

@@ -41,7 +41,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "(http:\\/\\/(?:[a-zA-Z0-9]+)\\.torrent)",
+        "pattern": "(https?:\/\/\\S+.torrent)",
         "url": "\\1"
       },
       {
@@ -49,7 +49,7 @@
         "url": "\\1"
       },
       {
-        "pattern": "(http://tumejorjuego.com/descargar/index.php\\?link=[^\"]+)",
+        "pattern": "(http[s]?://tumejorjuego.com/descargar/index.php\\?link=[^\"]+)",
         "url": "\\1"
       }
     ]

servers/torrent.py

@@ -219,8 +219,11 @@ def find_file(hash):
 def elementum_actions(parameter, TorrentHash):
     elementum_setting, elementum_host, TorrentPath = setting()
     if elementum_setting:
-        if parameter == 'delete': monitor_update(TorrentPath, TorrentHash, remove=True)
-        requests.get('%s/%s/%s' %(elementum_host, parameter, TorrentHash))
+        try:
+            if parameter == 'delete': monitor_update(TorrentPath, TorrentHash, remove=True)
+            requests.get('%s/%s/%s' %(elementum_host, parameter, TorrentHash))
+        except:
+            pass
 
 
 def process_filename(filename, Title, ext=True):

servers/uqload.py

@@ -30,7 +30,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for url in matches:
-        url = url+'|Referer='+page_url
+        # url = url+'|Referer='+page_url
         video_urls.append(["[uqload]", url])
 
     return video_urls