]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[crunchyroll] Add even more relaxed fmt fallback
authorSergey M․ <dstftw@gmail.com>
Fri, 29 Apr 2016 13:43:53 +0000 (19:43 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 29 Apr 2016 13:43:53 +0000 (19:43 +0600)
youtube_dl/extractor/crunchyroll.py

index 4a76642966772e76da7962851b699621d04d628b..58960b2f82bc76731e86ed319f3fc68fd818cfa9 100644 (file)
@@ -314,7 +314,10 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
                 continue
             available_fmts.append(fmt)
         if not available_fmts:
-            available_fmts = re.findall(r'token="showmedia\.([0-9]{3,4})p"', webpage)
+            for p in (r'token=["\']showmedia\.([0-9]{3,4})p"', r'showmedia\.([0-9]{3,4})p'):
+                available_fmts = re.findall(p, webpage)
+                if available_fmts:
+                    break
         video_encode_ids = []
         formats = []
         for fmt in available_fmts: