diff options
author | RaNaN <Mast3rRaNaN@hotmail.de> | 2013-02-15 20:25:24 +0100 |
---|---|---|
committer | RaNaN <Mast3rRaNaN@hotmail.de> | 2013-02-15 20:25:24 +0100 |
commit | e86afe462cc0347a64a7682a30938268966013d4 (patch) | |
tree | 1075c9eeacd9b1e7a7a60650b98e091f09fcb4fd | |
parent | fixed wrong imported capitalization (diff) | |
parent | New regex to fix broken Putlocker plugin (diff) | |
download | pyload-e86afe462cc0347a64a7682a30938268966013d4.tar.xz |
Merge pull request #5 from gonzalosr/patch-2
New regex to fix broken Putlocker plugin
-rw-r--r-- | module/plugins/hoster/PutlockerCom.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/module/plugins/hoster/PutlockerCom.py b/module/plugins/hoster/PutlockerCom.py index 8cfcd4d9e..ca5336231 100644 --- a/module/plugins/hoster/PutlockerCom.py +++ b/module/plugins/hoster/PutlockerCom.py @@ -52,7 +52,7 @@ class PutlockerCom(Hoster): __name__ = "PutlockerCom" __type__ = "hoster" __pattern__ = r'http://(www\.)?putlocker\.com/(file|embed)/[A-Z0-9]+' - __version__ = "0.2" + __version__ = "0.21" __description__ = """Putlocker.Com""" __author_name__ = ("jeix") @@ -111,6 +111,9 @@ class PutlockerCom(Hoster): self.link = re.search("\"(/get_file\\.php\\?download=[A-Z0-9]+\\&key=[a-z0-9]+&original=1)\"", self.html2) if self.link is None: + self.link = re.search("\"(/get_file\\.php\\?id=[A-Z0-9]+\\&key=[A-Za-z0-9=]+\\&original=1)\"", self.html2) + + if self.link is None: self.link = re.search("playlist: \\'(/get_file\\.php\\?stream=[A-Za-z0-9=]+)\\'", self.html2) if not self.link is None: self.html3 = self.load("http://www.putlocker.com" + self.link.group(1)) |