From cdb06469a640c1875229903a2dbdfa8be469b5bc Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 13:52:30 +0100
Subject: Improve a lot of plugin __pattern__

---
 module/plugins/hoster/JumbofilesCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/JumbofilesCom.py')

diff --git a/module/plugins/hoster/JumbofilesCom.py b/module/plugins/hoster/JumbofilesCom.py
index 2df639ac1..cabc0f098 100644
--- a/module/plugins/hoster/JumbofilesCom.py
+++ b/module/plugins/hoster/JumbofilesCom.py
@@ -10,7 +10,7 @@ class JumbofilesCom(SimpleHoster):
     __type__    = "hoster"
     __version__ = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(\w{12}).*'
+    __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(\w{12})'
 
     __description__ = """JumboFiles.com hoster plugin"""
     __license__     = "GPLv3"
-- 
cgit v1.2.3


From fd105f8e51768ec1943cda2375bdfdbe5b0a3951 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 00:35:51 +0100
Subject: "New Year" Update: hoster plugins

---
 module/plugins/hoster/JumbofilesCom.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'module/plugins/hoster/JumbofilesCom.py')

diff --git a/module/plugins/hoster/JumbofilesCom.py b/module/plugins/hoster/JumbofilesCom.py
index cabc0f098..7adc1a029 100644
--- a/module/plugins/hoster/JumbofilesCom.py
+++ b/module/plugins/hoster/JumbofilesCom.py
@@ -8,9 +8,9 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class JumbofilesCom(SimpleHoster):
     __name__    = "JumbofilesCom"
     __type__    = "hoster"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(\w{12})'
+    __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})'
 
     __description__ = """JumboFiles.com hoster plugin"""
     __license__     = "GPLv3"
@@ -19,7 +19,7 @@ class JumbofilesCom(SimpleHoster):
 
     INFO_PATTERN = r'<TR><TD>(?P<N>[^<]+?)\s*<small>\((?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
     OFFLINE_PATTERN = r'Not Found or Deleted / Disabled due to inactivity or DMCA'
-    LINK_PATTERN = r'<meta http-equiv="refresh" content="10;url=(.+)">'
+    LINK_FREE_PATTERN = r'<meta http-equiv="refresh" content="10;url=(.+)">'
 
 
     def setup(self):
@@ -27,12 +27,10 @@ class JumbofilesCom(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self):
-        ukey = re.match(self.__pattern__, self.pyfile.url).group(1)
-        post_data = {"id": ukey, "op": "download3", "rand": ""}
+    def handleFree(self, pyfile):
+        post_data = {"id": self.info['pattern']['ID'], "op": "download3", "rand": ""}
         html = self.load(self.pyfile.url, post=post_data, decode=True)
-        url = re.search(self.LINK_PATTERN, html).group(1)
-        self.download(url)
+        self.link = re.search(self.LINK_FREE_PATTERN, html).group(1)
 
 
 getInfo = create_getInfo(JumbofilesCom)
-- 
cgit v1.2.3