Fix Turbovid (#345)

core/support.py

@@ -1437,17 +1437,20 @@ def addQualityTag(item, itemlist, data, patron):
 def get_jwplayer_mediaurl(data, srvName, onlyHttp=False, dataIsBlock=False):
     from core import jsontools
     video_urls = []
-    block = scrapertools.find_single_match(data, r'sources"?\s*:\s*(.*?}])') if not dataIsBlock else data
+    block = scrapertools.find_single_match(data, r'sources"?\s*:\s*(.*?}?])') if not dataIsBlock else data
     if block:
         json = jsontools.load(block)
         if json:
             sources = []
             for s in json:
-                if 'file' in s.keys():
-                    src = s['file']
+                if isinstance(s, str):
+                    sources.append((s, ''))
                 else:
-                    src = s['src']
-                sources.append((src, s.get('label')))
+                    if 'file' in s.keys():
+                        src = s['file']
+                    else:
+                        src = s['src']
+                    sources.append((src, s.get('label')))
         else:
             if 'file:' in block:
                 sources = scrapertools.find_multiple_matches(block, r'file:\s*"([^"]+)"(?:,label:\s*"([^"]+)")?')

servers/directo.json

@@ -4,12 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "((?:http://|https://).*?m3u8[^\"'\n]*)",
-        "url": "\\1"
-
-      },
-      {
-        "pattern": "((?:http://|https://).*?.mpd[^\"'\n]*)",
+        "pattern": "((?:https?://).\\S+.(m3u8|mp4|mpeg|mpd|flv)[^\"'\n]*)",
         "url": "\\1"
       },
       {