diff options
| author |  Stefano <l.stickell@yahoo.it>
| 2013-04-05 17:37:13 +0200 |
|---|---|---|
| committer | Stefano <l.stickell@yahoo.it>
| 2013-04-05 17:37:13 +0200 |
| commit | 95cf872bf9aff8b332b54c1310f2074469045bf5 (patch) | |
| tree | 544b2a02c30d69594af4f1f5f590ecfe426a6c3e | |
| parent | PutlockerCom: code optimized and cleaned up (diff) | |
| download | pyload-95cf872bf9aff8b332b54c1310f2074469045bf5.tar.xz | |
PutlockerCom: using loop to avoid repeated statement
| -rw-r--r-- | module/plugins/hoster/PutlockerCom.py | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/module/plugins/hoster/PutlockerCom.py b/module/plugins/hoster/PutlockerCom.py index 043adcb06..9eff0dc2b 100644 --- a/module/plugins/hoster/PutlockerCom.py +++ b/module/plugins/hoster/PutlockerCom.py @@ -28,7 +28,7 @@ class PutlockerCom(SimpleHoster): __name__ = "PutlockerCom" __type__ = "hoster" __pattern__ = r'http://(www\.)?putlocker\.com/(file|embed)/[A-Z0-9]+' - __version__ = "0.23" + __version__ = "0.24" __description__ = """Putlocker.Com""" __author_name__ = ("jeix", "stickell") __author_mail__ = ("l.stickell@yahoo.it") @@ -55,19 +55,15 @@ class PutlockerCom(SimpleHoster): "(>This content server has been temporarily disabled for upgrades|Try again soon\\. You can still download it below\\.<)" in self.html: self.retry(wait_time=2 * 60 * 60, reason="Download limit exceeded or server disabled") - link = re.search(r'(/get_file\.php\?id=[A-Z0-9]+&key=[A-Za-z0-9=]+&original=1)', self.html) - if not link: - link = re.search(r"(/get_file\.php\?download=[A-Z0-9]+&key=[a-z0-9]+)", self.html) - - if not link: - link = re.search(r"(/get_file\.php\?download=[A-Z0-9]+&key=[a-z0-9]+&original=1)", self.html) - - if not link: - link = re.search( - r'<a href="/gopro\.php">Tired of ads and waiting\? Go Pro!</a>[\t\n\rn ]+</div>[\t\n\rn ]+<a href="(/.*?)"', - self.html) - - if not link: + patterns = (r'(/get_file\.php\?id=[A-Z0-9]+&key=[A-Za-z0-9=]+&original=1)', + r"(/get_file\.php\?download=[A-Z0-9]+&key=[a-z0-9]+)", + r"(/get_file\.php\?download=[A-Z0-9]+&key=[a-z0-9]+&original=1)", + r'<a href="/gopro\.php">Tired of ads and waiting\? Go Pro!</a>[\t\n\rn ]+</div>[\t\n\rn ]+<a href="(/.*?)"') + for pattern in patterns: + link = re.search(pattern, self.html) + if link: + break + else: link = re.search(r"playlist: '(/get_file\.php\?stream=[A-Za-z0-9=]+)'", self.html) if link: self.html = self.load("http://www.putlocker.com" + link.group(1)) |