From: George Brighton <george@gebn.co.uk>
Date: Sat, 27 Jun 2015 21:27:06 +0000 (+0100)
Subject: [moviefap] Explicitly sort formats to handle possible site changes
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=8a1b49ff19a8a1fdc2c30cf10cc0598ac9bc8819;p=youtube-dl.git

[moviefap] Explicitly sort formats to handle possible site changes
---

diff --git a/youtube_dl/extractor/moviefap.py b/youtube_dl/extractor/moviefap.py
index 20a78f3b2..295bfe3f0 100644
--- a/youtube_dl/extractor/moviefap.py
+++ b/youtube_dl/extractor/moviefap.py
@@ -111,11 +111,14 @@ class MovieFapIE(InfoExtractor):
             # multiple formats available
             info['formats'] = []
 
-            # N.B. formats are already in ascending order of quality
             for item in xml.find('quality').findall('item'):
+                resolution = xpath_text(item, 'res', 'resolution', True)  # 480p etc.
                 info['formats'].append({
                     'url': xpath_text(item, 'videoLink', 'url', True),
-                    'resolution': xpath_text(item, 'res', 'resolution', True)  # 480p etc.
+                    'resolution': resolution,
+                    'height': int(re.findall(r'\d+', resolution)[0])
                 })
 
+            self._sort_formats(info['formats'])
+
         return info