From 1b7e71e3bfce172d2fa2f67075dabf650d1943c9 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 1 Dec 2017 10:21:59 -0500
Subject: [PATCH] uptobox: fix patron

---
 plugin.video.alfa/servers/uptobox.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/plugin.video.alfa/servers/uptobox.py b/plugin.video.alfa/servers/uptobox.py
index d563ca52..92ad5281 100755
--- a/plugin.video.alfa/servers/uptobox.py
+++ b/plugin.video.alfa/servers/uptobox.py
@@ -40,7 +40,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
         # Si el archivo tiene enlace de streaming se redirige a upstream
         if "Streaming link:" in data:
             page_url = "http://uptostream.com/iframe/" + scrapertools.find_single_match(page_url,
-                                                                                        'uptobox.com/([a-z0-9]+)')
+                                                                                      'uptobox.com/([a-z0-9]+)')
             data = httptools.downloadpage(page_url).data
             video_urls = uptostream(data)
         else:
@@ -56,17 +56,27 @@ def uptostream(data):
     subtitle = scrapertools.find_single_match(data, "kind='subtitles' src='//([^']+)'")
     if subtitle:
         subtitle = "http://" + subtitle
-
     video_urls = []
-    patron = "<source src='//([^']+)' type='video/([^']+)' data-res='([^']+)' (?:data-default=\"true\" |)(?:lang='([^']+)'|)"
+    videos1 = []
+    data = data.replace("\\","")
+    patron  = 'src":"([^"]+).*?'
+    patron += 'type":"([^"]+).*?'
+    patron += 'res":"([^"]+).*?'
+    patron += 'lang":"([^"]+)'
     media = scrapertools.find_multiple_matches(data, patron)
-    for url, tipo, res, lang in media:
-        media_url = "http://" + url
+    for media_url, tipo, res, lang in media:
+        videos1.append([media_url, tipo, res, lang])
+    videos1.sort(key=lambda videos1: int(videos1[2]))
+    for x in videos1:
+        media_url = x[0]
+        tipo = x[1]
+        res = x[2]
+        lang = x[3]
+        tipo = tipo.replace("video/","")
         extension = ".%s (%s)" % (tipo, res)
         if lang:
             extension = extension.replace(")", "/%s)" % lang[:3])
         video_urls.append([extension + " [uptostream]", media_url, 0, subtitle])
-
     return video_urls