From 51c3399e371765acaf167d2dc4b91931b0480c50 Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Sat, 11 May 2013 23:54:25 +0200 Subject: YoutubeBatch.py, YoutubeCom.py: Synced regulare expression. YoutubeBatch.py now also supports https (tested). --- module/plugins/crypter/YoutubeBatch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/crypter/YoutubeBatch.py') diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py index 567191bb9..72b72aab7 100644 --- a/module/plugins/crypter/YoutubeBatch.py +++ b/module/plugins/crypter/YoutubeBatch.py @@ -11,8 +11,8 @@ API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0" class YoutubeBatch(Crypter): __name__ = "YoutubeBatch" __type__ = "container" - __pattern__ = r"http://(?:[^/]*?)youtube\.com/((?:view_play_list|playlist|.*?feature=PlayList).*?[\?&](?:list|p)=)([a-zA-Z0-9-_]+)" - __version__ = "0.92" + __pattern__ = r"https?://(?:[^/]*?)youtube\.com/(?:(?:view_play_list|playlist|.*?feature=PlayList).*?[?&](?:list|p)=)([a-zA-Z0-9-_]+)" + __version__ = "0.93" __description__ = """Youtube.com Channel Download Plugin""" __author_name__ = ("RaNaN", "Spoob", "zoidberg", "roland") __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org", "zoidberg@mujmail.cz", "roland@enkore.de") @@ -35,7 +35,7 @@ class YoutubeBatch(Crypter): def decrypt(self, pyfile): match_id = re.match(self.__pattern__, self.pyfile.url) new_links = [] - playlist_id = match_id.group(2) + playlist_id = match_id.group(1) new_links.extend(self.get_videos(playlist_id)) -- cgit v1.2.3