summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter
diff options
context:
space:
mode:
authorGravatar zoidberg10 <zoidberg@mujmail.cz> 2012-10-27 01:57:45 +0200
committerGravatar zoidberg10 <zoidberg@mujmail.cz> 2012-10-27 01:57:45 +0200
commite195f96d1a4d31a1e59d7f23971edd14a1edd220 (patch)
tree68a1a3bbe7c282a1d45b0ee824aa7958c98cd8a2 /module/plugins/crypter
parentgamefront.com plugin - thanx fwannmacher - closed #705 (diff)
downloadpyload-e195f96d1a4d31a1e59d7f23971edd14a1edd220.tar.xz
youtube - add 3D formats, update playlist crypter
Diffstat (limited to 'module/plugins/crypter')
-rw-r--r--module/plugins/crypter/YoutubeBatch.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py
index b48026654..88906d0db 100644
--- a/module/plugins/crypter/YoutubeBatch.py
+++ b/module/plugins/crypter/YoutubeBatch.py
@@ -8,8 +8,8 @@ from module.plugins.Crypter import Crypter
class YoutubeBatch(Crypter):
__name__ = "YoutubeBatch"
__type__ = "container"
- __pattern__ = r"http://(?:www\.)?(?:de\.)?\youtube\.com/(?:user/.*?/user/(?P<g1>.{16})|(?:.*?feature=PlayList\&|view_play_list\?)p=(?P<g2>.{16}))"
- __version__ = "0.9"
+ __pattern__ = r"http://(?:[^/]*?)youtube\.com/(?:(?:view_play_list|playlist|.*?feature=PlayList).*?(?:[\?&]list|p=)|user/.*?/user/)(\w+)"
+ __version__ = "0.91"
__description__ = """Youtube.com Channel Download Plugin"""
__author_name__ = ("RaNaN", "Spoob")
__author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org")
@@ -17,7 +17,7 @@ class YoutubeBatch(Crypter):
def setup(self):
compile_id = re.compile(self.__pattern__)
match_id = compile_id.match(self.pyfile.url)
- self.playlist = match_id.group(match_id.lastgroup)
+ self.playlist = match_id.group(1)
def file_exists(self):
if "User not found" in self.req.load("http://gdata.youtube.com/feeds/api/playlists/%s?v=2" % self.playlist):