summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter/YoutubeBatch.py
diff options
context:
space:
mode:
authorGravatar spoob <spoob@gmx.de> 2010-08-15 22:48:11 +0200
committerGravatar spoob <spoob@gmx.de> 2010-08-15 22:48:11 +0200
commit258a8799f5aa2a4637586bea0276adf969650ccc (patch)
treeb704ca0a5aaf72e47f4ea62762d37c9007c9d980 /module/plugins/crypter/YoutubeBatch.py
parentscripts fix, rs fix, closed #127 (diff)
downloadpyload-258a8799f5aa2a4637586bea0276adf969650ccc.tar.xz
Youtube Playlist
Diffstat (limited to 'module/plugins/crypter/YoutubeBatch.py')
-rw-r--r--module/plugins/crypter/YoutubeBatch.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py
index 091c8558a..b48026654 100644
--- a/module/plugins/crypter/YoutubeBatch.py
+++ b/module/plugins/crypter/YoutubeBatch.py
@@ -8,15 +8,16 @@ from module.plugins.Crypter import Crypter
class YoutubeBatch(Crypter):
__name__ = "YoutubeBatch"
__type__ = "container"
- __pattern__ = r"http://(www\.)?(de\.)?\youtube\.com/user/*"
+ __pattern__ = r"http://(?:www\.)?(?:de\.)?\youtube\.com/(?:user/.*?/user/(?P<g1>.{16})|(?:.*?feature=PlayList\&|view_play_list\?)p=(?P<g2>.{16}))"
__version__ = "0.9"
__description__ = """Youtube.com Channel Download Plugin"""
__author_name__ = ("RaNaN", "Spoob")
__author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org")
def setup(self):
- self.user = re.search(r"/user/(.+)", self.pyfile.url).group(1).split("#")[0]
- self.playlist = re.search(r"/user/%s.*?/user/(.{16})" % self.user, self.pyfile.url).group(1)
+ compile_id = re.compile(self.__pattern__)
+ match_id = compile_id.match(self.pyfile.url)
+ self.playlist = match_id.group(match_id.lastgroup)
def file_exists(self):
if "User not found" in self.req.load("http://gdata.youtube.com/feeds/api/playlists/%s?v=2" % self.playlist):