improved yt plugin

1 files changed, 31 insertions, 21 deletions

diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 34f0fa5de..b94340fe3 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -10,55 +10,65 @@ class YoutubeCom(Hoster):
     __type__ = "hoster"
     __pattern__ = r"http://(www\.)?(de\.)?\youtube\.com/watch\?v=.*"
     __version__ = "0.2"
-    __config__ = [ ("quality", "str" , "Quality Setting", "hd") ]
+    __config__ = [("quality", "sd,hd,fullhd", "Quality Setting", "hd")]
     __description__ = """Youtube.com Video Download Hoster"""
     __author_name__ = ("spoob")
     __author_mail__ = ("spoob@pyload.org")
-   
+
     def process(self, pyfile):
         html = self.load(pyfile.url, utf8=True)
 
         if re.search(r"(.*eine fehlerhafte Video-ID\.)", html) is not None:
             self.offline()
-       
+
         videoId = pyfile.url.split("v=")[1].split("&")[0]
         videoHash = re.search(r'&t=(.+?)&', html).group(1)
-       
-       
+
         file_name_pattern = '<meta name="title" content="(.+?)">'
         is_hd_pattern = r"'IS_HD_AVAILABLE': (false|true)"
         file_suffix = ".flv"
         is_hd = re.search(is_hd_pattern, html).group(1)
         hd_available = (is_hd == "true")
-       
-        if self.getConf("quality") == "hd" or self.getConf("quality") == "hq":
+        quality = self.getConf("quality")
+
+        if quality in ("hd", "fullhd"):
             file_suffix = ".mp4"
 
-        name = (re.search(file_name_pattern, html).group(1).replace("/", "") + file_suffix)
+        name = re.search(file_name_pattern, html).group(1).replace("/", "") + file_suffix
         pyfile.name = name #.replace("&amp;", "&").replace("ö", "oe").replace("ä", "ae").replace("ü", "ue")       
 
-        file_url = ""
-        desired_fmt="18"
+        desired_fmt = 18
+
         if self.getConf("quality") == "sd":
-            desired_fmt = "6"
+            desired_fmt = 6
         elif self.getConf("quality") == "hd" and hd_available:
-            desired_fmt = "22"
+            desired_fmt = 22
         elif self.getConf("quality") == "fullhd" and hd_available:
-            desired_fmt = "37"
+            desired_fmt = 37
 
         fmt_pattern = 'fmt_url_map=(.+?)&'
         fmt_url_map = re.search(fmt_pattern, html).group(1)
         links = urllib.unquote(fmt_url_map).split(",")
+
+        fmt_dict = {}
         for i in range(1, len(links)):
-            fmt = links[i].split("|")[0] 
-            if fmt == desired_fmt:
-                file_url = links[i].split("|")[1]
+            fmt = links[i].split("|")[0]
+            try:
+                fmt = int(fmt)
+            except Exception:
+                continue
+
+            fmt_dict[fmt] = links[i].split("|")[1]
 
-        if file_url == "":
-            for i in range(1, len(links)):
-                fmt = links[i].split("|")[0]   
-                if fmt == "5":
-                    file_url = links[i].split("|")[1]
+        self.logDebug("Found links: %s" % fmt_dict)
+
+        file_url = ""
+        file_fmt = 0
 
+        for fmt in sorted(fmt_dict.keys()):
+            if abs(fmt - desired_fmt) <= abs(file_fmt - desired_fmt):
+                file_url = fmt_dict[fmt]
+                file_fmt = fmt
 
+        self.logDebug("Choosed fmt: %s" % file_fmt)
         self.download(file_url)