From 50607322e6b15a4a406faf38da1e12793f46c3a3 Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Wed, 13 Mar 2013 20:52:46 +0100 Subject: Movie2kTo: Corrected package name this plugin returns. --- module/plugins/crypter/Movie2kTo.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py index f5800b498..47257f2dc 100644 --- a/module/plugins/crypter/Movie2kTo.py +++ b/module/plugins/crypter/Movie2kTo.py @@ -47,13 +47,14 @@ class Movie2kTo(Crypter): season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path)) self.logDebug(season_links) - self.packages.append(('%s: Season %s (%s)' - % (self.name, season, self.qStat()), season_links, 'Season %s' % season)) + folder = '%s: Season %s' % (self.name, season) + name = '%s%s' % (folder, self.qStat()) + self.packages.append((name, season_links, folder)) self.qStatReset() else: links = self.getLinks() - self.package.name = '%s%s' % (self.package.name, self.qStat()) - self.packages.append((self.package.name, links , self.package.folder)) + name = '%s%s' % (self.package.name, self.qStat()) + self.packages.append((name, links , self.package.folder)) def qStat(self): if len(self.q) == 0: return '' -- cgit v1.2.3 From ed22eec779531674fb5f770c5fa2a8b632f552c4 Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Mon, 18 Mar 2013 10:36:52 +0100 Subject: Movie2kTo: Added setting for quality in the folder name. You set if you want the quality output be part of the folder name. --- module/plugins/crypter/Movie2kTo.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py index 47257f2dc..e0e923abb 100644 --- a/module/plugins/crypter/Movie2kTo.py +++ b/module/plugins/crypter/Movie2kTo.py @@ -9,8 +9,9 @@ class Movie2kTo(Crypter): __name__ = 'Movie2kTo' __type__ = 'container' __pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html' - __version__ = '0.3' + __version__ = '0.4' __config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, '), + ('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'), ('whole_season', 'bool', 'Download whole season', 'False'), ('everything', 'bool', 'Download everything', 'False'), ('firstN', 'int', 'Download the first N files for each episode. The first file is probably all you will need.', '1')] @@ -58,6 +59,7 @@ class Movie2kTo(Crypter): def qStat(self): if len(self.q) == 0: return '' + if not self.getConfig('dir_quality'): return '' return (' (Average quality: %d, min: %d, max: %d, %s, max (all hosters): %d)' % (sum(self.q) / float(len(self.q)), min(self.q), max(self.q), self.q, self.max_q)) def qStatReset(self): -- cgit v1.2.3 From c6d4e6ec21593038d4a9dbe280fc7de02ffead13 Mon Sep 17 00:00:00 2001 From: Stefano Date: Sat, 6 Apr 2013 12:53:39 +0300 Subject: UploadedToFolder: updated pattern (see #63) + license + cosmetics --- module/plugins/crypter/UploadedToFolder.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index d4534297e..e92601b24 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -1,13 +1,30 @@ # -*- coding: utf-8 -*- -from module.plugins.Crypter import Crypter +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +############################################################################ + import re +from module.plugins.Crypter import Crypter + + class UploadedToFolder(Crypter): __name__ = "UploadedToFolder" __type__ = "crypter" - __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|list)/(?P\w+)" - __version__ = "0.1" + __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P\w+)" + __version__ = "0.2" __description__ = """UploadedTo Crypter Plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") -- cgit v1.2.3 From cf299b2955c82bd13efd61446570df8baef942ff Mon Sep 17 00:00:00 2001 From: Stefano Date: Sat, 6 Apr 2013 21:38:27 +0200 Subject: NetfolderIn, SimpleCrypter: stripping folder name. + cosmetics --- module/plugins/crypter/NetfolderIn.py | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py index d71a73d0a..956727d87 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -1,22 +1,23 @@ # -*- coding: utf-8 -*- -from module.plugins.Crypter import Crypter import re +from module.plugins.Crypter import Crypter + + class NetfolderIn(Crypter): __name__ = "NetfolderIn" __type__ = "crypter" __pattern__ = r"http://(?:www\.)?netfolder.in/((?P\w+)/\w+|folder.php\?folder_id=(?P\w+))" - __version__ = "0.4" + __version__ = "0.5" __description__ = """NetFolder Crypter Plugin""" __author_name__ = ("RaNaN", "fragonib") __author_mail__ = ("RaNaN@pyload.org", "fragonib[AT]yahoo[DOT]es") def decrypt(self, pyfile): - # Request package self.html = self.load(pyfile.url) - + # Check for password protection if self.isPasswordProtected(): self.html = self.submitPassword() @@ -31,45 +32,42 @@ class NetfolderIn(Crypter): # Set package self.packages = [(package_name, package_links, folder_name)] - - + def isPasswordProtected(self): - + if '' in html: self.logDebug("Incorrect password, please set right password on Edit package form and retry") return None - - return html - - + + return html + def getPackageNameAndFolder(self): title_re = r'
Inhalt des Ordners (?P.+)</span></div>' m = re.search(title_re, self.html) if m is not None: - name = folder = m.group('title') + name = folder = m.group('title').strip() self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder)) return name, folder else: @@ -77,8 +75,7 @@ class NetfolderIn(Crypter): folder = self.pyfile.package().folder self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder)) return name, folder - - + def getLinks(self): links = re.search(r'name="list" value="(.*?)"', self.html).group(1).split(",") self.logDebug("Package has %d links" % len(links)) -- cgit v1.2.3 From d2cd60cc6dbaa7aceb1d1cd3019aa7089ddfdcd9 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Sat, 6 Apr 2013 21:50:25 +0200 Subject: Using SimpleCrypter to avoid repeating getPackageNameAndFolder. + licenses + cosmetics --- module/plugins/crypter/GooGl.py | 15 ++++++++++++ module/plugins/crypter/NetfolderIn.py | 21 ++++------------- module/plugins/crypter/SpeedLoadOrgFolder.py | 15 ++++++++++++ module/plugins/crypter/UploadedToFolder.py | 35 ++++++++++++++++------------ 4 files changed, 55 insertions(+), 31 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index 07de5e008..bcb1d7494 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -1,5 +1,20 @@ # -*- coding: utf-8 -*- +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +############################################################################ + from module.plugins.Crypter import Crypter from module.common.json_layer import json_loads diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py index 956727d87..c5c602c27 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -2,18 +2,20 @@ import re -from module.plugins.Crypter import Crypter +from module.plugins.internal.SimpleCrypter import SimpleCrypter -class NetfolderIn(Crypter): +class NetfolderIn(SimpleCrypter): __name__ = "NetfolderIn" __type__ = "crypter" __pattern__ = r"http://(?:www\.)?netfolder.in/((?P<id1>\w+)/\w+|folder.php\?folder_id=(?P<id2>\w+))" - __version__ = "0.5" + __version__ = "0.6" __description__ = """NetFolder Crypter Plugin""" __author_name__ = ("RaNaN", "fragonib") __author_mail__ = ("RaNaN@pyload.org", "fragonib[AT]yahoo[DOT]es") + TITLE_PATTERN = r'<div class="Text">Inhalt des Ordners <span(.*)>(?P<title>.+)</span></div>' + def decrypt(self, pyfile): # Request package self.html = self.load(pyfile.url) @@ -63,19 +65,6 @@ class NetfolderIn(Crypter): return html - def getPackageNameAndFolder(self): - title_re = r'<div class="Text">Inhalt des Ordners <span(.*)>(?P<title>.+)</span></div>' - m = re.search(title_re, self.html) - if m is not None: - name = folder = m.group('title').strip() - self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder)) - return name, folder - else: - name = self.pyfile.package().name - folder = self.pyfile.package().folder - self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder)) - return name, folder - def getLinks(self): links = re.search(r'name="list" value="(.*?)"', self.html).group(1).split(",") self.logDebug("Package has %d links" % len(links)) diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py index 5b350787f..f85ede6f3 100644 --- a/module/plugins/crypter/SpeedLoadOrgFolder.py +++ b/module/plugins/crypter/SpeedLoadOrgFolder.py @@ -1,5 +1,20 @@ # -*- coding: utf-8 -*- +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +############################################################################ + from module.plugins.internal.SimpleCrypter import SimpleCrypter class SpeedLoadOrgFolder(SimpleCrypter): diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index d4534297e..7fe4de688 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -1,13 +1,30 @@ # -*- coding: utf-8 -*- -from module.plugins.Crypter import Crypter +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +############################################################################ + import re -class UploadedToFolder(Crypter): +from module.plugins.internal.SimpleCrypter import SimpleCrypter + + +class UploadedToFolder(SimpleCrypter): __name__ = "UploadedToFolder" __type__ = "crypter" __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|list)/(?P<id>\w+)" - __version__ = "0.1" + __version__ = "0.2" __description__ = """UploadedTo Crypter Plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") @@ -31,15 +48,3 @@ class UploadedToFolder(Crypter): self.logDebug('Package has %d links' % len(package_links)) self.packages = [(package_name, package_links, folder_name)] - - def getPackageNameAndFolder(self): - m = re.search(self.TITLE_PATTERN, self.html) - if m: - name = folder = m.group('title') - self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder)) - return name, folder - else: - name = self.pyfile.package().name - folder = self.pyfile.package().folder - self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder)) - return name, folder -- cgit v1.2.3 From 615e2d11ad54089caab4b61be1b1722b1131b2a5 Mon Sep 17 00:00:00 2001 From: enkore <public@enkore.de> Date: Sun, 7 Apr 2013 14:13:01 +0200 Subject: Ported YoutubeBatch to new google api Now playlists with more than a dozen or so videos work TODO: Add support for downloading channels --- module/plugins/crypter/YoutubeBatch.py | 35 ++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py index 2e68dfe02..567191bb9 100644 --- a/module/plugins/crypter/YoutubeBatch.py +++ b/module/plugins/crypter/YoutubeBatch.py @@ -2,26 +2,41 @@ # -*- coding: utf-8 -*- import re +import json from module.plugins.Crypter import Crypter +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)=|user/)(\w+)" + __pattern__ = r"http://(?:[^/]*?)youtube\.com/((?:view_play_list|playlist|.*?feature=PlayList).*?[\?&](?:list|p)=)([a-zA-Z0-9-_]+)" __version__ = "0.92" __description__ = """Youtube.com Channel Download Plugin""" - __author_name__ = ("RaNaN", "Spoob", "zoidberg") - __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org", "zoidberg@mujmail.cz") + __author_name__ = ("RaNaN", "Spoob", "zoidberg", "roland") + __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org", "zoidberg@mujmail.cz", "roland@enkore.de") + + def get_videos(self, playlist_id, token=None): + url = "https://www.googleapis.com/youtube/v3/playlistItems?playlistId=%s&part=snippet&key=%s&maxResults=50" % (playlist_id, API_KEY) + if token: + url += "&pageToken=" + token + + response = json.loads(self.load(url)) + + for item in response["items"]: + if item["kind"] == "youtube#playlistItem" and item["snippet"]["resourceId"]["kind"] == "youtube#video": + yield "http://youtube.com/watch?v=" + item["snippet"]["resourceId"]["videoId"] + + if "nextPageToken" in response: + for item in self.get_videos(playlist_id, response["nextPageToken"]): + yield item def decrypt(self, pyfile): match_id = re.match(self.__pattern__, self.pyfile.url) - if match_id.group(1) == "user/": - url = "http://gdata.youtube.com/feeds/api/users/%s/uploads?v=2" % match_id.group(2) - else: - url = "http://gdata.youtube.com/feeds/api/playlists/%s?v=2" % match_id.group(2) - - rep = self.load(url) new_links = [] - new_links.extend(re.findall(r"href\='(http:\/\/www.youtube.com\/watch\?v\=[^']+)&", rep)) + playlist_id = match_id.group(2) + + new_links.extend(self.get_videos(playlist_id)) + self.packages.append((self.pyfile.package().name, new_links, self.pyfile.package().name)) -- cgit v1.2.3 From f68b64367ea0bca12318fcf96208879872cd91a7 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Fri, 12 Apr 2013 15:27:21 +0200 Subject: New crypter: MBLinkInfo --- module/plugins/crypter/MBLinkInfo.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 module/plugins/crypter/MBLinkInfo.py (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py new file mode 100644 index 000000000..0c0359ed9 --- /dev/null +++ b/module/plugins/crypter/MBLinkInfo.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- + +import re + +from module.plugins.Crypter import Crypter + + +class MBLinkInfo(Crypter): + __name__ = "MBLinkInfo" + __type__ = "container" + __pattern__ = r"http://(?:www\.)?mblink\.info/\?id=(\d+)" + __version__ = "0.01" + __description__ = """MBLink.Info Container Plugin""" + __author_name__ = ("Gummibaer", "stickell") + __author_mail__ = ("Gummibaer@wiki-bierkiste.de", "l.stickell@yahoo.it") + + URL_PATTERN = r'<meta[^;]+; URL=(.*)["\']>' + + def decrypt(self, pyfile): + src = self.load(pyfile.url) + found = re.search(self.URL_PATTERN, src) + if found: + link = found.group(1) + self.logDebug("Redirected to " + link) + self.core.files.addLinks([link], self.pyfile.package().id) + else: + self.fail('Unable to detect valid link') -- cgit v1.2.3 From 6ea6cc0386ddb9de702b02b38ea10ff2f1e7b5cc Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Fri, 12 Apr 2013 19:23:43 +0300 Subject: MBLinkInfo: updated pattern http://forum.pyload.org/viewtopic.php?p=8957#p8957 --- module/plugins/crypter/MBLinkInfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py index 0c0359ed9..e266c7722 100644 --- a/module/plugins/crypter/MBLinkInfo.py +++ b/module/plugins/crypter/MBLinkInfo.py @@ -8,8 +8,8 @@ from module.plugins.Crypter import Crypter class MBLinkInfo(Crypter): __name__ = "MBLinkInfo" __type__ = "container" - __pattern__ = r"http://(?:www\.)?mblink\.info/\?id=(\d+)" - __version__ = "0.01" + __pattern__ = r"http://(?:www\.)?mblink\.info/?\?id=(\d+)" + __version__ = "0.02" __description__ = """MBLink.Info Container Plugin""" __author_name__ = ("Gummibaer", "stickell") __author_mail__ = ("Gummibaer@wiki-bierkiste.de", "l.stickell@yahoo.it") -- cgit v1.2.3 From 6c77bea330e4e71c52017d108dd23528ca081d10 Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Sat, 13 Apr 2013 20:52:10 +0200 Subject: Fixed regular expression and optimized quality report. --- module/plugins/crypter/Movie2kTo.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py index e0e923abb..4a8d21615 100644 --- a/module/plugins/crypter/Movie2kTo.py +++ b/module/plugins/crypter/Movie2kTo.py @@ -14,7 +14,7 @@ class Movie2kTo(Crypter): ('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'), ('whole_season', 'bool', 'Download whole season', 'False'), ('everything', 'bool', 'Download everything', 'False'), - ('firstN', 'int', 'Download the first N files for each episode. The first file is probably all you will need.', '1')] + ('firstN', 'int', 'Download the first N files for each episode (the first file is probably all you will need)', '1')] __description__ = """Movie2k.to Container Plugin""" __author_name__ = ('4Christopher') __author_mail__ = ('4Christopher@gmx.de') @@ -60,6 +60,7 @@ class Movie2kTo(Crypter): def qStat(self): if len(self.q) == 0: return '' if not self.getConfig('dir_quality'): return '' + if len(self.q) == 1: return (' (Quality: %d, max (all hosters): %d)' % (self.q[0], self.max_q)) return (' (Average quality: %d, min: %d, max: %d, %s, max (all hosters): %d)' % (sum(self.q) / float(len(self.q)), min(self.q), max(self.q), self.q, self.max_q)) def qStatReset(self): @@ -132,7 +133,7 @@ class Movie2kTo(Crypter): else: self.logDebug('This is already the right ID') try: - url = re.search(r'<a target="_blank" href="(http://.*?)"', self.html).group(1) + url = re.search(r'<a target="_blank" href="(http://[^"]*?)"', self.html).group(1) self.logDebug('id: %s, %s: %s' % (h_id, hoster, url)) links.append(url) except: -- cgit v1.2.3 From 30d8a820de43c021e652b55e3b52228fb04f515d Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Sat, 13 Apr 2013 21:05:54 +0200 Subject: Cleanup. --- module/plugins/crypter/Movie2kTo.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py index 4a8d21615..b0b4085a2 100644 --- a/module/plugins/crypter/Movie2kTo.py +++ b/module/plugins/crypter/Movie2kTo.py @@ -63,9 +63,11 @@ class Movie2kTo(Crypter): if len(self.q) == 1: return (' (Quality: %d, max (all hosters): %d)' % (self.q[0], self.max_q)) return (' (Average quality: %d, min: %d, max: %d, %s, max (all hosters): %d)' % (sum(self.q) / float(len(self.q)), min(self.q), max(self.q), self.q, self.max_q)) + def qStatReset(self): - self.q = [] ## to calculate the average, min and max of the quality - self.max_q = None + self.q = [] ## to calculate the average, min and max of the quality + self.max_q = None ## maximum quality of all hosters + def tvshow_number(self, number): if int(number) < 10: return '0%s' % number @@ -85,8 +87,6 @@ class Movie2kTo(Crypter): elif re.search(self.FILM_URL_PATH_PATTERN, self.url_path): self.format = 'film' pattern_re = re.search(self.FILM_URL_PATH_PATTERN, self.url_path) - - self.name = pattern_re.group('name') self.id = pattern_re.group('id') self.logDebug('URL Path: %s (ID: %s, Name: %s, Format: %s)' @@ -104,8 +104,8 @@ class Movie2kTo(Crypter): re_quality = re.compile(r'.+?Quality:.+?smileys/(\d)\.gif') ## The quality is one digit. 0 is the worst and 5 is the best. ## Is not always there … - re_hoster_id_html = re.compile(r'(?:<td height|<tr id).+?<a href=".*?(\d{7}).*?".+? ([^<>]+?)</a>(.+?)</tr>') re_hoster_id_js = re.compile(r'links\[(\d+?)\].+ (.+?)</a>(.+?)</tr>') + re_hoster_id_html = re.compile(r'(?:<td height|<tr id).+?<a href=".*?(\d{7}).*?".+? ([^<>]+?)</a>(.+?)</tr>') ## I assume that the ID is 7 digits longs count = defaultdict(int) matches = re_hoster_id_html.findall(self.html) @@ -116,10 +116,10 @@ class Movie2kTo(Crypter): match_q = re_quality.search(q_html) if match_q: quality = int(match_q.group(1)) - if self.max_q: - if self.max_q < quality: self.max_q = quality - else: ## was None before + if self.max_q == None: self.max_q = quality + else: + if self.max_q < quality: self.max_q = quality q_s = ', Quality: %d' % quality else: q_s = ', unknown quality' @@ -140,6 +140,5 @@ class Movie2kTo(Crypter): self.logDebug('Failed to find the URL') else: self.logDebug('Not accepted: %s, ID: %s%s' % (hoster, h_id, q_s)) - # self.logDebug(links) return links -- cgit v1.2.3 From ba64df181e8f26b5246e6eb26843e69080984227 Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Sat, 13 Apr 2013 21:19:27 +0200 Subject: Added Putlocker to the list of accepted hosters. --- module/plugins/crypter/Movie2kTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py index b0b4085a2..f2c5ece55 100644 --- a/module/plugins/crypter/Movie2kTo.py +++ b/module/plugins/crypter/Movie2kTo.py @@ -10,7 +10,7 @@ class Movie2kTo(Crypter): __type__ = 'container' __pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html' __version__ = '0.4' - __config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, '), + __config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, Putlocker, '), ('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'), ('whole_season', 'bool', 'Download whole season', 'False'), ('everything', 'bool', 'Download everything', 'False'), -- cgit v1.2.3 From b300710f168ae820df20ef63f8b4436a050373a4 Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Sun, 14 Apr 2013 13:03:37 +0200 Subject: Wrote DownloadVimeoCom. The website is used to get the download URL from Vimeo.com, Smotri.com, and Dailymotion.com. --- module/plugins/crypter/DownloadVimeoCom.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 module/plugins/crypter/DownloadVimeoCom.py (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/DownloadVimeoCom.py b/module/plugins/crypter/DownloadVimeoCom.py new file mode 100644 index 000000000..0615fa835 --- /dev/null +++ b/module/plugins/crypter/DownloadVimeoCom.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re +import HTMLParser +from module.plugins.Crypter import Crypter + +class DownloadVimeoCom(Crypter): + __name__ = 'DownloadVimeoCom' + __type__ = 'crypter' + __pattern__ = r'(?:http://vimeo.com/\d*?|http://smotri.com/video/view/?id=.*|http://www.dailymotion.com/video/.*)' + ## The download from dailymotion failed with a 403 + __version__ = '0.1' + __description__ = """Video Download Plugin based on downloadvimeo.com""" + __author_name__ = ('4Christopher') + __author_mail__ = ('4Christopher@gmx.de') + BASE_URL = 'http://downloadvimeo.com' + + def decrypt(self, pyfile): + self.package = pyfile.package() + html = self.load('%s/generate?url=%s' % (self.BASE_URL, pyfile.url)) + h = HTMLParser.HTMLParser() + try: + f = re.search(r'cmd quality="(?P<quality>[^"]+?)">\s*?(?P<URL>[^<]*?)</cmd>', html) + except: + self.logDebug('Failed to find the URL') + else: + url = h.unescape(f.group('URL')) + self.logDebug('Quality: %s, URL: %s' % (f.group('quality'), url)) + self.packages.append((self.package.name, [url], self.package.folder)) -- cgit v1.2.3 From 61e46c72852b9c6ed9fc8735d1603adb95a49ba5 Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Sun, 14 Apr 2013 15:11:03 +0200 Subject: DownloadVimeoCom: removed pattern for Dailymotion.com There is already a plugin for Dailymotion.com. --- module/plugins/crypter/DownloadVimeoCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/DownloadVimeoCom.py b/module/plugins/crypter/DownloadVimeoCom.py index 0615fa835..7e76a90ed 100644 --- a/module/plugins/crypter/DownloadVimeoCom.py +++ b/module/plugins/crypter/DownloadVimeoCom.py @@ -8,7 +8,7 @@ from module.plugins.Crypter import Crypter class DownloadVimeoCom(Crypter): __name__ = 'DownloadVimeoCom' __type__ = 'crypter' - __pattern__ = r'(?:http://vimeo.com/\d*?|http://smotri.com/video/view/?id=.*|http://www.dailymotion.com/video/.*)' + __pattern__ = r'(?:http://vimeo.com/\d*?|http://smotri.com/video/view/?id=.*)' ## The download from dailymotion failed with a 403 __version__ = '0.1' __description__ = """Video Download Plugin based on downloadvimeo.com""" -- cgit v1.2.3 From 63b5b8b4aac285be9e11302535ca805040522167 Mon Sep 17 00:00:00 2001 From: Richard Schwab <mail@w.tf-w.tf> Date: Sun, 7 Apr 2013 01:47:20 +0200 Subject: Removing MegaUploadCom leftovers --- module/plugins/crypter/SerienjunkiesOrg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index dfe34ff6e..5cf2454c1 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -17,7 +17,7 @@ class SerienjunkiesOrg(Crypter): ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), ("randomPreferred", "bool", "Randomize Preferred-List", False), ("hosterListMode", "OnlyOne;OnlyPreferred(One);OnlyPreferred(All);All", "Use for hosters (if supported)", "All"), - ("hosterList", "str", "Preferred Hoster list (comma separated)", "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,MegauploadCom,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"), + ("hosterList", "str", "Preferred Hoster list (comma separated)", "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"), ("ignoreList", "str", "Ignored Hoster list (comma separated)", "MegauploadCom") ] __description__ = """serienjunkies.org Container Plugin""" -- cgit v1.2.3 From b1ee282d4f63ed76ea7fa0e37e61d17b0909ba78 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Mon, 15 Apr 2013 14:15:26 +0300 Subject: SerienjunkiesOrg: increased version after #85 --- module/plugins/crypter/SerienjunkiesOrg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index 5cf2454c1..0506d90fb 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -11,7 +11,7 @@ class SerienjunkiesOrg(Crypter): __name__ = "SerienjunkiesOrg" __type__ = "container" __pattern__ = r"http://.*?(serienjunkies.org|dokujunkies.org)/.*?" - __version__ = "0.36" + __version__ = "0.37" __config__ = [ ("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"), ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), -- cgit v1.2.3 From 5e114ee4341db4bd664beb676fff34a1deecd164 Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Mon, 15 Apr 2013 17:42:35 +0200 Subject: DownloadVimeoCom: Fixed regular expression. --- module/plugins/crypter/DownloadVimeoCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/DownloadVimeoCom.py b/module/plugins/crypter/DownloadVimeoCom.py index 7e76a90ed..88310915b 100644 --- a/module/plugins/crypter/DownloadVimeoCom.py +++ b/module/plugins/crypter/DownloadVimeoCom.py @@ -8,7 +8,7 @@ from module.plugins.Crypter import Crypter class DownloadVimeoCom(Crypter): __name__ = 'DownloadVimeoCom' __type__ = 'crypter' - __pattern__ = r'(?:http://vimeo.com/\d*?|http://smotri.com/video/view/?id=.*)' + __pattern__ = r'(?:http://vimeo\.com/\d*|http://smotri\.com/video/view/\?id=.*)' ## The download from dailymotion failed with a 403 __version__ = '0.1' __description__ = """Video Download Plugin based on downloadvimeo.com""" -- cgit v1.2.3 From 36152ba7dec241e9b10cfc01bd2aeb78547cb046 Mon Sep 17 00:00:00 2001 From: Nold360 <nold@lavabit.com> Date: Tue, 16 Apr 2013 10:00:46 +0200 Subject: Added circlecaptcha to NCryptIn-Plugin --- module/plugins/crypter/NCryptIn.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index a8eaac631..996ff581e 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -52,6 +52,7 @@ class NCryptIn(Crypter): package_links.extend(self.handleContainers()) package_links.extend(self.handleCNL2()) package_links = set(package_links) + self.logDebug(package_links) # Pack self.packages = [(package_name, package_links, folder_name)] @@ -65,7 +66,7 @@ class NCryptIn(Crypter): rexpr = re.compile(pattern, re.DOTALL) content = re.sub(rexpr, "", content) return content - + def isOnline(self): if "Your folder does not exist" in self.cleanedHtml: self.logDebug("File not found") @@ -121,6 +122,19 @@ class NCryptIn(Crypter): challenge, code = recaptcha.challenge(id) postData['recaptcha_challenge_field'] = challenge postData['recaptcha_response_field'] = code + + # Resolve circlecaptcha + if "circlecaptcha" in form: + self.captcha = True + self.logDebug("Captcha protected") + captcha_img_url = "http://ncrypt.in/classes/captcha/circlecaptcha.php" + coords = self.decryptCaptcha(captcha_img_url, forceUser=True, imgtype="png", result_type='positional') + self.logDebug("Captcha resolved, coords [%s]" % str(coords)) + self.captcha_post_url = self.pyfile.url + + postData['circle.x'] = coords[0] + postData['circle.y'] = coords[1] + # Unlock protection postData['submit_protected'] = 'Continue to folder ' @@ -221,4 +235,4 @@ class NCryptIn(Crypter): # Log and return self.logDebug("Block has %d links" % len(links)) - return links \ No newline at end of file + return links -- cgit v1.2.3 From b8bc5ecae9de0eb2bc6f6310d024ecc2fc845c84 Mon Sep 17 00:00:00 2001 From: Nold360 <nold@lavabit.com> Date: Tue, 16 Apr 2013 10:02:52 +0200 Subject: Added Workaround for duplicate links in NCryptIn --- module/plugins/crypter/NCryptIn.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 996ff581e..0d0a884cf 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -51,6 +51,7 @@ class NCryptIn(Crypter): package_links.extend(self.handleWebLinks()) package_links.extend(self.handleContainers()) package_links.extend(self.handleCNL2()) + package_links = self.removeContainers(package_links) package_links = set(package_links) self.logDebug(package_links) @@ -67,6 +68,19 @@ class NCryptIn(Crypter): content = re.sub(rexpr, "", content) return content + def removeContainers(self,package_links): + tmp_package_links = package_links[:] + for link in tmp_package_links: + self.logDebug(link) + if ".dlc" in link or ".ccf" in link or ".rsdf" in link: + self.logDebug("Removing [%s] from package_links" % link) + package_links.remove(link) + + if len(package_links) > 0: + return package_links + else: + return tmp_package_links + def isOnline(self): if "Your folder does not exist" in self.cleanedHtml: self.logDebug("File not found") @@ -123,7 +137,7 @@ class NCryptIn(Crypter): postData['recaptcha_challenge_field'] = challenge postData['recaptcha_response_field'] = code - # Resolve circlecaptcha + # Resolve anicaptcha if "circlecaptcha" in form: self.captcha = True self.logDebug("Captcha protected") -- cgit v1.2.3 From feac135f3bf8d1b4fa47c427daaf09f20e8d3ff3 Mon Sep 17 00:00:00 2001 From: Nold360 <nold@lavabit.com> Date: Tue, 16 Apr 2013 10:16:57 +0200 Subject: I hate this comment.. but now it's finally fixed... --- module/plugins/crypter/NCryptIn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 0d0a884cf..63ac58a43 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -137,7 +137,7 @@ class NCryptIn(Crypter): postData['recaptcha_challenge_field'] = challenge postData['recaptcha_response_field'] = code - # Resolve anicaptcha + # Resolve circlecaptcha if "circlecaptcha" in form: self.captcha = True self.logDebug("Captcha protected") -- cgit v1.2.3 From c53df556a166ca9dedc67b7ca2c11fe08d88bf02 Mon Sep 17 00:00:00 2001 From: Nold360 <nold@lavabit.com> Date: Tue, 16 Apr 2013 12:27:52 +0200 Subject: Converted tabs to spaces --- module/plugins/crypter/NCryptIn.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 63ac58a43..5e1ea347c 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -50,10 +50,9 @@ class NCryptIn(Crypter): package_links = [] package_links.extend(self.handleWebLinks()) package_links.extend(self.handleContainers()) - package_links.extend(self.handleCNL2()) - package_links = self.removeContainers(package_links) + package_links.extend(self.handleCNL2()) + package_links = self.removeContainers(package_links) package_links = set(package_links) - self.logDebug(package_links) # Pack self.packages = [(package_name, package_links, folder_name)] -- cgit v1.2.3 From 9acacf2f9ad77267674f1705cf017bb60d2fc325 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Sat, 20 Apr 2013 22:10:35 +0200 Subject: New crypter EasybytezComFolder http://forum.pyload.org/viewtopic.php?p=9028#p9028 + html unescape in SimpleCrypter --- module/plugins/crypter/EasybytezComFolder.py | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 module/plugins/crypter/EasybytezComFolder.py (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py new file mode 100644 index 000000000..1b887e421 --- /dev/null +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -0,0 +1,60 @@ +# -*- coding: utf-8 -*- + +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +############################################################################ + +import re + +from module.plugins.internal.SimpleCrypter import SimpleCrypter + + +class EasybytezComFolder(SimpleCrypter): + __name__ = "EasybytezComFolder" + __type__ = "crypter" + __pattern__ = r"https?://(www\.)?easybytez\.com/users/\w+/\w+" + __version__ = "0.01" + __description__ = """Easybytez Crypter Plugin""" + __author_name__ = ("stickell") + __author_mail__ = ("l.stickell@yahoo.it") + + LINK_PATTERN = r'<div class="link"><a href="(http://www\.easybytez\.com/\w+)" target="_blank">.+</a></div>' + TITLE_PATTERN = r'<Title>Files of (?P<title>.+) folder' + PAGES_PATTERN = r"(\d+)Next »
\(\d+ total\)
" + + def decrypt(self, pyfile): + self.html = self.load(pyfile.url, decode=True) + + package_name, folder_name = self.getPackageNameAndFolder() + + package_links = re.findall(self.LINK_PATTERN, self.html) + + pages = re.search(self.PAGES_PATTERN, self.html) + if pages: + pages = int(pages.group(1)) + else: + pages = 1 + + p = 2 + while p <= pages: + self.html = self.load(pyfile.url, get={'page': p}, decode=True) + package_links += re.findall(self.LINK_PATTERN, self.html) + p += 1 + + self.logDebug('Package has %d links' % len(package_links)) + + if package_links: + self.packages = [(package_name, package_links, folder_name)] + else: + self.fail('Could not extract any links') \ No newline at end of file -- cgit v1.2.3 From cff3a4897e312a904a43ca0155dab922c6723d3a Mon Sep 17 00:00:00 2001 From: Stefano Date: Tue, 30 Apr 2013 20:25:20 +0200 Subject: SerienjunkiesOrg: fail if the link is blocked by the GeoIP see #93 --- module/plugins/crypter/SerienjunkiesOrg.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index 0506d90fb..5d887de02 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -30,6 +30,8 @@ class SerienjunkiesOrg(Crypter): def getSJSrc(self, url): src = self.req.load(str(url)) + if "This website is not available in your country" in src: + self.fail("Not available in your country") if not src.find("Enter Serienjunkies") == -1: sleep(1) src = self.req.load(str(url)) -- cgit v1.2.3 From 376b58ed62ae2fd27e56de960a00888accff98d4 Mon Sep 17 00:00:00 2001 From: Stefano Date: Tue, 30 Apr 2013 20:27:18 +0200 Subject: SerienjunkiesOrg: version increased after cff3a4897e312a904a43ca0155dab922c6723d3a --- module/plugins/crypter/SerienjunkiesOrg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index 5d887de02..3fcc12e36 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -11,7 +11,7 @@ class SerienjunkiesOrg(Crypter): __name__ = "SerienjunkiesOrg" __type__ = "container" __pattern__ = r"http://.*?(serienjunkies.org|dokujunkies.org)/.*?" - __version__ = "0.37" + __version__ = "0.38" __config__ = [ ("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"), ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), -- cgit v1.2.3 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') 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 From db5992179699477354d73f5b510c661a1bac1bef Mon Sep 17 00:00:00 2001 From: Christopher <4Christopher@gmx.de> Date: Sun, 12 May 2013 12:22:46 +0200 Subject: Movie2kTo.py: Added regular expression for matching the hoster URL. --- module/plugins/crypter/Movie2kTo.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter') diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py index f2c5ece55..81f700e8c 100644 --- a/module/plugins/crypter/Movie2kTo.py +++ b/module/plugins/crypter/Movie2kTo.py @@ -9,7 +9,7 @@ class Movie2kTo(Crypter): __name__ = 'Movie2kTo' __type__ = 'container' __pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html' - __version__ = '0.4' + __version__ = '0.5' __config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, Putlocker, '), ('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'), ('whole_season', 'bool', 'Download whole season', 'False'), @@ -137,7 +137,18 @@ class Movie2kTo(Crypter): self.logDebug('id: %s, %s: %s' % (h_id, hoster, url)) links.append(url) except: - self.logDebug('Failed to find the URL') + self.logDebug('Failed to find the URL (possibility 1)') + try: + url = re.search(r'