Merge pull request #1 from pyload/stable

sync stable

1 files changed, 11 insertions, 10 deletions

diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py
index af38c4e15..3815a1a24 100644
--- a/module/plugins/hoster/PromptfileCom.py
+++ b/module/plugins/hoster/PromptfileCom.py
@@ -8,23 +8,24 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class PromptfileCom(SimpleHoster):
     __name__    = "PromptfileCom"
     __type__    = "hoster"
-    __version__ = "0.12"
+    __version__ = "0.13"
 
     __pattern__ = r'https?://(?:www\.)?promptfile\.com/'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Promptfile.com hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("igel", "igelkun@myopera.com")]
 
 
-    INFO_PATTERN = r'<span style="[^"]*" title="[^"]*">(?P<N>.*?) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</span>'
-    OFFLINE_PATTERN = r'<span style="[^"]*" title="File Not Found">File Not Found</span>'
+    INFO_PATTERN = r'<span style=".+?" title=".+?">(?P<N>.*?) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</span>'
+    OFFLINE_PATTERN = r'<span style=".+?" title="File Not Found">File Not Found</span>'
 
-    CHASH_PATTERN = r'<input type="hidden" name="chash" value="([^"]*)" />'
-    LINK_PATTERN = r'<a href=\"(.+)\" target=\"_blank\" class=\"view_dl_link\">Download File</a>'
+    CHASH_PATTERN = r'<input type="hidden" name="chash" value="(.+?)" />'
+    LINK_FREE_PATTERN = r'<a href=\"(.+)\" target=\"_blank\" class=\"view_dl_link\">Download File</a>'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         # STAGE 1: get link to continue
         m = re.search(self.CHASH_PATTERN, self.html)
         if m is None:
@@ -32,14 +33,14 @@ class PromptfileCom(SimpleHoster):
         chash = m.group(1)
         self.logDebug("Read chash %s" % chash)
         # continue to stage2
-        self.html = self.load(self.pyfile.url, decode=True, post={'chash': chash})
+        self.html = self.load(pyfile.url, decode=True, post={'chash': chash})
 
         # STAGE 2: get the direct link
-        m = re.search(self.LINK_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("LINK_PATTERN not found"))
+            self.error(_("LINK_FREE_PATTERN not found"))
 
-        self.download(m.group(1), disposition=True)
+        self.link = m.group(1)
 
 
 getInfo = create_getInfo(PromptfileCom)