From 7edcb8f39cac73bb048a9543a3ac5cc82749a470 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 5 Aug 2013 19:43:09 -0700 Subject: [PATCH 01/14] More informative error --- youtube_dl/YoutubeDL.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 496866900..b51083154 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -547,7 +547,7 @@ class YoutubeDL(object): try: success = self.fd._do_download(filename, info_dict) except (OSError, IOError) as err: - raise UnavailableVideoError() + raise UnavailableVideoError(err) except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: self.report_error(u'unable to download video data: %s' % str(err)) return From 4efba05c56cda1cfe036b6ad8a4e8fc55cc21d4d Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 8 Aug 2013 08:55:26 +0200 Subject: [PATCH 02/14] Clarify template error message (#1209) --- youtube_dl/YoutubeDL.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 496866900..3df653c5d 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -264,7 +264,7 @@ class YoutubeDL(object): self.report_error(u'Erroneous output template') return None except ValueError as err: - self.report_error(u'Insufficient system charset ' + repr(preferredencoding())) + self.report_error(u'Error in output template: ' + str(err) + u' (encoding: ' + repr(preferredencoding()) + ')') return None def _match_entry(self, info_dict): From 02cf62e2403a83196c51762016a2c1ba29f35f90 Mon Sep 17 00:00:00 2001 From: patrickslin Date: Thu, 8 Aug 2013 11:28:50 -0700 Subject: [PATCH 03/14] Invalid signature again (fixes #1215) --- youtube_dl/extractor/youtube.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index b191021db..ba2da4c51 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -340,7 +340,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): elif len(s) == 87: return s[83:53:-1] + s[3] + s[52:40:-1] + s[86] + s[39:10:-1] + s[0] + s[9:3:-1] + s[53] elif len(s) == 86: - return s[83:85] + s[26] + s[79:46:-1] + s[85] + s[45:36:-1] + s[30] + s[35:30:-1] + s[46] + s[29:26:-1] + s[82] + s[25:1:-1] + return s[5:20] + s[2] + s[21:] elif len(s) == 85: return s[2:8] + s[0] + s[9:21] + s[65] + s[22:65] + s[84] + s[66:82] + s[21] elif len(s) == 84: From d468a09789cc5d931dd1a2e95dcf95a6988c83cb Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 8 Aug 2013 20:45:16 +0200 Subject: [PATCH 04/14] release 2013.08.08.1 --- youtube_dl/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 82c24646c..aa14c64fe 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,2 +1,2 @@ -__version__ = '2013.08.08' +__version__ = '2013.08.08.1' From 8a9d86a2a79e78bd7bda941c48fb50dba29d1d66 Mon Sep 17 00:00:00 2001 From: patrickslin Date: Thu, 8 Aug 2013 21:48:12 -0700 Subject: [PATCH 05/14] New sig len 89 algo Fixes new YT encrypted sig len 89. --- youtube_dl/extractor/youtube.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index ba2da4c51..3a8edbdc2 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -335,6 +335,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor): return s[25] + s[3:25] + s[0] + s[26:42] + s[79] + s[43:79] + s[91] + s[80:83] elif len(s) == 90: return s[25] + s[3:25] + s[2] + s[26:40] + s[77] + s[41:77] + s[89] + s[78:81] + elif len(s) == 89: + return s[84:78:-1] + s[87] + s[77:60:-1] + s[0] + s[59:3:-1] elif len(s) == 88: return s[48] + s[81:67:-1] + s[82] + s[66:62:-1] + s[85] + s[61:48:-1] + s[67] + s[47:12:-1] + s[3] + s[11:3:-1] + s[2] + s[12] elif len(s) == 87: From 0f399e6e5e621acff75d1a9dd9195f163bbcfe20 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 9 Aug 2013 15:49:09 +0200 Subject: [PATCH 06/14] release 2013.08.09 --- youtube_dl/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/version.py b/youtube_dl/version.py index aa14c64fe..8c9fc201b 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,2 +1,2 @@ -__version__ = '2013.08.08.1' +__version__ = '2013.08.09' From 298f833b161682ce50250895061285251933351d Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sun, 11 Aug 2013 06:46:24 +0200 Subject: [PATCH 07/14] Note update possibility on errors (thanks @chbrown, #1229) --- youtube_dl/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 59eeaf4a8..5dd5b2923 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -497,7 +497,7 @@ class ExtractorError(Exception): if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError): expected = True if not expected: - msg = msg + u'; please report this issue on https://yt-dl.org/bug . Be sure to call youtube-dl with the --verbose flag and include its complete output.' + msg = msg + u'; please report this issue on https://yt-dl.org/bug . Be sure to call youtube-dl with the --verbose flag and include its complete output. Make sure you are using the latest version; type youtube-dl -U to update.' super(ExtractorError, self).__init__(msg) self.traceback = tb From 0577177e3e504b3c893b03e5683382ad64863ca8 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sun, 11 Aug 2013 07:12:38 +0200 Subject: [PATCH 08/14] [vevo] fix testcase --- youtube_dl/extractor/vevo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py index 67537eae5..14abd58e8 100644 --- a/youtube_dl/extractor/vevo.py +++ b/youtube_dl/extractor/vevo.py @@ -8,7 +8,7 @@ from ..utils import ( class VevoIE(InfoExtractor): """ - Accecps urls from vevo.com or in the format 'vevo:{id}' + Accepts urls from vevo.com or in the format 'vevo:{id}' (currently used by MTVIE) """ _VALID_URL = r'((http://www.vevo.com/watch/.*?/.*?/)|(vevo:))(?P.*)$' @@ -19,7 +19,7 @@ class VevoIE(InfoExtractor): u'info_dict': { u"upload_date": u"20130624", u"uploader": u"Hurts", - u"title": u"Somebody To Die For" + u"title": u"Somebody to Die For" } } From e1842025d0403784d5a9af82e4fbd4b71fb31b11 Mon Sep 17 00:00:00 2001 From: patrickslin Date: Tue, 13 Aug 2013 17:57:35 -0700 Subject: [PATCH 09/14] Updated Vevo Signature Length (fixes #1237) --- youtube_dl/extractor/youtube.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 3a8edbdc2..64a3e39c1 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -348,7 +348,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): elif len(s) == 84: return s[83:27:-1] + s[0] + s[26:5:-1] + s[2:0:-1] + s[27] elif len(s) == 83: - return s[:15] + s[80] + s[16:80] + s[15] + return s[81:64:-1] + s[82] + s[63:52:-1] + s[45] + s[51:45:-1] + s[1] + s[44:1:-1] + s[0] elif len(s) == 82: return s[36] + s[79:67:-1] + s[81] + s[66:40:-1] + s[33] + s[39:36:-1] + s[40] + s[35] + s[0] + s[67] + s[32:0:-1] + s[34] elif len(s) == 81: From d1ba998274e96467184575e6bc0c33e698e714bf Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 14 Aug 2013 10:19:53 +0200 Subject: [PATCH 10/14] release 2013.08.14 --- youtube_dl/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 8c9fc201b..9b213e4fb 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,2 +1,2 @@ -__version__ = '2013.08.09' +__version__ = '2013.08.14' From 3a7256697e7c97a79f51d6ef6b9a1108bf8d7d3a Mon Sep 17 00:00:00 2001 From: patrickslin Date: Thu, 15 Aug 2013 13:00:20 -0700 Subject: [PATCH 11/14] Unable to Download Video (fixes #1247) --- youtube_dl/extractor/youtube.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 64a3e39c1..bf064c181 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -340,7 +340,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): elif len(s) == 88: return s[48] + s[81:67:-1] + s[82] + s[66:62:-1] + s[85] + s[61:48:-1] + s[67] + s[47:12:-1] + s[3] + s[11:3:-1] + s[2] + s[12] elif len(s) == 87: - return s[83:53:-1] + s[3] + s[52:40:-1] + s[86] + s[39:10:-1] + s[0] + s[9:3:-1] + s[53] + return s[6:27] + s[4] + s[28:39] + s[27] + s[40:59] + s[2] + s[60:] elif len(s) == 86: return s[5:20] + s[2] + s[21:] elif len(s) == 85: From 6daccbe3172dbddb75cbd55871b283e3c33a51e2 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 15 Aug 2013 22:40:00 +0200 Subject: [PATCH 12/14] release 2013.08.15 --- youtube_dl/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 9b213e4fb..72693e0fe 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,2 +1,2 @@ -__version__ = '2013.08.14' +__version__ = '2013.08.15' From f9c3c90ca8bee20f99d6172371b749ed7223588e Mon Sep 17 00:00:00 2001 From: patrickslin Date: Fri, 16 Aug 2013 08:54:01 -0700 Subject: [PATCH 13/14] Length 85 changed again? (fixes #1254) --- youtube_dl/extractor/youtube.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index bf064c181..f74718950 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -344,7 +344,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): elif len(s) == 86: return s[5:20] + s[2] + s[21:] elif len(s) == 85: - return s[2:8] + s[0] + s[9:21] + s[65] + s[22:65] + s[84] + s[66:82] + s[21] + return s[83:34:-1] + s[0] + s[33:27:-1] + s[3] + s[26:19:-1] + s[34] + s[18:3:-1] + s[27] elif len(s) == 84: return s[83:27:-1] + s[0] + s[26:5:-1] + s[2:0:-1] + s[27] elif len(s) == 83: From ddf3bd328b0077f3a88ff96e7f17bcd89baaeeac Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sat, 17 Aug 2013 08:33:36 +0200 Subject: [PATCH 14/14] release 2013.08.17 --- youtube_dl/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 72693e0fe..8c93a275c 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,2 +1,2 @@ -__version__ = '2013.08.15' +__version__ = '2013.08.17'