From 486adc1874e463b1563ad2394b216faff388b10d Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 13 Apr 2015 08:21:50 +0200 Subject: Prepare plugins to merging from stable --- pyload/plugin/crypter/YoutubeComFolder.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pyload/plugin/crypter/YoutubeComFolder.py') diff --git a/pyload/plugin/crypter/YoutubeComFolder.py b/pyload/plugin/crypter/YoutubeComFolder.py index da76e556b..e42615af0 100644 --- a/pyload/plugin/crypter/YoutubeComFolder.py +++ b/pyload/plugin/crypter/YoutubeComFolder.py @@ -10,20 +10,20 @@ from pyload.utils import fs_join class YoutubeComFolder(Crypter): - __name = "YoutubeComFolder" - __type = "crypter" - __version = "1.01" + __name__ = "YoutubeComFolder" + __type__ = "crypter" + __version__ = "1.01" - __pattern = r'https?://(?:www\.|m\.)?youtube\.com/(?Puser|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P[\w-]+)' - __config = [("use_subfolder" , "bool", "Save package to subfolder" , True ), + __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?Puser|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P[\w-]+)' + __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True ), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True ), ("likes" , "bool", "Grab user (channel) liked videos" , False), ("favorites" , "bool", "Grab user (channel) favorite videos", False), ("uploads" , "bool", "Grab channel unplaylisted videos" , True )] - __description = """Youtube.com channel & playlist decrypter plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Youtube.com channel & playlist decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0" @@ -95,7 +95,7 @@ class YoutubeComFolder(Crypter): def decrypt(self, pyfile): - m = re.match(self.__pattern, pyfile.url) + m = re.match(self.__pattern__, pyfile.url) m_id = m.group('ID') m_type = m.group('TYPE') -- cgit v1.2.3