From 45b6242579ac65444fd278e5ecde96be29136bbe Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 05:49:47 +0200 Subject: New plugins: FiledropperCom & FileuploadNet --- module/plugins/hoster/PromptfileCom.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'module/plugins/hoster/PromptfileCom.py') diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index 3815a1a24..3578ff7fb 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -18,10 +18,10 @@ class PromptfileCom(SimpleHoster): __authors__ = [("igel", "igelkun@myopera.com")] - INFO_PATTERN = r'(?P.*?) \((?P[\d.,]+) (?P[\w^_]+)\)' + INFO_PATTERN = r'(?P.*?) \((?P[\d.,]+) (?P[\w^_]+)\)' OFFLINE_PATTERN = r'File Not Found' - CHASH_PATTERN = r'' + CHASH_PATTERN = r'' LINK_FREE_PATTERN = r'Download File' @@ -30,17 +30,15 @@ class PromptfileCom(SimpleHoster): m = re.search(self.CHASH_PATTERN, self.html) if m is None: self.error(_("CHASH_PATTERN not found")) + chash = m.group(1) self.logDebug("Read chash %s" % chash) + # continue to stage2 self.html = self.load(pyfile.url, decode=True, post={'chash': chash}) # STAGE 2: get the direct link - m = re.search(self.LINK_FREE_PATTERN, self.html) - if m is None: - self.error(_("LINK_FREE_PATTERN not found")) - - self.link = m.group(1) + return super(PromptfileCom, self).handleFree(pyfile) getInfo = create_getInfo(PromptfileCom) -- cgit v1.2.3 From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/hoster/PromptfileCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/PromptfileCom.py') diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index 3578ff7fb..4a1b07f05 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -35,7 +35,7 @@ class PromptfileCom(SimpleHoster): self.logDebug("Read chash %s" % chash) # continue to stage2 - self.html = self.load(pyfile.url, decode=True, post={'chash': chash}) + self.html = self.load(pyfile.url, post={'chash': chash}) # STAGE 2: get the direct link return super(PromptfileCom, self).handleFree(pyfile) -- cgit v1.2.3 From 20b6a2ec022202b0efb6cb69415239fb8f4d1445 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Jun 2015 18:59:20 +0200 Subject: Spare code cosmetics (2) --- module/plugins/hoster/PromptfileCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/PromptfileCom.py') diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index 4a1b07f05..c6878cbb0 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -34,7 +34,7 @@ class PromptfileCom(SimpleHoster): chash = m.group(1) self.logDebug("Read chash %s" % chash) - # continue to stage2 + #: continue to stage2 self.html = self.load(pyfile.url, post={'chash': chash}) # STAGE 2: get the direct link -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/hoster/PromptfileCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/PromptfileCom.py') diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index c6878cbb0..ddfce8e19 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class PromptfileCom(SimpleHoster): __name__ = "PromptfileCom" __type__ = "hoster" - __version__ = "0.13" + __version__ = "0.14" __pattern__ = r'https?://(?:www\.)?promptfile\.com/' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -25,20 +25,20 @@ class PromptfileCom(SimpleHoster): LINK_FREE_PATTERN = r'Download File' - def handleFree(self, pyfile): + def handle_free(self, pyfile): # STAGE 1: get link to continue m = re.search(self.CHASH_PATTERN, self.html) if m is None: self.error(_("CHASH_PATTERN not found")) chash = m.group(1) - self.logDebug("Read chash %s" % chash) + self.log_debug("Read chash %s" % chash) #: continue to stage2 self.html = self.load(pyfile.url, post={'chash': chash}) # STAGE 2: get the direct link - return super(PromptfileCom, self).handleFree(pyfile) + return super(PromptfileCom, self).handle_free(pyfile) getInfo = create_getInfo(PromptfileCom) -- cgit v1.2.3 From dad722ac7255640e7e0541c4094a4d2e4de79cd3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 00:05:58 +0200 Subject: Code cosmetics (2) --- module/plugins/hoster/PromptfileCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/PromptfileCom.py') diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index ddfce8e19..e01da0949 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -26,7 +26,7 @@ class PromptfileCom(SimpleHoster): def handle_free(self, pyfile): - # STAGE 1: get link to continue + #: STAGE 1: get link to continue m = re.search(self.CHASH_PATTERN, self.html) if m is None: self.error(_("CHASH_PATTERN not found")) @@ -34,10 +34,10 @@ class PromptfileCom(SimpleHoster): chash = m.group(1) self.log_debug("Read chash %s" % chash) - #: continue to stage2 + #: Continue to stage2 self.html = self.load(pyfile.url, post={'chash': chash}) - # STAGE 2: get the direct link + #: STAGE 2: get the direct link return super(PromptfileCom, self).handle_free(pyfile) -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/hoster/PromptfileCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/PromptfileCom.py') diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index e01da0949..f16b376b9 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -9,6 +9,7 @@ class PromptfileCom(SimpleHoster): __name__ = "PromptfileCom" __type__ = "hoster" __version__ = "0.14" + __status__ = "stable" __pattern__ = r'https?://(?:www\.)?promptfile\.com/' __config__ = [("use_premium", "bool", "Use premium account if available", True)] -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/hoster/PromptfileCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/PromptfileCom.py') diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index f16b376b9..5f7510123 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -9,7 +9,7 @@ class PromptfileCom(SimpleHoster): __name__ = "PromptfileCom" __type__ = "hoster" __version__ = "0.14" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'https?://(?:www\.)?promptfile\.com/' __config__ = [("use_premium", "bool", "Use premium account if available", True)] -- cgit v1.2.3