From b8e165f35383b247a7248edabde2b2145a4a32dd Mon Sep 17 00:00:00 2001
From: Jeix <devnull@localhost>
Date: Sat, 24 Dec 2011 12:14:10 +0100
Subject: OronCom improve

---
 module/plugins/hoster/OronCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/OronCom.py b/module/plugins/hoster/OronCom.py
index e3e157a6d..0be840d76 100755
--- a/module/plugins/hoster/OronCom.py
+++ b/module/plugins/hoster/OronCom.py
@@ -33,12 +33,12 @@ class OronCom(Hoster):
     __name__ = "OronCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:www.)?oron.com/"
-    __version__ = "0.12"
+    __version__ = "0.13"
     __description__ = "File Hoster: Oron.com"
     __author_name__ = ("chrox", "DHMH")
     __author_mail__ = ("chrox@pyload.org", "DHMH@pyload.org")
 
-    FILE_INFO_PATTERN = r'Dateiname: <b class="f_arial f_14px">(.*)</b> <br>Größe: ([0-9,.]+) (Kb|Mb|Gb)'
+    FILE_INFO_PATTERN = r'(?:Filename|Dateiname): <b class="f_arial f_14px">(.*?)</b>\s*<br>\s*(?:Größe|File size): ([0-9,\.]+) (Kb|Mb|Gb)'
 
     def init(self):
         self.resumeDownload = self.multiDL = True if self.account else False
-- 
cgit v1.2.3


From ee1f2cff41825628a71a46a544d0ef893f50c6a3 Mon Sep 17 00:00:00 2001
From: Jeix <devnull@localhost>
Date: Mon, 26 Dec 2011 22:54:18 +0100
Subject: Filesonic

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

(limited to 'module')

diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index 813333acb..650addf61 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -54,7 +54,7 @@ class FilesonicCom(Hoster):
     API_ADDRESS = "http://api.filesonic.com"
     URL_DOMAIN_PATTERN = r'(?P<prefix>.*?)(?P<domain>.(filesonic|sharingmatrix)\..+?)(?P<suffix>/.*)'
     FILE_ID_PATTERN = r'/file/(?P<id>([a-z][0-9]+/)?[0-9]+)(/.*)?' #change may break wupload - be careful
-    FILE_LINK_PATTERN = r'<p><a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)"><span>Start download'
+    FILE_LINK_PATTERN = r'<a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)" class="downloadLink"><span>Start Download'
     WAIT_TIME_PATTERN = r'countDownDelay = (?P<wait>\d+)'
     WAIT_TM_PATTERN = r"name='tm' value='(.*?)' />"
     WAIT_TM_HASH_PATTERN = r"name='tm_hash' value='(.*?)' />"
-- 
cgit v1.2.3


From d863b087394bbc911f4aee1c3399d0040e95a2bc Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Wed, 28 Dec 2011 21:37:45 +0100
Subject: fso update

---
 module/plugins/hoster/FilesonicCom.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index 650addf61..8f8c9b43d 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -45,15 +45,15 @@ def getId(url):
 class FilesonicCom(Hoster):
     __name__ = "FilesonicCom"
     __type__ = "hoster"
-    __pattern__ = r"http://[\w\.]*?(sharingmatrix|filesonic)\..*?/file/(([a-z][0-9]+/)?[0-9]+)(/.*)?"
-    __version__ = "0.33"
+    __pattern__ = r"http://[\w\.]*?(sharingmatrix|filesonic)\..*?/.*?file/([a-zA-Z0-9]+(/.+)?|[a-z0-9]+/[0-9]+(/.+)?|[0-9]+(/.+)?)"
+    __version__ = "0.34"
     __description__ = """FilesonicCom und Sharingmatrix Download Hoster"""
     __author_name__ = ("jeix", "paulking")
     __author_mail__ = ("jeix@hasnomail.de", "")
 
     API_ADDRESS = "http://api.filesonic.com"
     URL_DOMAIN_PATTERN = r'(?P<prefix>.*?)(?P<domain>.(filesonic|sharingmatrix)\..+?)(?P<suffix>/.*)'
-    FILE_ID_PATTERN = r'/file/(?P<id>([a-z][0-9]+/)?[0-9]+)(/.*)?' #change may break wupload - be careful
+    FILE_ID_PATTERN = r'/file/(?P<id>([a-zA-Z0-9]+/)?[0-9]+)(/.*)?' #change may break wupload - be careful
     FILE_LINK_PATTERN = r'<a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)" class="downloadLink"><span>Start Download'
     WAIT_TIME_PATTERN = r'countDownDelay = (?P<wait>\d+)'
     WAIT_TM_PATTERN = r"name='tm' value='(.*?)' />"
-- 
cgit v1.2.3


From c3b31113508a687d0070f54951f53f9cd458f734 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Wed, 28 Dec 2011 22:07:05 +0100
Subject: little fix

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

(limited to 'module')

diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index 8f8c9b43d..fd6a1b833 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -28,7 +28,7 @@ def getInfo(urls):
             response = json_loads(getURL(check_url, decode=True))
             for item in response["FSApi_Link"]["getInfo"]["response"]["links"]:
                 if item["status"] != "AVAILABLE":
-                    result.append((None, 0, 1, ids[str(item["id"])]))
+                    result.append((ids[str(item["id"])], 0, 1, ids[str(item["id"])]))
                 else:
                     result.append((item["filename"], item["size"], 2, ids[str(item["id"])]))
         yield result
-- 
cgit v1.2.3


From 79695028c05e30b114c7933b805b191f5c3f97e0 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Thu, 29 Dec 2011 00:44:20 +0100
Subject: closed #479

---
 module/plugins/hoster/MegauploadCom.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index 100553ebf..6b5d10729 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -65,7 +65,7 @@ class MegauploadCom(Hoster):
     __name__ = "MegauploadCom"
     __type__ = "hoster"
     __pattern__ = r"http://[\w\.]*?(megaupload)\.com/.*?(\?|&)d=(?P<id>[0-9A-Za-z]+)"
-    __version__ = "0.28"
+    __version__ = "0.3"
     __description__ = """Megaupload.com Download Hoster"""
     __author_name__ = ("spoob")
     __author_mail__ = ("spoob@pyload.org")
@@ -74,6 +74,7 @@ class MegauploadCom(Hoster):
     API_STATUS_MAPPING = {"0": statusMap['online'], "1": statusMap['offline'], "3": statusMap['temp. offline']}
     
     FILE_URL_PATTERN = r'<a href="([^"]+)" class="download_regular_usual"' 
+    PREMIUM_URL_PATTERN = r'href=\"(http://[^\"]*?)\" class=\"download_premium_but\">'
     
     def init(self):
         self.html = [None, None]
@@ -125,12 +126,12 @@ class MegauploadCom(Hoster):
                 if e.args and e.args[0] == 33:
                     # undirect download and resume , not a good idea
                     page = self.load(pyfile.url)
-                    self.download(re.search(r'href=\"(http://[^\"]*?)\" class=\"down_ad_butt1\">', page).group(1))
+                    self.download(re.search(self.PREMIUM_URL_PATTERN, page).group(1))
                     return 
                 else:
                     raise
 
-            check = self.checkDownload({"dllink": re.compile(r'href=\"(http://[^\"]*?)\" class=\"down_ad_butt1\">')})
+            check = self.checkDownload({"dllink": re.compile(self.PREMIUM_URL_PATTERN)})
             if check == "dllink":
                 self.log.warning(_("You should enable direct Download in your Megaupload Account settings"))
 
@@ -270,4 +271,4 @@ class MegauploadCom(Hoster):
         if re.search("The password you have entered is not correct", self.html[1]):
             self.fail(_("Wrong password for download link."))
             
-        return True
\ No newline at end of file
+        return True
-- 
cgit v1.2.3


From c87e1f49ec8605f23960e001a449202d009c951b Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Thu, 29 Dec 2011 11:52:44 +0100
Subject: fix from Lino24

---
 module/plugins/hoster/FilesonicCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index fd6a1b833..a878c45b3 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -53,8 +53,8 @@ class FilesonicCom(Hoster):
 
     API_ADDRESS = "http://api.filesonic.com"
     URL_DOMAIN_PATTERN = r'(?P<prefix>.*?)(?P<domain>.(filesonic|sharingmatrix)\..+?)(?P<suffix>/.*)'
-    FILE_ID_PATTERN = r'/file/(?P<id>([a-zA-Z0-9]+/)?[0-9]+)(/.*)?' #change may break wupload - be careful
-    FILE_LINK_PATTERN = r'<a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)" class="downloadLink"><span>Start Download'
+    FILE_ID_PATTERN = r'/file/(?P<id>([a-z][0-9]+/)?[a-zA-Z0-9\-._+]+)(/.*)?' #change may break wupload - be careful
+    FILE_LINK_PATTERN = r'<p><a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)"><span>Start download'
     WAIT_TIME_PATTERN = r'countDownDelay = (?P<wait>\d+)'
     WAIT_TM_PATTERN = r"name='tm' value='(.*?)' />"
     WAIT_TM_HASH_PATTERN = r"name='tm_hash' value='(.*?)' />"
-- 
cgit v1.2.3


From c561ffac98e3e15e43fee3debd8b765ac36113e8 Mon Sep 17 00:00:00 2001
From: Jeix <devnull@localhost>
Date: Thu, 29 Dec 2011 12:47:45 +0100
Subject: fso free user fix

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

(limited to 'module')

diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index a878c45b3..736b5b96b 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -54,7 +54,7 @@ class FilesonicCom(Hoster):
     API_ADDRESS = "http://api.filesonic.com"
     URL_DOMAIN_PATTERN = r'(?P<prefix>.*?)(?P<domain>.(filesonic|sharingmatrix)\..+?)(?P<suffix>/.*)'
     FILE_ID_PATTERN = r'/file/(?P<id>([a-z][0-9]+/)?[a-zA-Z0-9\-._+]+)(/.*)?' #change may break wupload - be careful
-    FILE_LINK_PATTERN = r'<p><a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)"><span>Start download'
+    FILE_LINK_PATTERN = r'<a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)" class="downloadLink"><span>Start Download'
     WAIT_TIME_PATTERN = r'countDownDelay = (?P<wait>\d+)'
     WAIT_TM_PATTERN = r"name='tm' value='(.*?)' />"
     WAIT_TM_HASH_PATTERN = r"name='tm_hash' value='(.*?)' />"
-- 
cgit v1.2.3


From 89cdcdb027ef22ddb391ff5840e616d7df8495ac Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Thu, 29 Dec 2011 12:52:55 +0100
Subject: updatemanager fix

---
 module/plugins/hooks/UpdateManager.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index 920a88060..0dfb42ff2 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -30,7 +30,7 @@ from module.plugins.Hook import threaded, Expose, Hook
 
 class UpdateManager(Hook):
     __name__ = "UpdateManager"
-    __version__ = "0.1"
+    __version__ = "0.11"
     __description__ = """checks for updates"""
     __config__ = [("activated", "bool", "Activated", "True"),
         ("interval", "int", "Check interval in minutes", "360"),
@@ -124,6 +124,7 @@ class UpdateManager(Hook):
             else:
                 name = filename.replace(".py", "")
 
+	    #TODO: obsolete
             if prefix.endswith("s"):
                 type = prefix[:-1]
             else:
@@ -160,7 +161,7 @@ class UpdateManager(Hook):
             f.close()
             self.updated = True
 
-            reloads.append((type, name))
+            reloads.append((prefix, name))
 
         self.reloaded = self.core.pluginManager.reloadPlugins(reloads)
 
@@ -191,4 +192,4 @@ class UpdateManager(Hook):
                     reloads.append(id)
                     self.mtimes[id] = mtime
 
-        self.core.pluginManager.reloadPlugins(reloads)
\ No newline at end of file
+        self.core.pluginManager.reloadPlugins(reloads)
-- 
cgit v1.2.3


From 050f570fbedb2477bdbcc3a3aa21a26efcef6a30 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Thu, 29 Dec 2011 22:42:57 +0100
Subject: rehost fix

---
 module/plugins/hooks/RehostTo.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostTo.py
index 34bcbf4c7..b16987f5c 100644
--- a/module/plugins/hooks/RehostTo.py
+++ b/module/plugins/hooks/RehostTo.py
@@ -5,7 +5,7 @@ from module.plugins.internal.MultiHoster import MultiHoster
 
 class RehostTo(MultiHoster):
     __name__ = "RehostTo"
-    __version__ = "0.4"
+    __version__ = "0.41"
     __type__ = "hook"
 
     __config__ = [("activated", "bool", "Activated", "False")]
@@ -24,7 +24,7 @@ class RehostTo(MultiHoster):
 
     def coreReady(self):
 
-        self.account = self.core.accountManager.loadClass("accounts", "RehostTo")
+        self.account = self.core.accountManager.getAccountPlugin("RehostTo")
 
         user = self.account.selectAccount()[0]
 
-- 
cgit v1.2.3


From c79762afb617604e9e55c3bebde59ff850885ed7 Mon Sep 17 00:00:00 2001
From: CryNickSystems <d.hardtke@yahoo.de>
Date: Fri, 30 Dec 2011 20:57:35 +0100
Subject: OronCom fix - thx petrucci77

---
 module/plugins/hoster/OronCom.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/OronCom.py b/module/plugins/hoster/OronCom.py
index 0be840d76..0b547e516 100755
--- a/module/plugins/hoster/OronCom.py
+++ b/module/plugins/hoster/OronCom.py
@@ -15,7 +15,7 @@ def getInfo(urls):
             result.append((url, 0, 1, url))
             continue
 
-        m = re.search(OronCom.FILE_INFO_PATTERN, html)
+        m = re.search(OronCom.FILE_INFO_PATTERN, html, re.MULTILINE)
         if m:
             name = m.group(1)
             hSize = float(m.group(2).replace(",", "."))
@@ -33,10 +33,10 @@ class OronCom(Hoster):
     __name__ = "OronCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:www.)?oron.com/"
-    __version__ = "0.13"
+    __version__ = "0.14"
     __description__ = "File Hoster: Oron.com"
     __author_name__ = ("chrox", "DHMH")
-    __author_mail__ = ("chrox@pyload.org", "DHMH@pyload.org")
+    __author_mail__ = ("chrox@pyload.org", "webmaster@pcProfil.de")
 
     FILE_INFO_PATTERN = r'(?:Filename|Dateiname): <b class="f_arial f_14px">(.*?)</b>\s*<br>\s*(?:Größe|File size): ([0-9,\.]+) (Kb|Mb|Gb)'
 
-- 
cgit v1.2.3


From f4a3d381506442380ae2b60cfbbee693d14b5457 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 3 Jan 2012 21:55:13 +0100
Subject: UpdateManager fix

---
 module/plugins/hooks/UpdateManager.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index 0dfb42ff2..ce75399c5 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -15,7 +15,6 @@
     along with this program; if not, see <http://www.gnu.org/licenses/>.
 
     @author: RaNaN
-    @interface-version: 0.1
 """
 
 import sys
@@ -30,7 +29,7 @@ from module.plugins.Hook import threaded, Expose, Hook
 
 class UpdateManager(Hook):
     __name__ = "UpdateManager"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __description__ = """checks for updates"""
     __config__ = [("activated", "bool", "Activated", "True"),
         ("interval", "int", "Check interval in minutes", "360"),
@@ -172,7 +171,7 @@ class UpdateManager(Hook):
             self.last_check = time()
 
         modules = filter(
-            lambda m: m and (m.__name__.startswith("module.plugins.") or m.__name__.startswith("userplugins.")),
+            lambda m: m and (m.__name__.startswith("module.plugins.") or m.__name__.startswith("userplugins.")) and m.__name__.count(".") >= 2,
             sys.modules.itervalues())
 
         reloads = []
-- 
cgit v1.2.3


From 503cff86eb5e5b902291f5995838f1facd84319c Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Thu, 5 Jan 2012 01:12:23 +0100
Subject: merge in plugin updates

---
 module/plugins/accounts/EasybytezCom.py  |  68 +++++++++++++++++++++
 module/plugins/accounts/MegauploadCom.py |   6 +-
 module/plugins/hooks/EasybytezCom.py     |  32 ++++++++++
 module/plugins/hoster/CrockoCom.py       |   5 +-
 module/plugins/hoster/EasybytezCom.py    | 100 ++++++++++++++++++++++++++++---
 module/plugins/hoster/FilesonicCom.py    |   6 +-
 module/plugins/hoster/MediafireCom.py    |   6 +-
 7 files changed, 204 insertions(+), 19 deletions(-)
 create mode 100644 module/plugins/accounts/EasybytezCom.py
 create mode 100644 module/plugins/hooks/EasybytezCom.py

(limited to 'module')

diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
new file mode 100644
index 000000000..cf2b16394
--- /dev/null
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+    
+    @author: zoidberg
+"""
+
+from module.plugins.Account import Account
+import re
+from module.utils import parseFileSize
+from time import mktime, strptime
+
+class EasybytezCom(Account):
+    __name__ = "EasybytezCom"
+    __version__ = "0.01"
+    __type__ = "account"
+    __description__ = """EasyBytez.com account plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")
+    
+    VALID_UNTIL_PATTERN = r'<TR><TD>Premium account expire:</TD><TD><b>([^<]+)</b>'
+    TRAFFIC_LEFT_PATTERN = r'<TR><TD>Traffic available today:</TD><TD><b>(?P<S>[^<]+)</b>'
+
+    def loadAccountInfo(self, user, req):
+        #self.relogin(user)
+        html = req.load("http://www.easybytez.com/?op=my_account", decode = True)
+        
+        validuntil = -1
+        found = re.search(self.VALID_UNTIL_PATTERN, html)
+        if found:
+            premium = True
+            try:
+                self.logDebug(found.group(1))
+                validuntil = mktime(strptime(found.group(1), "%d %B %Y"))
+            except Exception, e:
+                self.logError(e)
+        else:
+            premium = False
+                    
+        #found = re.search(self.TRAFFIC_LEFT_PATTERN, html)           
+        #trafficleft = parseFileSize(found.group('S')) / 1024 if found else 0
+        #self.premium = True if trafficleft else False
+        trafficleft = -1 
+        
+        return ({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium})
+    
+    def login(self, user, data, req):
+        html = req.load('http://www.easybytez.com/', post = {
+            "login": user,
+            "op": "login",
+            "password": data['password'],
+            "redirect": "http://easybytez.com/"
+            }, decode = True)
+        
+        if 'Incorrect Login or Password' in html:          
+            self.wrongPassword()
\ No newline at end of file
diff --git a/module/plugins/accounts/MegauploadCom.py b/module/plugins/accounts/MegauploadCom.py
index 12e510fcf..ff4f5971c 100644
--- a/module/plugins/accounts/MegauploadCom.py
+++ b/module/plugins/accounts/MegauploadCom.py
@@ -24,16 +24,16 @@ from module.plugins.Account import Account
 
 class MegauploadCom(Account):
     __name__ = "MegauploadCom"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __type__ = "account"
     __description__ = """megaupload account plugin"""
     __author_name__ = ("RaNaN")
     __author_mail__ = ("RaNaN@pyload.org")
     
     def loadAccountInfo(self, user, req):
-        page = req.load("http://www.megaupload.com/?c=account")
+        page = req.load("http://www.megaupload.com/?c=account&setlang=en", decode = True)
         
-        premium = True if r'<div class="account_txt">Premium' in page else False
+        premium = False if r'<div class="account_txt">Regular' in page else True
         validuntil = -1
         
         if premium:
diff --git a/module/plugins/hooks/EasybytezCom.py b/module/plugins/hooks/EasybytezCom.py
new file mode 100644
index 000000000..4dd39cca6
--- /dev/null
+++ b/module/plugins/hooks/EasybytezCom.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+from module.network.RequestFactory import getURL
+from module.plugins.internal.MultiHoster import MultiHoster
+import re
+
+def getConfigSet(option):
+    s = set(option.lower().replace(',','|').split('|'))
+    s.discard(u'')
+    return s
+
+class EasybytezCom(MultiHoster):
+    __name__ = "EasybytezCom"
+    __version__ = "0.01"
+    __type__ = "hook"
+    __config__ = [("activated", "bool", "Activated", "False"),
+        ("includeHoster", "str", "Use only for downloads from (comma-separated hosters)", ""),
+        ("excludeHoster", "str", "Do not use for downloads from (comma-separated hosters)", "")]
+    __description__ = """EasyBytez.com hook plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")
+
+    def getHoster(self):
+
+        hoster = set(['2shared.com', 'easy-share.com', 'filefactory.com', 'fileserve.com', 'filesonic.com', 'hotfile.com', 'mediafire.com', 'megaupload.com', 'netload.in', 'rapidshare.com', 'uploading.com', 'wupload.com', 'oron.com', 'uploadstation.com', 'ul.to', 'uploaded.to'])   
+        
+        option = self.getConfig('includeHoster').strip()
+        if option: hoster &= getConfigSet(option)
+        option = self.getConfig('excludeHoster').strip()
+        if option: hoster -= getConfigSet(option)
+        
+        return list(hoster)
\ No newline at end of file
diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py
index 9598025ec..bf058b613 100644
--- a/module/plugins/hoster/CrockoCom.py
+++ b/module/plugins/hoster/CrockoCom.py
@@ -9,12 +9,13 @@ class CrockoCom(SimpleHoster):
     __name__ = "CrockoCom"
     __type__ = "hoster"
     __pattern__ = r"http://(www\.)?(crocko|easy-share).com/.*"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __description__ = """Crocko Download Hoster"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
-    FILE_INFO_PATTERN = r'<strong>(?P<N>.*)\s*<span class="tip1"><span class="inner">(?P<S>[0-9,.]+) (?P<U>[kKMG])i?B</span></span>'
+    FILE_NAME_PATTERN = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)'
+    FILE_NAME_PATTERN = r'<span class="tip1"><span class="inner">(?P<S>[^<]+)</span></span>'
     FILE_OFFLINE_PATTERN = r"<h1>Sorry,<br />the page you're looking for <br />isn't here.</h1>"
     DOWNLOAD_URL_PATTERN = r"window.location ='([^']+)';"
     CAPTCHA_URL_PATTERN = re.compile(r"u='(/file_contents/captcha/\w+)';\s*w='(\d+)';")
diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index 5858dd935..3ee2e9ba5 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -18,12 +18,13 @@
 
 import re
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from random import random
 
 class EasybytezCom(SimpleHoster):
     __name__ = "EasybytezCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?easybytez.com/(\w+).*"
-    __version__ = "0.01"
+    __version__ = "0.04"
     __description__ = """easybytez.com"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -32,29 +33,112 @@ class EasybytezCom(SimpleHoster):
 
     FILE_NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>[^"]+)"'
     FILE_SIZE_PATTERN = r'You have requested <font color="red">[^<]+</font> \((?P<S>[^<]+)\)</font>'
+    FILE_INFO_PATTERN = r'<tr><td align=right><b>Filename:</b></td><td nowrap>(?P<N>[^<]+)</td></tr>\s*.*?<small>\((?P<S>[^<]+)\)</small>'    
     FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>'
     
-    FORM_INPUT_PATTERN = r'<input[^>]* name="([^"]+)" value="([^"]*)">'
+    FORM_INPUT_PATTERN = r'<input[^>]* name="([^"]+)"[^>]*value="([^"]*)"'
     WAIT_PATTERN = r'<span id="countdown_str">[^>]*>(\d+)</span> seconds</span>'
+    DIRECT_LINK_PATTERN = r'(http://\w+\.easybytez\.com/files/\d+/\w+/[^"<]+)'
 
+    FORM_PATTERN = r'<form name=["\']?%s[^>]*action=["\']?([^"\' ]+)(.*?)</form>'
+    OVR_DOWNLOAD_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
+    OVR_KILL_LINK_PATTERN = r'<h2>Delete Link</h2>\s*<textarea[^>]*>([^<]+)'
+    TEXTAREA_PATTERN = r"<textarea name='([^']+)'>([^<]+)</textarea>"
+    
+    HOSTER_URL = "www.easybytez.com" 
+
+    def process(self, pyfile):
+        if not re.match(self.__pattern__, self.pyfile.url):
+            if self.premium:
+                self.handleOverriden()
+            else:
+                self.fail("Only premium users can download from other hosters with %s" % self.HOSTER_URL)
+        else:            
+            self.html = self.load(pyfile.url, cookies = False, decode = True)
+            self.file_info = self.getFileInfo()
+            
+            header = self.load(self.pyfile.url, just_header = True, cookies = True)
+            self.logDebug(header)            
+            
+            if 'location' in header and re.match(self.DIRECT_LINK_PATTERN, header['location']):
+                self.downloadLink(header['location'])
+            elif self.premium:
+                self.handlePremium()
+            else:
+                self.handleFree()
+    
     def handleFree(self):
         self.download(self.pyfile.url, post = self.getPostParameters(), ref = True, cookies = True)
+    
+    def handlePremium(self):
+        self.html = self.load(self.pyfile.url, post = self.getPostParameters(premium=True))
+        found = re.search(self.DIRECT_LINK_PATTERN, self.html)
+        if not found: self.parseError('DIRECT LINK')
+        self.downloadLink(found.group(1))
+    
+    def handleOverriden(self):
+        self.html = self.load(self.HOSTER_URL)
+        action, form = re.search(self.FORM_PATTERN % "url", self.html, re.DOTALL).groups()
+        inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form))
+        upload_id = "%012d" % int(random()*10**12)
+        action += upload_id + "&js_on=1&utype=prem&upload_type=url"  
+        inputs['tos'] = '1'
+        inputs['url_mass'] = self.pyfile.url
+        inputs['up1oad_type'] = 'url'      
+        
+        self.logDebug(action, inputs)
+        self.html = self.load(action, post = inputs)
         
-    def getPostParameters(self):
+        found = re.search(self.FORM_PATTERN % "F1", self.html, re.S | re.I)
+        if not found:
+            self.logDebug(self.html)
+            self.fail("upload failed")
+        action, form = found.groups()
+                        
+        inputs = dict(re.findall(self.TEXTAREA_PATTERN, form))
+        if not inputs: parseError('TEXTAREA')
+        self.logDebug(inputs) 
+        if inputs['st'] == 'OK':
+            self.html = self.load(action, post = inputs)
+        else:
+            self.fail(inputs['st'])
+        
+        found = re.search(self.OVR_DOWNLOAD_LINK_PATTERN, self.html)
+        if not found: self.parseError('DIRECT LINK (OVR)')
+        self.pyfile.url = found.group(1)
+        self.retry()
+        
+    def downloadLink(self, link):           
+        self.logDebug('DIRECT LINK: %s' % link) 
+        self.download(link)  
+                
+    def getPostParameters(self, premium=False):
         inputs = dict(re.findall(self.FORM_INPUT_PATTERN, self.html))
         self.logDebug(inputs)
-        inputs['method_free'] = "Free Download"
+        
+        if 'op' in inputs and inputs['op'] == 'download2': return inputs
+        
         inputs['referer'] = self.pyfile.url
-        if 'method_premium' in inputs: del inputs['method_premium'] 
+        
+        if premium:
+            inputs['method_premium'] = "Premium Download"       
+            if 'method_free' in inputs: del inputs['method_free'] 
+        else:
+            inputs['method_free'] = "Free Download"       
+            if 'method_premium' in inputs: del inputs['method_premium'] 
 
         self.html = self.load(self.pyfile.url, post = inputs, ref = True, cookies = True)
         inputs = dict(re.findall(self.FORM_INPUT_PATTERN, self.html))
         self.logDebug(inputs)
         
-        found = re.search(self.WAIT_PATTERN, self.html)
-        self.setWait(int(found.group(1)) + 1 if found else 60)
-        self.wait()
+        if not premium:
+            found = re.search(self.WAIT_PATTERN, self.html)
+            self.setWait(int(found.group(1)) + 1 if found else 60)
+            self.wait()
         
         return inputs
+    
+    def urlParseFileName(self):
+        return html_unescape(urlparse(self.pyfile.url).path.split("/")[-1])
 
 getInfo = create_getInfo(EasybytezCom)
\ No newline at end of file
diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index 736b5b96b..6094859ef 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -28,7 +28,7 @@ def getInfo(urls):
             response = json_loads(getURL(check_url, decode=True))
             for item in response["FSApi_Link"]["getInfo"]["response"]["links"]:
                 if item["status"] != "AVAILABLE":
-                    result.append((ids[str(item["id"])], 0, 1, ids[str(item["id"])]))
+                    result.append((None, 0, 1, ids[str(item["id"])]))
                 else:
                     result.append((item["filename"], item["size"], 2, ids[str(item["id"])]))
         yield result
@@ -45,7 +45,7 @@ def getId(url):
 class FilesonicCom(Hoster):
     __name__ = "FilesonicCom"
     __type__ = "hoster"
-    __pattern__ = r"http://[\w\.]*?(sharingmatrix|filesonic)\..*?/.*?file/([a-zA-Z0-9]+(/.+)?|[a-z0-9]+/[0-9]+(/.+)?|[0-9]+(/.+)?)"
+    __pattern__ = r"http://[\w\.]*?(sharingmatrix|filesonic)\..*?/file/(([a-z][0-9]+/)?[a-zA-Z0-9\-._+]+)(/.*)?"
     __version__ = "0.34"
     __description__ = """FilesonicCom und Sharingmatrix Download Hoster"""
     __author_name__ = ("jeix", "paulking")
@@ -54,7 +54,7 @@ class FilesonicCom(Hoster):
     API_ADDRESS = "http://api.filesonic.com"
     URL_DOMAIN_PATTERN = r'(?P<prefix>.*?)(?P<domain>.(filesonic|sharingmatrix)\..+?)(?P<suffix>/.*)'
     FILE_ID_PATTERN = r'/file/(?P<id>([a-z][0-9]+/)?[a-zA-Z0-9\-._+]+)(/.*)?' #change may break wupload - be careful
-    FILE_LINK_PATTERN = r'<a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)" class="downloadLink"><span>Start Download'
+    FILE_LINK_PATTERN = r'<p><a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)"><span>Start download'
     WAIT_TIME_PATTERN = r'countDownDelay = (?P<wait>\d+)'
     WAIT_TM_PATTERN = r"name='tm' value='(.*?)' />"
     WAIT_TM_HASH_PATTERN = r"name='tm_hash' value='(.*?)' />"
diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py
index 484b48ba6..14180ff3d 100644
--- a/module/plugins/hoster/MediafireCom.py
+++ b/module/plugins/hoster/MediafireCom.py
@@ -58,20 +58,20 @@ class MediafireCom(SimpleHoster):
     __name__ = "MediafireCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)*mediafire\.com/[^?].*"
-    __version__ = "0.70"
+    __version__ = "0.71"
     __description__ = """Mediafire.com plugin - free only"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
     DOWNLOAD_LINK_PATTERN = r'<div class="download_link"[^>]*z-index:(?P<zindex>\d+)[^>]*>\s*<a href="(?P<href>[^"]+)"'
-    JS_KEY_PATTERN = r"DoShow\('mfpromo1'\);\s*((\w+)='';.*?)eval\(\2\);"
+    JS_KEY_PATTERN = r"DoShow\('mfpromo1'\);[^{]*{((\w+)='';.*?)eval\(\2\);"
     JS_ZMODULO_PATTERN = r"\('z-index'\)\) \% (\d+)\)\);" 
     RECAPTCHA_PATTERN = r'src="http://(?:api.recaptcha.net|www.google.com/recaptcha/api)/challenge\?k=([^"]+)">'
     PAGE1_ACTION_PATTERN = r'<link rel="canonical" href="([^"]+)"/>'
     PASSWORD_PATTERN = r";break;}\s*dh\('"
 
     FILE_NAME_PATTERN = r'<META NAME="description" CONTENT="(?P<N>[^"]+)"/>'
-    FILE_SIZE_PATTERN = r'>Download <span>\((?P<S>[0-9.]+) (?P<U>[kKMG])i?B">\)</span>'
+    FILE_SIZE_PATTERN = r'>Download\s*<span>\((?P<S>[^)]+)\)</span>'
     FILE_OFFLINE_PATTERN = r'class="error_msg_title"> Invalid or Deleted File. </div>'
 
     def process(self, pyfile):
-- 
cgit v1.2.3


From ee844b877a82487b0c90f2ed3955a7455438e3c2 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Thu, 5 Jan 2012 09:35:01 +0100
Subject: revert fso

---
 module/plugins/hoster/FilesonicCom.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index 6094859ef..736b5b96b 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -28,7 +28,7 @@ def getInfo(urls):
             response = json_loads(getURL(check_url, decode=True))
             for item in response["FSApi_Link"]["getInfo"]["response"]["links"]:
                 if item["status"] != "AVAILABLE":
-                    result.append((None, 0, 1, ids[str(item["id"])]))
+                    result.append((ids[str(item["id"])], 0, 1, ids[str(item["id"])]))
                 else:
                     result.append((item["filename"], item["size"], 2, ids[str(item["id"])]))
         yield result
@@ -45,7 +45,7 @@ def getId(url):
 class FilesonicCom(Hoster):
     __name__ = "FilesonicCom"
     __type__ = "hoster"
-    __pattern__ = r"http://[\w\.]*?(sharingmatrix|filesonic)\..*?/file/(([a-z][0-9]+/)?[a-zA-Z0-9\-._+]+)(/.*)?"
+    __pattern__ = r"http://[\w\.]*?(sharingmatrix|filesonic)\..*?/.*?file/([a-zA-Z0-9]+(/.+)?|[a-z0-9]+/[0-9]+(/.+)?|[0-9]+(/.+)?)"
     __version__ = "0.34"
     __description__ = """FilesonicCom und Sharingmatrix Download Hoster"""
     __author_name__ = ("jeix", "paulking")
@@ -54,7 +54,7 @@ class FilesonicCom(Hoster):
     API_ADDRESS = "http://api.filesonic.com"
     URL_DOMAIN_PATTERN = r'(?P<prefix>.*?)(?P<domain>.(filesonic|sharingmatrix)\..+?)(?P<suffix>/.*)'
     FILE_ID_PATTERN = r'/file/(?P<id>([a-z][0-9]+/)?[a-zA-Z0-9\-._+]+)(/.*)?' #change may break wupload - be careful
-    FILE_LINK_PATTERN = r'<p><a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)"><span>Start download'
+    FILE_LINK_PATTERN = r'<a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)" class="downloadLink"><span>Start Download'
     WAIT_TIME_PATTERN = r'countDownDelay = (?P<wait>\d+)'
     WAIT_TM_PATTERN = r"name='tm' value='(.*?)' />"
     WAIT_TM_HASH_PATTERN = r"name='tm_hash' value='(.*?)' />"
-- 
cgit v1.2.3


From a65f5b27948da38a1c725be5c8cb0d7844788319 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Thu, 5 Jan 2012 18:03:04 +0100
Subject: fix hotfile, 4shared

---
 module/plugins/hoster/FourSharedCom.py | 4 ++--
 module/plugins/hoster/HotfileCom.py    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/FourSharedCom.py b/module/plugins/hoster/FourSharedCom.py
index b1cc252e2..2b27eed28 100644
--- a/module/plugins/hoster/FourSharedCom.py
+++ b/module/plugins/hoster/FourSharedCom.py
@@ -8,7 +8,7 @@ class FourSharedCom(SimpleHoster):
     __name__ = "FourSharedCom"
     __type__ = "hoster"
     __pattern__ = r"http://[\w\.]*?4shared(-china)?\.com/(account/)?(download|get|file|document|photo|video|audio)/.+?/.*"
-    __version__ = "0.24"
+    __version__ = "0.25"
     __description__ = """4Shared Download Hoster"""
     __author_name__ = ("jeix", "zoidberg")
     __author_mail__ = ("jeix@hasnomail.de", "zoidberg@mujmail.cz")
@@ -19,7 +19,7 @@ class FourSharedCom(SimpleHoster):
     FILE_NAME_REPLACEMENTS = [(r"&#(\d+).", lambda m: unichr(int(m.group(1))))]
     
     DOWNLOAD_BUTTON_PATTERN = '<a href="([^"]+)"\s*class="dbtn'
-    DOWNLOAD_URL_PATTERN = "<div class=\"(?:dl|xxlarge bold)\">\s*<a href='([^']+)'"
+    DOWNLOAD_URL_PATTERN = r"<a class=\"linkShowD3\" href='([^']+)'>Download file now</a>"
 
     def handleFree(self):
         found = re.search(self.DOWNLOAD_BUTTON_PATTERN, self.html)
diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
index 9c056d899..1447e7c9e 100644
--- a/module/plugins/hoster/HotfileCom.py
+++ b/module/plugins/hoster/HotfileCom.py
@@ -32,7 +32,7 @@ class HotfileCom(Hoster):
     __name__ = "HotfileCom"
     __type__ = "hoster"
     __pattern__ = r"http://(www.)?hotfile\.com/dl/\d+/[0-9a-zA-Z]+/"
-    __version__ = "0.31"
+    __version__ = "0.32"
     __description__ = """Hotfile.com Download Hoster"""
     __author_name__ = ("sitacuisses","spoob","mkaay")
     __author_mail__ = ("sitacuisses@yhoo.de","spoob@pyload.org","mkaay@mkaay.de")
@@ -57,7 +57,7 @@ class HotfileCom(Hoster):
         elif self.account and login:
             return self.account.apiCall(method, post, self.user)
         post.update({"action": method})
-        return self.load("http://api.hotfile.com/", post=post)
+        return self.load("http://api.hotfile.com/", post=post, decode=True)
         
     def process(self, pyfile):
         self.wantReconnect = False
@@ -100,7 +100,7 @@ class HotfileCom(Hoster):
             self.fail("Form not found in HTML. Can not proceed.")
 
         form_content = form_content.group(0)
-        form_posts = re.findall(r"<input\stype=hidden\sname=(\S*)\svalue=(\S*)>", form_content)
+        form_posts = dict(re.findall(r"<input\stype=hidden\sname=(\S*)\svalue=(\S*)>", form_content))
         
         self.html[1] = self.load(self.pyfile.url, post=form_posts)
 
-- 
cgit v1.2.3


From 25c169d8a6029a54cd86fcb125dbf2a5d1cd5f9a Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Fri, 6 Jan 2012 14:39:30 +0100
Subject: update letitbit.net

---
 module/plugins/hoster/LetitbitNet.py    | 64 ++++++++++++++++-----------------
 module/plugins/internal/SimpleHoster.py | 30 ++++++++++++----
 2 files changed, 55 insertions(+), 39 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py
index 8ac4b8f7f..4ff2b9750 100644
--- a/module/plugins/hoster/LetitbitNet.py
+++ b/module/plugins/hoster/LetitbitNet.py
@@ -17,56 +17,41 @@
 """
 
 import re
+from random import random
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 class LetitbitNet(SimpleHoster):
     __name__ = "LetitbitNet"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)*letitbit.net/download/.*"
-    __version__ = "0.12"
+    __version__ = "0.13"
     __description__ = """letitbit.net"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
-    FORM_PATTERN = r'<form%s action="([^"]+)" method="post"%s>(.*?)</form>'
-    FORM_INPUT_PATTERN = r'<input[^>]* name="([^"]+)" value="([^"]+)" />'
-    CHECK_URL_PATTERN = r"ajax_check_url\s*=\s*'([^']+)';"
+    CHECK_URL_PATTERN = r"ajax_check_url\s*=\s*'((http://[^/]+)[^']+)';"
     SECONDS_PATTERN = r"seconds\s*=\s*(\d+);"
     
-    FILE_INFO_PATTERN = r'<h1[^>]*>File: <a[^>]*><span>(?P<N>[^<]+)</span></a> [<span>(?P<S>[0-9.]+)\s*(?P<U>[kKMG])i?[Bb]</span>]</h1>'
+    FILE_INFO_PATTERN = r'<h1[^>]*>File: <a[^>]*><span>(?P<N>[^<]+)</span></a>\s*\[<span>(?P<S>[^<]+)</span>]</h1>'
     FILE_OFFLINE_PATTERN = r'<div id="download_content" class="hide-block">[^<]*<br>File not found<br /></div>'
 
-    def setup(self):
-        self.resumeDownload = self.multiDL = True if self.account else False
-        self.chunkLimit = 1
+    def handleFree(self):
+        action, inputs = self.parseHtmlForm('id="ifree_form"')
+        if not action: self.parseError("page 1 / ifree_form")
+        self.pyfile.size = float(inputs['sssize'])
+        #self.logDebug(action, inputs)
+        inputs['desc'] = ""
 
-    def process(self, pyfile):
-        self.html = self.load(pyfile.url, decode=True)
-        if re.search(self.FILE_OFFLINE_PATTERN, self.html): self.offline()
+        self.html = self.load("http://letitbit.net" + action, post = inputs, cookies = True)
 
-        try:
-            action, form = re.search(self.FORM_PATTERN % (' id="ifree_form"', ''), self.html, re.DOTALL).groups()
-            inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form))
-            pyfile.name = inputs['name']
-            pyfile.size = float(inputs['sssize'])/1024
-        except Exception, e:
-            self.logError(e)
-            self.parseError("page 1 / ifree_form")
+        action, inputs = self.parseHtmlForm('id="d3_form"')
+        if not action: self.parseError("page 2 / d3_form")
+        #self.logDebug(action, inputs)
 
-        #self.logDebug(inputs)
-        inputs['desc'] = ""
-        self.html = self.load("http://letitbit.net" + action, post = inputs)
-
-        try:
-            action, form = re.search(self.FORM_PATTERN % ('', ' id="d3_form"'), self.html, re.DOTALL).groups()
-            inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form))
-        except Exception, e:
-            self.logError(e)
-            self.parseError("page 2 / d3_form")
+        self.html = self.load(action, post = inputs, cookies = True)
 
-        self.html = self.load(action, post = inputs)
         try:
-            ajax_check_url = re.search(self.CHECK_URL_PATTERN, self.html).group(1)
+            ajax_check_url, captcha_url = re.search(self.CHECK_URL_PATTERN, self.html).groups()
             found = re.search(self.SECONDS_PATTERN, self.html)
             seconds = int(found.group(1)) if found else 60
             self.setWait(seconds+1)
@@ -75,7 +60,22 @@ class LetitbitNet(SimpleHoster):
             self.logError(e)
             self.parseError("page 3 / js")
 
-        download_url = self.load(ajax_check_url, post = inputs)
+        response = self.load(ajax_check_url, post = inputs, cookies = True)
+        if response != '1': self.fail('Unknown response (ajax_check_url)')
+        
+        for i in range(5):
+            captcha = self.decryptCaptcha('%s/captcha_new.php?rand=%d' % (captcha_url, random() * 100000), cookies = True)
+            response = self.load(captcha_url + '/ajax/check_captcha.php', post = {"code": captcha}, cookies = True)
+            self.logDebug(response)
+            if response.startswith('http://'):
+                download_url = response
+                self.correctCaptcha()
+                break
+            else:
+                self.invalidCaptcha()
+        else:
+            self.fail("No valid captcha solution received")
+        
         self.download(download_url)
 
 getInfo = create_getInfo(LetitbitNet)
\ No newline at end of file
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index aae76e781..d4d74057e 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -17,7 +17,7 @@
     @author: zoidberg
 """
 from urlparse import urlparse
-from re import search, sub
+import re
 
 from module.plugins.Hoster import Hoster
 from module.utils import html_unescape, parseFileSize
@@ -26,21 +26,25 @@ from module.network.RequestFactory import getURL
 def reSub(string, ruleslist):
     for r in ruleslist:
         rf, rt = r
-        string = sub(rf, rt, string)
+        string = re.sub(rf, rt, string)
     return string
+    
+def parseHtmlTagAttrValue(attr_name, tag):
+        m = re.search(r"%s\s*=\s*([\"']?)((?<=\")[^\"]+|(?<=')[^']+|[^\s\"'][^>\s]+)\1" % attr_name, tag)   
+        return m.group(2) if m else ''
 
 def parseFileInfo(self, url = '', html = '', infomode = False):
     if not html and hasattr(self, "html"): html = self.html
     info = {"name" : url, "size" : 0, "status" : 3}
     online = False
 
-    if hasattr(self, "FILE_OFFLINE_PATTERN") and search(self.FILE_OFFLINE_PATTERN, html):
+    if hasattr(self, "FILE_OFFLINE_PATTERN") and re.search(self.FILE_OFFLINE_PATTERN, html):
         # File offline
         info['status'] = 1
     else:
         for pattern in ("FILE_INFO_PATTERN", "FILE_NAME_PATTERN", "FILE_SIZE_PATTERN"):
             try:
-                info = dict(info, **search(getattr(self, pattern), html).groupdict())
+                info = dict(info, **re.search(getattr(self, pattern), html).groupdict())
                 online = True
             except AttributeError:
                 continue
@@ -77,7 +81,7 @@ class PluginParseError(Exception):
 
 class SimpleHoster(Hoster):
     __name__ = "SimpleHoster"
-    __version__ = "0.14"
+    __version__ = "0.15"
     __pattern__ = None
     __type__ = "hoster"
     __description__ = """Base hoster plugin"""
@@ -110,7 +114,7 @@ class SimpleHoster(Hoster):
 
     def getFileInfo(self):
         self.logDebug("URL: %s" % self.pyfile.url)
-        if hasattr(self, "TEMP_OFFLINE_PATTERN") and search(self.TEMP_OFFLINE_PATTERN, self.html):
+        if hasattr(self, "TEMP_OFFLINE_PATTERN") and re.search(self.TEMP_OFFLINE_PATTERN, self.html):
             self.tempOffline()
 
         file_info = parseFileInfo(self, infomode = True)
@@ -140,4 +144,16 @@ class SimpleHoster(Hoster):
         self.fail("Premium download not implemented")
 
     def parseError(self, msg):
-        raise PluginParseError(msg)
\ No newline at end of file
+        raise PluginParseError(msg)   
+
+    def parseHtmlForm(self, attr_str):
+        inputs = {}
+        action = None 
+        form = re.search(r"(?P<tag><form[^>]*%s[^>]*>)(?P<content>.*?)</form[^>]*>" % attr_str, self.html, re.S)
+        if form:
+            action = parseHtmlTagAttrValue("action", form.group('tag'))
+            for input in re.finditer(r'(<(?:input|textarea)[^>]*>)', form.group('content')):
+                name = parseHtmlTagAttrValue("name", input.group(1))
+                if name:
+                    inputs[name] = parseHtmlTagAttrValue("value", input.group(1)) 
+        return action, inputs
\ No newline at end of file
-- 
cgit v1.2.3


From 6c653c5eb10a4b77f2e63ad1e745ba612a46ae03 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Sun, 8 Jan 2012 10:48:53 +0100
Subject: add premium4.me

---
 module/plugins/accounts/Premium4Me.py | 23 ++++++++++++++++++
 module/plugins/hooks/Premium4Me.py    | 46 +++++++++++++++++++++++++++++++++++
 module/plugins/hoster/Premium4Me.py   | 32 ++++++++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 module/plugins/accounts/Premium4Me.py
 create mode 100644 module/plugins/hooks/Premium4Me.py
 create mode 100644 module/plugins/hoster/Premium4Me.py

(limited to 'module')

diff --git a/module/plugins/accounts/Premium4Me.py b/module/plugins/accounts/Premium4Me.py
new file mode 100644
index 000000000..c8c4064ef
--- /dev/null
+++ b/module/plugins/accounts/Premium4Me.py
@@ -0,0 +1,23 @@
+from module.plugins.Account import Account
+
+class Premium4Me(Account):
+    __name__ = "Premium4Me"
+    __version__ = "0.01"
+    __type__ = "account"
+    __description__ = """Premium4.me account plugin"""
+    __author_name__ = ("RaNaN", "zoidberg")
+    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+
+    def loadAccountInfo(self, user, req):
+        traffic = req.load("http://premium4.me/api/traffic.php?authcode=%s" % self.authcode)
+
+        account_info = {"trafficleft": int(traffic) / 1024,
+                        "validuntil": -1}
+
+        return account_info
+
+    def login(self, user, data, req):
+        self.authcode = req.load("http://premium4.me/api/getauthcode.php?username=%s&password=%s" % (user, data["password"]))[:-1]
+
+        if "wrong username" in self.authcode:
+            self.wrongPassword()
\ No newline at end of file
diff --git a/module/plugins/hooks/Premium4Me.py b/module/plugins/hooks/Premium4Me.py
new file mode 100644
index 000000000..fc3ce2343
--- /dev/null
+++ b/module/plugins/hooks/Premium4Me.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+
+from module.network.RequestFactory import getURL
+from module.plugins.internal.MultiHoster import MultiHoster
+
+class Premium4Me(MultiHoster):
+    __name__ = "Premium4Me"
+    __version__ = "0.02"
+    __type__ = "hook"
+
+    __config__ = [("activated", "bool", "Activated", "False"),
+        ("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"),
+        ("hosterList", "str", "Hoster list (comma separated)", "")]
+    __description__ = """premium4.me hook plugin"""
+    __author_name__ = ("RaNaN", "zoidberg")
+    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+
+    replacements = [("freakshare.net", "freakshare.com")]
+
+    def getHoster(self):
+
+        page = getURL("http://premium4.me/api/hosters.php?authcode=%s" % self.account.authcode)
+        hosters = set([x.strip() for x in page.replace("\"", "").split(";")])
+        
+        configMode = self.getConfig('hosterListMode')
+        if configMode in ("listed", "unlisted"):
+            configList = set(self.getConfig('hosterList').strip().lower().replace(',','|').split('|'))
+            configList.discard(u'')
+            if configMode == "listed":
+                hosters &= configList
+            elif configMode == "unlisted":
+                hosters -= configList
+        
+        return list(hosters)
+
+    def coreReady(self):
+
+        self.account = self.core.accountManager.getAccountPlugin("Premium4Me")
+
+        user = self.account.selectAccount()[0]
+
+        if not user:
+            self.logError(_("Please add your premium4.me account first and restart pyLoad"))
+            return
+
+        return MultiHoster.coreReady(self)
\ No newline at end of file
diff --git a/module/plugins/hoster/Premium4Me.py b/module/plugins/hoster/Premium4Me.py
new file mode 100644
index 000000000..1d97e21b1
--- /dev/null
+++ b/module/plugins/hoster/Premium4Me.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from urllib import quote
+from module.plugins.Hoster import Hoster
+
+class Premium4Me(Hoster):
+    __name__ = "Premium4Me"
+    __version__ = "0.01"
+    __type__ = "hoster"
+
+    __pattern__ = r"http://premium4.me/.*"
+    __description__ = """premium4.me hoster plugin"""
+    __author_name__ = ("RaNaN", "zoidberg")
+    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+
+    def setup(self):
+        self.chunkLimit = 3
+        self.resumeDownload = True
+
+    def process(self, pyfile):
+        if not self.account:
+            self.logError(_("Please enter your premium4.me account or deactivate this plugin"))
+            self.fail("No premium4.me account provided")
+
+        self.log.debug("premium4.me: Old URL: %s" % pyfile.url)
+        new_url = "http://premium4.me/api/getfile.php?authcode=%s&link=%s" % (self.account.authcode, quote(pyfile.url, ""))
+
+        #raise timeout to 2min
+        self.req.setOption("timeout", 120)
+
+        self.download(new_url, disposition=True)
\ No newline at end of file
-- 
cgit v1.2.3


From 10a945f94ddf44486f8d876aa355ba75cb8b7d46 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Tue, 10 Jan 2012 02:01:53 +0100
Subject: closed #491 mf, fix mu password

---
 module/plugins/hoster/MediafireCom.py  | 50 ++++++++++++++++++++--------------
 module/plugins/hoster/MegauploadCom.py |  4 +--
 2 files changed, 32 insertions(+), 22 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py
index 14180ff3d..f970512ab 100644
--- a/module/plugins/hoster/MediafireCom.py
+++ b/module/plugins/hoster/MediafireCom.py
@@ -58,12 +58,12 @@ class MediafireCom(SimpleHoster):
     __name__ = "MediafireCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)*mediafire\.com/[^?].*"
-    __version__ = "0.71"
+    __version__ = "0.72"
     __description__ = """Mediafire.com plugin - free only"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
-    DOWNLOAD_LINK_PATTERN = r'<div class="download_link"[^>]*z-index:(?P<zindex>\d+)[^>]*>\s*<a href="(?P<href>[^"]+)"'
+    DOWNLOAD_LINK_PATTERN = r'<div class="download_link"[^>]*(?:z-index:(?P<zindex>\d+))?[^>]*>\s*<a href="(?P<href>http://[^"]+)"'
     JS_KEY_PATTERN = r"DoShow\('mfpromo1'\);[^{]*{((\w+)='';.*?)eval\(\2\);"
     JS_ZMODULO_PATTERN = r"\('z-index'\)\) \% (\d+)\)\);" 
     RECAPTCHA_PATTERN = r'src="http://(?:api.recaptcha.net|www.google.com/recaptcha/api)/challenge\?k=([^"]+)">'
@@ -101,25 +101,35 @@ class MediafireCom(SimpleHoster):
             else:
                 self.fail("No or incorrect password")
         
-        found = re.search(self.JS_KEY_PATTERN, self.html)
-        try:
-            result = self.js.eval(found.group(1))
-            zmodulo = int(re.search(self.JS_ZMODULO_PATTERN, result).group(1))
-            self.logDebug("ZMODULO: %d" % zmodulo)
-        except Exception, e:
-            self.logDebug(e)                                       
-            self.retry(3, 0, "Parse error (MODULO)")
+        links = re.findall(self.DOWNLOAD_LINK_PATTERN, self.html)
+        link_count = len(links)
+        self.logDebug('LINKS ', links)
         
-        vlink = {'zindex': 0, 'href': ''}
-        for found in re.finditer(self.DOWNLOAD_LINK_PATTERN, self.html):
-            dlink = found.groupdict()
-            #self.logDebug(dlink)
-            dlink['zindex'] = int(dlink['zindex']) % zmodulo
-            if dlink['zindex'] >= vlink['zindex']:
-                vlink = dlink
-                
-        self.logDebug("DOWNLOAD LINK:", vlink)
-        self.download(vlink['href'])
+        if link_count == 0:
+            self.retry(3, 0, "No links found")
+            
+        elif link_count > 1:
+            found = re.search(self.JS_KEY_PATTERN, self.html)
+            try:
+                result = self.js.eval(found.group(1))
+                zmodulo = int(re.search(self.JS_ZMODULO_PATTERN, result).group(1))
+                self.logDebug("ZMODULO: %d" % zmodulo)
+            except Exception, e:
+                self.logDebug(e)                                       
+                self.parseError("ZMODULO")
+        
+            max_index = 0              
+            for index, url in links:
+                index = int(index) % zmodulo
+                if index >= max_index:
+                    download_url = url
+                    
+            self.logDebug("DOWNLOAD LINK:", download_url)
+            
+        else:
+            zindex, download_url = links[0]
+            
+        self.download(download_url)
 
     def checkCaptcha(self):
         for i in range(5):
diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index 6b5d10729..81d528668 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -65,7 +65,7 @@ class MegauploadCom(Hoster):
     __name__ = "MegauploadCom"
     __type__ = "hoster"
     __pattern__ = r"http://[\w\.]*?(megaupload)\.com/.*?(\?|&)d=(?P<id>[0-9A-Za-z]+)"
-    __version__ = "0.3"
+    __version__ = "0.31"
     __description__ = """Megaupload.com Download Hoster"""
     __author_name__ = ("spoob")
     __author_mail__ = ("spoob@pyload.org")
@@ -172,7 +172,7 @@ class MegauploadCom(Hoster):
             if "The file that you're trying to download is larger than 1 GB" in self.html[0]:
                 self.fail(_("You need premium to download files larger than 1 GB"))
                 
-            if r'Please enter the password below' in self.html[0]:
+            if re.search(r'<input[^>]*name="filepassword"', self.html[0]):
                 pw = self.getPassword()
                 if not pw:
                     self.fail(_("The file is password protected, enter a password and restart."))
-- 
cgit v1.2.3


From 526cce7300f6a529f8aaf6a0deef276facd0c000 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 10 Jan 2012 18:52:27 +0100
Subject: real-debrid fix

---
 module/plugins/hoster/RealdebridCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py
index 62c09aaa8..4aed32614 100644
--- a/module/plugins/hoster/RealdebridCom.py
+++ b/module/plugins/hoster/RealdebridCom.py
@@ -9,7 +9,7 @@ from module.plugins.Hoster import Hoster
 
 class RealdebridCom(Hoster):
     __name__ = "RealdebridCom"
-    __version__ = "0.41"
+    __version__ = "0.42"
     __type__ = "hoster"
 
     __pattern__ = r"https?://.*real-debrid\..*"
@@ -45,7 +45,7 @@ class RealdebridCom(Hoster):
             if not password: password = ""
             else: password = password[0]
             
-            url = "http://real-debrid.com/ajax/deb.php?lang=en&sl=1&link=%s&passwort=%s" % (quote(pyfile.url, ""), password)
+            url = "http://real-debrid.com/lib/ajax/generator.php?lang=en&sl=1&link=%s&passwort=%s" % (quote(pyfile.url, ""), password)
             page = self.load(url)
 
             error = re.search(r'<span id="generation-error">(.*)</span>', page)
-- 
cgit v1.2.3


From 5d13b86474afeb0e8775206308dd72d93adef5d2 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Wed, 11 Jan 2012 02:03:52 +0100
Subject: fix filepost, mediafire closed #495

---
 module/plugins/hoster/FilepostCom.py  | 105 ++++++++++++++++++++++------------
 module/plugins/hoster/MediafireCom.py |  11 ++--
 2 files changed, 74 insertions(+), 42 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py
index 42ec0788b..d12fad738 100644
--- a/module/plugins/hoster/FilepostCom.py
+++ b/module/plugins/hoster/FilepostCom.py
@@ -18,7 +18,6 @@
 
 import re
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.network.RequestFactory import getURL
 from module.plugins.ReCaptcha import ReCaptcha
 from module.common.json_layer import json_loads
 from time import time
@@ -26,16 +25,17 @@ from time import time
 class FilepostCom(SimpleHoster):
     __name__ = "FilepostCom"
     __type__ = "hoster"
-    __pattern__ = r"https?://(?:www\.)?filepost\.com/files/([^/]+).*"
-    __version__ = "0.23"
+    __pattern__ = r"https?://(?:www\.)?(?:filepost\.com/files|fp.io)/([^/]+).*"
+    __version__ = "0.25"
     __description__ = """Filepost.com plugin - free only"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
-    FILE_INFO_PATTERN = r'<h1>(?P<N>[^<]+)</h1>\s*<div class="ul">\s*<ul>\s*<li><span>Size:</span> (?P<S>[0-9.]+) (?P<U>[kKMG])i?B</li>'
+    FILE_INFO_PATTERN = r'<input type="text" id="url" value=\'<a href[^>]*>(?P<N>[^>]+?) - (?P<S>[0-9\.]+ [kKMG]i?B)</a>\' class="inp_text"/>'
+    #FILE_INFO_PATTERN = r'<h1>(?P<N>[^<]+)</h1>\s*<div class="ul">\s*<ul>\s*<li><span>Size:</span> (?P<S>[0-9.]+) (?P<U>[kKMG])i?B</li>'
     FILE_OFFLINE_PATTERN = r'class="error_msg_title"> Invalid or Deleted File. </div>'
     RECAPTCHA_KEY_PATTERN = r"Captcha.init\({\s*key:\s*'([^']+)'"
-    FLP_TOKEN_PATTERN = r"store.set\('(?:flp_)?token', '([^']+)'\);"
+    FLP_TOKEN_PATTERN = r"set_store_options\({token: '([^']+)'"
 
     def handleFree(self):
         # Find token and captcha key
@@ -49,42 +49,71 @@ class FilepostCom(SimpleHoster):
         if not found: self.parseError("Captcha key")
         captcha_key = found.group(1)
 
-        url = 'https://filepost.com/files/get/'
-
         # Get wait time
         get_dict = {'SID' : self.req.cj.getCookie('SID'), 'JsHttpRequest' : str(int(time()*10000)) + '-xml'}
-        post_dict = {'action' : 'set_download', 'download' : flp_token, 'code' : file_id}
-        json_response = json_loads(self.load(url, get = get_dict, post = post_dict))
-        self.logDebug(json_response)
-        try:
-            self.setWait(int(json_response['js']['answer']['wait_time']))
-        except Exception, e:
-            self.logError(e)
-            self.self.parseError("Wait time")
-        self.wait()
-
-        # Solve recaptcha
-        recaptcha = ReCaptcha(self)
-        for i in range(5):
-            captcha_challenge, captcha_response = recaptcha.challenge(captcha_key)
-            self.logDebug("RECAPTCHA: %s : %s : %s" % (captcha_key, captcha_challenge, captcha_response))
-
-            get_dict['JsHttpRequest'] = str(int(time()*10000)) + '-xml'
-            post_dict = {'download' : flp_token, 'code' : file_id,
-                "recaptcha_challenge_field" : captcha_challenge,
-                "recaptcha_response_field" : captcha_response
-                }
-
-            json_response = json_loads(self.load(url, get = get_dict, post = post_dict))
-            try:
-                download_url = json_response['js']['answer']['link']
-                self.correctCaptcha()
-                break
-            except:
-                self.invalidCaptcha()
-        else: self.fail("Invalid captcha")
+        post_dict = {'action' : 'set_download', 'token' : flp_token, 'code' : file_id}                    
+        wait_time = int(self.getJsonResponse(get_dict, post_dict, 'wait_time'))     
 
+        if wait_time > 0:
+            self.setWait(wait_time)
+            self.wait()                               
+        
+        post_dict = {"token" : flp_token, "code" : file_id, "file_pass" : ''}
+        
+        if 'var is_pass_exists = true;' in self.html:
+            # Solve password            
+            for file_pass in self.getPassword().splitlines():
+                get_dict['JsHttpRequest'] = str(int(time()*10000)) + '-xml'           
+                post_dict['file_pass'] = file_pass
+                self.logInfo("Password protected link, trying " + file_pass)                
+                                    
+                download_url = self.getJsonResponse(get_dict, post_dict, 'link')               
+                if download_url: 
+                    break
+                      
+            else: self.fail("No or incorrect password")         
+        
+        else:
+            # Solve recaptcha
+            recaptcha = ReCaptcha(self)
+            
+            for pokus in range(5):
+                get_dict['JsHttpRequest'] = str(int(time()*10000)) + '-xml'
+                if pokus:
+                    post_dict["recaptcha_challenge_field"], post_dict["captcha_response_field"] = recaptcha.challenge(captcha_key)
+                    self.logDebug(u"RECAPTCHA: %s : %s : %s" % (captcha_key, post_dict["recaptcha_challenge_field"], post_dict["captcha_response_field"]))                
+                 
+                download_url = self.getJsonResponse(get_dict, post_dict, 'link')
+                if download_url:
+                    if pokus: self.correctCaptcha()
+                    break
+                elif pokus:
+                    self.invalidCaptcha()
+                                
+            else: self.fail("Invalid captcha")
+        
         # Download
-        self.download(download_url)
+        self.download(download_url)       
+    
+    def getJsonResponse(self, get_dict, post_dict, field):     
+        json_response = json_loads(self.load('https://filepost.com/files/get/', get = get_dict, post = post_dict))
+        self.logDebug(json_response)
+        
+        if not 'js' in json_response: self.parseError('JSON %s 1' % field)       
+        
+        if 'error' in json_response['js']:
+            if json_response['js']['error'] == 'download_delay':
+                self.retry(js_answer['params']['next_download'])
+            elif 'Wrong file password' in json_response['js']['error']:
+                return None 
+            elif 'You entered a wrong CAPTCHA code' in json_response['js']['error']:
+                return None  
+            else:
+                self.fail(js_answer['error'])
+        
+        if not 'answer' in json_response['js'] or not field in json_response['js']['answer']: 
+            self.parseError('JSON %s 2' % field)
+            
+        return json_response['js']['answer'][field]
         
 getInfo = create_getInfo(FilepostCom)
\ No newline at end of file
diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py
index f970512ab..f40071478 100644
--- a/module/plugins/hoster/MediafireCom.py
+++ b/module/plugins/hoster/MediafireCom.py
@@ -58,7 +58,7 @@ class MediafireCom(SimpleHoster):
     __name__ = "MediafireCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)*mediafire\.com/[^?].*"
-    __version__ = "0.72"
+    __version__ = "0.73"
     __description__ = """Mediafire.com plugin - free only"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -68,11 +68,14 @@ class MediafireCom(SimpleHoster):
     JS_ZMODULO_PATTERN = r"\('z-index'\)\) \% (\d+)\)\);" 
     RECAPTCHA_PATTERN = r'src="http://(?:api.recaptcha.net|www.google.com/recaptcha/api)/challenge\?k=([^"]+)">'
     PAGE1_ACTION_PATTERN = r'<link rel="canonical" href="([^"]+)"/>'
-    PASSWORD_PATTERN = r";break;}\s*dh\('"
+    PASSWORD_PATTERN = r'<form name="form_password"'
 
     FILE_NAME_PATTERN = r'<META NAME="description" CONTENT="(?P<N>[^"]+)"/>'
     FILE_SIZE_PATTERN = r'>Download\s*<span>\((?P<S>[^)]+)\)</span>'
     FILE_OFFLINE_PATTERN = r'class="error_msg_title"> Invalid or Deleted File. </div>'
+    
+    def setup(self):
+        self.multiDL = True
 
     def process(self, pyfile):
         self.url, result = checkHTMLHeader(pyfile.url)
@@ -92,8 +95,8 @@ class MediafireCom(SimpleHoster):
             self.download(self.url, disposition = True)
 
     def handleFree(self):
-        passwords = self.getPassword().split()
-        while re.search(self.PASSWORD_PATTERN, self.html):
+        passwords = self.getPassword().splitlines()
+        while self.PASSWORD_PATTERN in self.html:
             if len(passwords):
                 password = passwords.pop(0)
                 self.logInfo("Password protected link, trying " + password)
-- 
cgit v1.2.3


From 8334d649654f03b66ac2f6c2bb6fe2f1883173ef Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Wed, 11 Jan 2012 16:26:04 +0100
Subject: uloz.to premium, update linkdecrypter.com

---
 module/plugins/accounts/UlozTo.py          |  34 +++++
 module/plugins/crypter/LinkdecrypterCom.py |  15 +--
 module/plugins/hoster/UlozTo.py            | 192 ++++++++++++++---------------
 3 files changed, 137 insertions(+), 104 deletions(-)
 create mode 100644 module/plugins/accounts/UlozTo.py

(limited to 'module')

diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
new file mode 100644
index 000000000..36e1ae342
--- /dev/null
+++ b/module/plugins/accounts/UlozTo.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.Account import Account
+import re
+
+class UlozTo(Account):
+    __name__ = "UlozTo"
+    __version__ = "0.01"
+    __type__ = "account"
+    __description__ = """uloz.to account plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")
+    
+    TRAFFIC_LEFT_PATTERN = r'<li class="credit"><a href="/kredit/" class="coins" title="[^"]* GB = ([^"]+) MB">'
+
+    def loadAccountInfo(self, user, req):
+        html = req.load("http://www.uloz.to/statistiky/", decode = True)
+                    
+        found = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+        trafficleft = int(float(found.group(1).replace(' ','').replace(',','.')) * 1000 / 1.024) if found else 0
+        self.premium = True if trafficleft else False 
+        
+        return {"validuntil": -1, "trafficleft": trafficleft}
+    
+    def login(self, user, data, req):
+        html = req.load('http://www.uloz.to/?do=authForm-submit', post = {
+            "login": "Přihlásit",
+            "password": data['password'],
+            "trvale": "on",
+            "username":	user
+            }, decode = True)
+        
+        if '<ul class="error">' in html:
+            self.wrongPassword()
\ No newline at end of file
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index c087c3518..93c08a5b2 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -23,7 +23,7 @@ class LinkdecrypterCom(Crypter):
     __name__ = "LinkdecrypterCom"
     __type__ = "crypter"
     __pattern__ = r"http://(\w*\.)?(10001mb\.com|123link\.it|1cl\.in|1kh\.de|1zh\.us|2joy\.de|2so\.be|3\.ly|5\.gp|6nc\.net|7li\.in|9\.bb|adf\.ly|adflav\.com|adfoc\.us|allanalpass\.com|alturl\.com|amy\.gs|any\.gs|apurl\.ru|aurl\.es|b23\.ru|baberepublic\.com|bat5\.com|bax\.li|beam\.to|bit\.ly|blu\.cc|c\.ly|capourl\.com|cc\.st|cd\.vg|cloneurl\.com|convertircodigo\.com|crypt-it\.com|crypt\.to|cryptlink\.ws|deb\.gs|digzip\.com|djurl\.com|dl-protect\.com|doiop\.com|ehe\.me|encript\.in|encurtador\.com|enlacs\.com|evg\.in|extreme-protect\.com|fa\.by|faja\.me|fapoff\.com|fdnlinks\.com|fea\.me|fff\.to|filedeck\.net|filemirrorupload\.com|fileupster\.com|flameupload\.com|freetexthost\.com|fwd4\.me|fyad\.org|goandgrab\.info|goblig\.com|goo\.gl|h-url\.in|hasurl\.co\.cc|hide-url\.net|hidemyass\.com|hides\.at|hideurl\.biz|ho\.io|hornywood\.tv|href\.hu|id2\.tryjav\.com|ilix\.in|ily\.me|ino\.me|interupload\.com|is\.gd|ivpaste\.com|j\.mp|je\.pl|jheberg\.com|just\.as|kickupload\.com|klnk\.de|knoffl\.com|kodo\.ameoto\.com|ks\.gs|latwy\.pl|link-go\.info|link-protector\.com|link-safe\.net|link4jo\.com|linkanonimo\.com|linkbabes\.com|linkbank\.eu|linkbee\.com|linkblur\.com|linkbucks\.com|linkcrypt\.com|linkcrypt\.ws|linkencrypter\.com|linkhide\.com\.ar|linkhide\.in|linkoculto\.net|linkok\.org|linkprivado\.com|linkprivate\.net|linkprotect\.in|links-protect\.com|links-protect\.info|links\.tc|linksafe\.me|linksaver\.info|linkse\.info|linkseguro\.com\.ar|linkseguro\.org|linksole\.com|linksprotegidos\.info|linkto\.net|linkweb\.dk|linkx\.in|linkzip\.net|listedfiles\.com|littleurl\.net|lixk\.me|ljv2\.com|ll11\.org|lnk\.cm|lnk\.co|longr\.us|lovelink\.in|mcaf\.ee|megaline\.co|megaupper\.com|mhz\.me|migre\.me|miniurls\.co|minu\.me|mir\.cr|mirrorcreator\.com|mo\.by|multi-uploadeur\.com|murl\.kz|musicalmente\.info|mypaqe\.com|mypl\.us|myrapidlinks\.com|myref\.de|myurl\.in|nbanews\.us|okconsolas\.com|oneddl\.canhaz\.it|ow\.ly|p4p\.com\.es|p6l\.org|paste\.frubar\.net|paste\.hotfile-bb\.com|paste\.ubuntu\.com|paste2\.org|paste21\.info|pastebin\.com|paylesssofts\.net|poontown\.net|pqueno\.com|priva\.us|protec-link\.com|protect-ddl\.com|protect-my-links\.com|protected\.socadvnet\.com|protectlinks\.com|protectlinks\.net|protectlk\.com|protege-mes-liens\.com|ptl\.li|qooy\.com|qqc\.co|qvvo\.com|rapidfolder\.com|rapidsafe\.de|rapidsafe\.org|rapidshare\.mu|realfiles\.net|redir\.ec|ref\.so|relinka\.net|rexwo\.com|rqq\.co|rs-layer\.com|rsmonkey\.com|s2l\.biz|saf\.li|safe\.mn|safelinking\.net|saferlinks\.com|sealed\.in|seclnk\.in|seriousfiles\.com|sharebee\.com|short-link\.fr|shortlink\.ca|shorturlscript\.net|simurl\.com|sinl\.es|skroc\.pl|slexy\.org|slnky\.net|smsdl\.com|sn\.im|sonofertas\.es|spedr\.com|spreadlink\.us|star-cyber\.com|subedlc\.com|subirfacil\.com|syl\.me|szort\.pl|takemyfile\.com|takemylinks\.com|textsnip\.com|thecow\.me|thesefiles\.com|tilien\.net|tiny\.cc|tiny\.lt|tinylinks\.co|tinypaste\.com|tinyurl\.com|tinyurlscript\.info|tmf\.myegy\.com|togoto\.us|tot\.to|tra\.kz|u\.to|uberpicz\.com|ulinks\.net|ultra-protect\.com|ultrafiles\.net|undeadlink\.com|uploadjockey\.com|uploadmirrors\.com|uploadonall\.com|upmirror\.com|upsafe\.org|ur\.ly|url-go\.com|url-site\.com|url4t\.com|urla\.in|urlbeat\.net|urlcash\.net|urlcrypt\.com|urlcut\.com|urlcut\.in|urldefender\.com|urln\.tk|urlpulse\.net|urlspy\.co\.cc|urwij|uselink\.info|uucc\.cc|uze\.in|wcrypt\.in|webtooljungle\.com|weepax\.com|whackyvidz\.com|x-ls\.ru|x\.co|xa\.ly|xc\.io|xr\.com|xtreemhost\.com|xurl\.cn|xxs\.ru|ysu\.me|yyv\.co|zff\.co|zio\.in|zpag\.es)/.*"
-    __version__ = "0.21"
+    __version__ = "0.22"
     __description__ = """linkdecrypter.com"""
     __author_name__ = ("zoidberg")
 
@@ -32,15 +32,18 @@ class LinkdecrypterCom(Crypter):
     CAPTCHA_PATTERN = r'<img style="cursor:crosshair;" src="([^"]+)" alt="Loading CAPTCHA...">'
 
     def decrypt(self, pyfile):
+        self.html = self.load('http://linkdecrypter.com', cookies = True)
+        phpsessid = self.req.cj.getCookie("PHPSESSID")
+        
         self.html = self.load('http://linkdecrypter.com', post={
             "link_cache": "on",
-            "links": self.pyfile.url,
+            "links" + phpsessid: self.pyfile.url,
             "modo_links": "text"
-        })
+        }, cookies = True)
 
         new_links = []
         captcha = ''
-        passwords = self.getPassword().split()
+        passwords = self.getPassword().splitlines()
 
         for i in range(5 + len(passwords)):
             self.logDebug("Trying to decrypt #" + str(i))
@@ -78,6 +81,4 @@ class LinkdecrypterCom(Crypter):
                 self.correctCaptcha()
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
-            self.fail('Could not extract any links')
-
-        
+            self.fail('Could not extract any links')
\ No newline at end of file
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index 53c5cd81f..9c9f502c3 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -18,121 +18,119 @@
 
 import re
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.network.RequestFactory import getURL
+
+def convertDecimalPrefix(m):
+    # decimal prefixes used in filesize and traffic     
+    return "%s%s%s B" % (m.group(1), m.group(2).ljust(3, '0') if m.group(2) else '000', {'k': '', 'M': '000', 'G': '000000'}[m.group(3)])
 
 class UlozTo(SimpleHoster):
     __name__ = "UlozTo"
     __type__ = "hoster"
     __pattern__ = r"http://(\w*\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/.*"
-    __version__ = "0.74"
+    __version__ = "0.80"
     __description__ = """uloz.to"""
-    __config__ = [("reuseCaptcha", "bool", "Reuse captcha", "True"),
-        ("captchaUser", "str", "captcha_user", ""),
-        ("captchaNb", "str", "captcha_nb", "")]
     __author_name__ = ("zoidberg")
 
-    FILE_URL_PATTERN = r'<form name="dwn" action="([^"]+)"'
-    FILE_NAME_PATTERN = r'<h2 class="nadpis" style="margin-left:196px;"><a href="[^"]+">(?P<N>[^<]+)</a></h2>'
-    CAPTCHA_PATTERN = r'<img style=".*src="([^"]+)" alt="Captcha" class="captcha"'
-    CAPTCHA_NB_PATTERN = r'<input class="captcha_nb" type="hidden" name="captcha_nb" value="([0-9]+)" >'
+    FILE_NAME_PATTERN = r'<a share_url="[^&]*&amp;t=(?P<N>[^"]+)"'
+    #FILE_NAME_PATTERN = r'<h2 class="nadpis" style="margin-left:196px;"><a href="[^"]+">(?P<N>[^<]+)</a></h2>'
+    FILE_SIZE_PATTERN = r'<div class="info_velikost" style="top:-55px;">\s*<div>[^<]*\s+(?P<S>[0-9.]+\s[kMG]B)\s*</div>\s*</div>'   
+    FILE_SIZE_REPLACEMENTS = [('(\d+)\.?(\d+)? (\w)B', convertDecimalPrefix), (' ','')]       
     FILE_OFFLINE_PATTERN = r'http://www.uloz.to/(neexistujici|smazano|nenalezeno)'
+    
     PASSWD_PATTERN = r'<input type="password" class="text" name="file_password" id="frmfilepasswordForm-file_password" />'
-    LIVE_URL_PATTERN = r'<div id="flashplayer"[^>]*>\s*<a href="([^"]+)"'
-    LIVE_NAME_PATTERN = r'<a share_url="[^&]*&amp;t=([^"]+)"'
-    FILE_SIZE_PATTERN = r'<div class="info_velikost" style="top:-55px;">\s*<div>[^<]*\s+(?P<S>[0-9.]+)\s(?P<U>[kKMG])i?B\s*</div>\s*</div>'
-    VIPLINK_PATTERN = r'<a href="[^"]*\?disclaimer=1" class="linkVip">'
-
-    def setup(self):
-        self.multiDL = False
+    VIPLINK_PATTERN = r'<a href="[^"]*\?disclaimer=1" class="linkVip">'    
+    FREE_URL_PATTERN = r'<form name="dwn" action="([^"]+)"'
+    PREMIUM_URL_PATTERN = r'<a onclick[^>]*href="([^"]+)[^>]*class="linkVip"'
+    CAPTCHA_PATTERN = r'<img style=".*src="([^"]+)" alt="Captcha" class="captcha"'
+    CAPTCHA_NB_PATTERN = r'<input class="captcha_nb" type="hidden" name="captcha_nb" value="([0-9]+)" >'
 
     def process(self, pyfile):
+        # check file online
         header = self.load(pyfile.url, just_header=True)
         if "location" in header:
             self.logDebug('LOCATION: ' + header['location'])
             if "utm_source=old" in header['location'] or re.search(self.FILE_OFFLINE_PATTERN, header['location']):
-                self.offline()
-    
+                self.offline()        
+        
         self.html = self.load(pyfile.url, decode=True)
         
-        if self.PASSWD_PATTERN in self.html:
-            self.fail("Password protected link")
-
+        # password protected links
+        passwords = self.getPassword().splitlines()       
+        while self.PASSWD_PATTERN in self.html:
+            if passwords:
+                password = passwords.pop(0)
+                self.logInfo("Password protected link, trying " + password)
+                self.html = self.load(pyfile.url, get = {"do": "filepasswordForm-submit"}, post={"file_password": password, "fpwdsend": 'Odeslat'}, cookies=True)
+            else:
+                self.fail("No or incorrect password")
+        
+        self.file_info = self.getFileInfo()
+                
+        # adult content    
         if re.search(self.VIPLINK_PATTERN, self.html):
             self.html = self.load(pyfile.url, get={"disclaimer": "1"})
+        
+        if self.premium and self.checkCredit():
+            self.handlePremium()
+        else: 
+            self.handleFree()
+            
+    def handleFree(self):    
+        parsed_url = self.findDownloadURL(premium=False)
+
+        # get and decrypt captcha
+        captcha = self.getStorage("captchaUser")
+        captcha_nb = self.getStorage("captchaNb")
+        captcha_url = "DUMMY"
+
+        if not captcha or not captcha_nb:
+            found = re.search(self.CAPTCHA_PATTERN, self.html)
+            if not found: self.parseError("CAPTCHA")
+            captcha_url = found.group(1)
+            
+            found = re.search(self.CAPTCHA_NB_PATTERN, self.html)
+            if not found: self.parseError("CAPTCHA_NB")
+            captcha_nb = found.group(1)
+            
+            captcha = self.decryptCaptcha(captcha_url)
+        
+        self.log.debug('CAPTCHA_URL:' + captcha_url + ' CAPTCHA:' + captcha + ' CAPTCHA_NB:' + captcha_nb)
 
-        found = re.search(self.LIVE_URL_PATTERN, self.html)
-        if found is not None:
-            # Uloz.to LIVE       
-            parsed_url = found.group(1)
-            self.logDebug("LIVE URL:" + parsed_url)
-
-            found = re.search(self.LIVE_NAME_PATTERN, self.html)
-            if found is None:
-                self.fail("Parse error (LIVE_NAME)")
-            pyfile.name = found.group(1)
-            self.log.debug("LIVE NAME:" + pyfile.name)
-
-            self.download(parsed_url)
-        else:
-            # Uloz.to DATA
-            # parse the name from the site and set attribute in pyfile
-            found = re.search(self.FILE_NAME_PATTERN, self.html)
-            if found is None:
-                self.fail("Parse error (FILENAME)")
-            pyfile.name = found.group(1)
-            self.log.debug("PARSED_NAME:" + pyfile.name)
-
-            found = re.search(self.FILE_URL_PATTERN, self.html)
-            if found is None:
-                self.fail("Parse error (URL)")
-            parsed_url = found.group(1)
-            self.log.debug("PARSED_URL:" + parsed_url)
-
-            # get and decrypt captcha
-            reuse_captcha = self.getConfig("reuseCaptcha")
-            captcha = self.getConfig("captchaUser")
-            captcha_nb = self.getConfig("captchaNb")
-            captcha_url = "DUMMY"
-
-            if not reuse_captcha or not captcha or not captcha_nb:
-                found = re.search(self.CAPTCHA_PATTERN, self.html)
-                if found is None:
-                    self.fail("Parse error (CAPTCHA)")
-                captcha_url = found.group(1)
-                captcha = self.decryptCaptcha(captcha_url)
-                found = re.search(self.CAPTCHA_NB_PATTERN, self.html)
-                if found is None:
-                    self.fail("Parse error (CAPTCHA_NB)")
-                captcha_nb = found.group(1)
-            self.log.debug('CAPTCHA_URL:' + captcha_url + ' CAPTCHA:' + captcha + ' CAPTCHA_NB:' + captcha_nb)
-
-            # download the file, destination is determined by pyLoad
-            self.download(parsed_url, post={
-                "captcha_user": captcha,
-                "captcha_nb": captcha_nb
-            })
-
-            check = self.checkDownload({
-                "wrong_captcha": re.compile(self.CAPTCHA_PATTERN),
-                "offline": re.compile(self.FILE_OFFLINE_PATTERN),
-                "passwd": self.PASSWD_PATTERN
-            })
-
-            if check == "wrong_captcha":
-                if reuse_captcha:
-                    self.setConfig("captchaUser", "")
-                    self.setConfig("captchaNb", "")
-                self.invalidCaptcha()
-                self.retry(reason="Wrong captcha code")
-            elif check == "offline":
-                self.offline()
-            elif check == "passwd":
-                self.fail("Password protected")
-
-            if reuse_captcha:
-                self.setConfig("captchaUser", captcha)
-                self.setConfig("captchaNb", captcha_nb)
-
-getInfo = create_getInfo(UlozTo)
-                
-        
\ No newline at end of file
+        # download and check        
+        self.download(parsed_url, post={"captcha_user": captcha, "captcha_nb": captcha_nb}, cookies=True, disposition = True)
+        self.doCheckDownload()   
+        
+        self.setStorage("captchaUser", captcha)
+        self.setStorage("captchaNb", captcha_nb)
+    
+    def handlePremium(self):
+        parsed_url = self.findDownloadURL(premium=True)
+        self.download(parsed_url, disposition = True)
+        self.doCheckDownload()
+        
+    def findDownloadURL(self, premium=False):
+        msg = "%s link" % ("Premium" if premium else "Free")
+        found = re.search(self.PREMIUM_URL_PATTERN if premium else self.FREE_URL_PATTERN, self.html)
+        if not found: self.parseError(msg)
+        parsed_url = found.group(1)
+        self.logDebug("%s: %s" % (msg, parsed_url))
+        return parsed_url
+    
+    def doCheckDownload(self):
+        check = self.checkDownload({
+            "wrong_captcha": re.compile(self.CAPTCHA_PATTERN),
+            "offline": re.compile(self.FILE_OFFLINE_PATTERN),
+            "passwd": self.PASSWD_PATTERN
+        })
+
+        if check == "wrong_captcha":
+            self.delStorage("captchaUser")
+            self.delStorage("captchaNb")
+            self.invalidCaptcha()
+            self.retry(reason="Wrong captcha code")
+        elif check == "offline":
+            self.offline()
+        elif check == "passwd":
+            self.fail("Wrong password")
+
+getInfo = create_getInfo(UlozTo)        
\ No newline at end of file
-- 
cgit v1.2.3


From 69ffe7a95e7bd136e6ab1a4cf8d96cf2a5fdeba6 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Wed, 11 Jan 2012 17:41:00 +0100
Subject: premium4.me error handling

---
 module/plugins/hoster/Premium4Me.py | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/Premium4Me.py b/module/plugins/hoster/Premium4Me.py
index 1d97e21b1..beccdf572 100644
--- a/module/plugins/hoster/Premium4Me.py
+++ b/module/plugins/hoster/Premium4Me.py
@@ -6,7 +6,7 @@ from module.plugins.Hoster import Hoster
 
 class Premium4Me(Hoster):
     __name__ = "Premium4Me"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __type__ = "hoster"
 
     __pattern__ = r"http://premium4.me/.*"
@@ -15,7 +15,6 @@ class Premium4Me(Hoster):
     __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
 
     def setup(self):
-        self.chunkLimit = 3
         self.resumeDownload = True
 
     def process(self, pyfile):
@@ -23,10 +22,36 @@ class Premium4Me(Hoster):
             self.logError(_("Please enter your premium4.me account or deactivate this plugin"))
             self.fail("No premium4.me account provided")
 
-        self.log.debug("premium4.me: Old URL: %s" % pyfile.url)
-        new_url = "http://premium4.me/api/getfile.php?authcode=%s&link=%s" % (self.account.authcode, quote(pyfile.url, ""))
+        self.logDebug("premium4.me: Old URL: %s" % pyfile.url)
 
+        tra = self.getTraffic()
+        
         #raise timeout to 2min
         self.req.setOption("timeout", 120)
-
-        self.download(new_url, disposition=True)
\ No newline at end of file
+        
+        self.download("http://premium4.me/api/getfile.php?authcode=%s&link=%s" % (self.account.authcode, quote(pyfile.url, "")), disposition=True)
+        
+        err = ''       
+        if self.req.http.code == '420':
+            # Custom error code send - fail
+            lastDownload = fs_encode(self.lastDownload)
+            
+            if exists(lastDownload): 
+                f = open(lastDownload, "rb")
+                err = f.read(256).strip()
+                f.close()
+                remove(lastDownload)
+            else:
+                err = 'File does not exist'
+        
+        trb = self.getTraffic()
+        self.logInfo("Filesize: %d, Traffic used %d, traffic left %d" % (pyfile.size, tra-trb, trb))
+                    
+        if err: self.fail(err)
+        
+    def getTraffic(self):
+        try:
+            traffic = int(self.load ("http://premium4.me/api/traffic.php?authcode=%s" % self.account.authcode))
+        except:
+            traffic = 0 
+        return traffic       
\ No newline at end of file
-- 
cgit v1.2.3


From 7dacdd1a89dc6a6d191495937d4193172cdfa14d Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Wed, 11 Jan 2012 18:42:23 +0100
Subject: Unrar fix

---
 module/plugins/hooks/ExtractArchive.py | 12 +++++++-----
 module/plugins/internal/UnRar.py       |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 82e9c1d36..b7960620d 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -25,7 +25,8 @@ if sys.version_info < (2, 7) and os.name != "nt":
                     continue
                 raise
 
-    def wait(self):
+    # unsued timeout option for older python version
+    def wait(self, timeout=0):
         """Wait for child process to terminate.  Returns returncode
         attribute."""
         if self.returncode is None:
@@ -57,7 +58,7 @@ class ExtractArchive(Hook):
     Provides: unrarFinished (folder, filename)
     """
     __name__ = "ExtractArchive"
-    __version__ = "0.1"
+    __version__ = "0.11"
     __description__ = "Extract different kind of archives"
     __config__ = [("activated", "bool", "Activated", True),
         ("fullpath", "bool", "Extract full path", True),
@@ -66,7 +67,8 @@ class ExtractArchive(Hook):
         ("deletearchive", "bool", "Delete archives when done", False),
         ("subfolder", "bool", "Create subfolder for each package", False),
         ("destination", "folder", "Extract files to", ""),
-        ("queue", "bool", "Wait for all downloads to be fninished", True),
+        ("recursive", "bool", "Extract archives in archvies", True),
+        ("queue", "bool", "Wait for all downloads to be finished", True),
         ("renice", "int", "CPU Priority", 0), ]
     __author_name__ = ("pyload Team")
     __author_mail__ = ("admin<at>pyload.org")
@@ -185,7 +187,7 @@ class ExtractArchive(Hook):
                             if not exists(file):
                                 self.logDebug("new file %s does not exists" % file)
                                 continue
-                            if isfile(file):
+                            if self.getConfig("recursive") and isfile(file):
                                 new_files_ids.append((file, fid)) #append as new target
 
                 files_ids = new_files_ids # also check extracted files
@@ -304,4 +306,4 @@ class ExtractArchive(Hook):
                     gid = getgrnam(self.config["permission"]["group"])[2]
                     chown(f, uid, gid)
             except Exception, e:
-                self.log.warning(_("Setting User and Group failed"), e)
\ No newline at end of file
+                self.log.warning(_("Setting User and Group failed"), e)
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index feac4c176..de6215704 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -188,4 +188,4 @@ def renice(pid, value):
         try:
             Popen(["renice", str(value), str(pid)], stdout=PIPE, stderr=PIPE, bufsize=-1)
         except:
-            print "Renice failed"
\ No newline at end of file
+            print "Renice failed"
-- 
cgit v1.2.3


From 0715dcafc11567e07b8f1c252bbd2b86065ae760 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Thu, 12 Jan 2012 17:10:25 +0100
Subject: linkdecrypter api (thx flowlee), fix uloz.to, 1fichier - closed #493,
 #494, #496

---
 module/plugins/crypter/LinkdecrypterCom.py | 109 +++++++++++++-----------
 module/plugins/hoster/DlFreeFr.py          |  73 ----------------
 module/plugins/hoster/OneFichierCom.py     | 130 ++++++-----------------------
 module/plugins/hoster/UlozTo.py            |  14 ++--
 module/plugins/internal/SimpleHoster.py    |  17 ++--
 5 files changed, 105 insertions(+), 238 deletions(-)
 delete mode 100644 module/plugins/hoster/DlFreeFr.py

(limited to 'module')

diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index 93c08a5b2..83c74188d 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -22,63 +22,74 @@ from module.plugins.Crypter import Crypter
 class LinkdecrypterCom(Crypter):
     __name__ = "LinkdecrypterCom"
     __type__ = "crypter"
-    __pattern__ = r"http://(\w*\.)?(10001mb\.com|123link\.it|1cl\.in|1kh\.de|1zh\.us|2joy\.de|2so\.be|3\.ly|5\.gp|6nc\.net|7li\.in|9\.bb|adf\.ly|adflav\.com|adfoc\.us|allanalpass\.com|alturl\.com|amy\.gs|any\.gs|apurl\.ru|aurl\.es|b23\.ru|baberepublic\.com|bat5\.com|bax\.li|beam\.to|bit\.ly|blu\.cc|c\.ly|capourl\.com|cc\.st|cd\.vg|cloneurl\.com|convertircodigo\.com|crypt-it\.com|crypt\.to|cryptlink\.ws|deb\.gs|digzip\.com|djurl\.com|dl-protect\.com|doiop\.com|ehe\.me|encript\.in|encurtador\.com|enlacs\.com|evg\.in|extreme-protect\.com|fa\.by|faja\.me|fapoff\.com|fdnlinks\.com|fea\.me|fff\.to|filedeck\.net|filemirrorupload\.com|fileupster\.com|flameupload\.com|freetexthost\.com|fwd4\.me|fyad\.org|goandgrab\.info|goblig\.com|goo\.gl|h-url\.in|hasurl\.co\.cc|hide-url\.net|hidemyass\.com|hides\.at|hideurl\.biz|ho\.io|hornywood\.tv|href\.hu|id2\.tryjav\.com|ilix\.in|ily\.me|ino\.me|interupload\.com|is\.gd|ivpaste\.com|j\.mp|je\.pl|jheberg\.com|just\.as|kickupload\.com|klnk\.de|knoffl\.com|kodo\.ameoto\.com|ks\.gs|latwy\.pl|link-go\.info|link-protector\.com|link-safe\.net|link4jo\.com|linkanonimo\.com|linkbabes\.com|linkbank\.eu|linkbee\.com|linkblur\.com|linkbucks\.com|linkcrypt\.com|linkcrypt\.ws|linkencrypter\.com|linkhide\.com\.ar|linkhide\.in|linkoculto\.net|linkok\.org|linkprivado\.com|linkprivate\.net|linkprotect\.in|links-protect\.com|links-protect\.info|links\.tc|linksafe\.me|linksaver\.info|linkse\.info|linkseguro\.com\.ar|linkseguro\.org|linksole\.com|linksprotegidos\.info|linkto\.net|linkweb\.dk|linkx\.in|linkzip\.net|listedfiles\.com|littleurl\.net|lixk\.me|ljv2\.com|ll11\.org|lnk\.cm|lnk\.co|longr\.us|lovelink\.in|mcaf\.ee|megaline\.co|megaupper\.com|mhz\.me|migre\.me|miniurls\.co|minu\.me|mir\.cr|mirrorcreator\.com|mo\.by|multi-uploadeur\.com|murl\.kz|musicalmente\.info|mypaqe\.com|mypl\.us|myrapidlinks\.com|myref\.de|myurl\.in|nbanews\.us|okconsolas\.com|oneddl\.canhaz\.it|ow\.ly|p4p\.com\.es|p6l\.org|paste\.frubar\.net|paste\.hotfile-bb\.com|paste\.ubuntu\.com|paste2\.org|paste21\.info|pastebin\.com|paylesssofts\.net|poontown\.net|pqueno\.com|priva\.us|protec-link\.com|protect-ddl\.com|protect-my-links\.com|protected\.socadvnet\.com|protectlinks\.com|protectlinks\.net|protectlk\.com|protege-mes-liens\.com|ptl\.li|qooy\.com|qqc\.co|qvvo\.com|rapidfolder\.com|rapidsafe\.de|rapidsafe\.org|rapidshare\.mu|realfiles\.net|redir\.ec|ref\.so|relinka\.net|rexwo\.com|rqq\.co|rs-layer\.com|rsmonkey\.com|s2l\.biz|saf\.li|safe\.mn|safelinking\.net|saferlinks\.com|sealed\.in|seclnk\.in|seriousfiles\.com|sharebee\.com|short-link\.fr|shortlink\.ca|shorturlscript\.net|simurl\.com|sinl\.es|skroc\.pl|slexy\.org|slnky\.net|smsdl\.com|sn\.im|sonofertas\.es|spedr\.com|spreadlink\.us|star-cyber\.com|subedlc\.com|subirfacil\.com|syl\.me|szort\.pl|takemyfile\.com|takemylinks\.com|textsnip\.com|thecow\.me|thesefiles\.com|tilien\.net|tiny\.cc|tiny\.lt|tinylinks\.co|tinypaste\.com|tinyurl\.com|tinyurlscript\.info|tmf\.myegy\.com|togoto\.us|tot\.to|tra\.kz|u\.to|uberpicz\.com|ulinks\.net|ultra-protect\.com|ultrafiles\.net|undeadlink\.com|uploadjockey\.com|uploadmirrors\.com|uploadonall\.com|upmirror\.com|upsafe\.org|ur\.ly|url-go\.com|url-site\.com|url4t\.com|urla\.in|urlbeat\.net|urlcash\.net|urlcrypt\.com|urlcut\.com|urlcut\.in|urldefender\.com|urln\.tk|urlpulse\.net|urlspy\.co\.cc|urwij|uselink\.info|uucc\.cc|uze\.in|wcrypt\.in|webtooljungle\.com|weepax\.com|whackyvidz\.com|x-ls\.ru|x\.co|xa\.ly|xc\.io|xr\.com|xtreemhost\.com|xurl\.cn|xxs\.ru|ysu\.me|yyv\.co|zff\.co|zio\.in|zpag\.es)/.*"
-    __version__ = "0.22"
+    #excluded: "1kh\.de|crypt-it\.com|linksave\.in|lix\.in|lof\.cc|multiload\.cz|multiupload\.com|ncrypt\.in|relink\.us|rs-layer\.com|secured\.in|stealth\.to"  
+    __pattern__ = r"http://(\w*\.)?(00\.uz|10001mb\.com|123link\.it|123url\.org|1cl\.in|1tool\.biz|1zh\.us|2joy\.de|2so\.be|3\.ly|5\.gp|6nc\.net|7li\.in|9\.bb|adf\.ly|adflav\.com|adfoc\.us|allanalpass\.com|alturl\.com|amy\.gs|any\.gs|apurl\.ru|aurl\.es|b23\.ru|baberepublic\.com|bai\.lu|bat5\.com|bax\.li|bc\.vc|beam\.to|birurl\.com|bit\.ly|blu\.cc|bofh\.us|boo\.io|c\.ly|capourl\.com|cash4links\.co|cc\.st|cd\.vg|cl\.lk|cli\.gs|cloneurl\.com|convertircodigo\.com|crypt\.to|crypt2\.be|cryptlink\.ws|ddl-warez\.in|deb\.gs|deurl\.me|digzip\.com|djurl\.com|dl-protect\.com|dl\.dropbox\.com|doiop\.com|ehe\.me|embedupload\.com|encript\.in|encurtador\.com|enlacs\.com|evg\.in|extreme-protect\.com|fa\.by|faja\.me|fapoff\.com|fdnlinks\.com|fea\.me|fff\.to|filedeck\.net|filemirrorupload\.com|filesonthe\.net|fileupster\.com|flameupload\.com|freetexthost\.com|fwd4\.me|fyad\.org|galleries\.bz|goandgrab\.info|goblig\.com|goo\.gl|guardlink\.org|h-url\.in|hasurl\.co\.cc|hide-url\.net|hidemyass\.com|hides\.at|hideurl\.biz|ho\.io|hornywood\.tv|href\.hu|id2\.tryjav\.com|ilii\.in|ilix\.in|ily\.me|ino\.me|interupload\.com|is\.gd|ivpaste\.com|j\.mp|j7\.se|je\.pl|jheberg\.com|just\.as|kickupload\.com|klnk\.de|knoffl\.com|kodo\.ameoto\.com|ks\.gs|latwy\.pl|li\.co\.ve|link-go\.info|link-protector\.com|link-safe\.net|link\.file-up\.ru|link4jo\.com|linkanonimo\.com|linkbabes\.com|linkbank\.eu|linkbee\.com|linkblur\.com|linkbucks\.com|linkbun\.ch|linkcrypt\.com|linkcrypt\.ws|linkencrypter\.com|linkhide\.com\.ar|linkhide\.in|linkoculto\.net|linkok\.org|linkprivado\.com|linkprivate\.net|linkprotect\.in|links-protect\.com|links-protect\.info|links-protection\.com|links\.tc|linksafe\.me|linksaver\.info|linkse\.info|linkseguro\.com\.ar|linkseguro\.org|linksole\.com|linksprotec\.com|linksprotegidos\.info|linkssafe\.com|linkto\.net|linkweb\.dk|linkx\.in|linkzip\.net|listedfiles\.com|littleurl\.net|lixk\.me|lixxin\.com|ljv2\.com|lkt\.es|ll11\.org|lnk\.cm|lnk\.co|longr\.us|lovelink\.in|madlink\.sk|maxi-upload\.com|mcaf\.ee|mediahide\.com|megaline\.co|megalinks\.es|megaupper\.com|mf1\.jp|mhz\.me|migre\.me|miniurl\.com|miniurl\.es|miniurl\.org|miniurls\.co|minu\.me|mir\.cr|mirrorcreator\.com|mo\.by|multi-uploadeur\.com|murl\.kz|musicalmente\.info|myooo\.info|mypaqe\.com|mypl\.us|myrapidlinks\.com|myref\.de|myurl\.in|nbanews\.us|nov\.io|okconsolas\.com|oneddl\.canhaz\.it|ow\.ly|p4p\.com\.es|p6l\.org|paste\.frubar\.net|paste\.hotfile-bb\.com|paste\.to|paste\.ubuntu\.com|paste2\.org|paste21\.info|pastebin\.com|paylesssofts\.net|poontown\.net|pqueno\.com|priva\.us|protec-link\.com|protect-ddl\.com|protect-my-links\.com|protected\.socadvnet\.com|protectlinks\.com|protectlinks\.net|protectlk\.com|protege-mes-liens\.com|ptl\.li|qooy\.com|qqc\.co|qvvo\.com|rapidfolder\.com|rapidsafe\.de|rapidsafe\.org|rapidshare\.mu|realfiles\.net|redir\.ec|ref\.so|relinka\.net|rexwo\.com|rqq\.co|rsmonkey\.com|rurls\.ru|s2l\.biz|saf\.li|safe\.mn|safelinking\.net|saferlinks\.com|scut\.ly|sealed\.in|seclnk\.in|seriousfiles\.com|share-links\.biz|sharebee\.com|short-link\.fr|shortlink\.ca|shorturlscript\.net|shrt\.st|simurl\.com|sinl\.es|skroc\.pl|slexy\.org|slnky\.net|smlk\.es|smsdl\.com|sn\.im|snipr\.com|snipurl\.com|snurl\.com|sonofertas\.es|spedr\.com|spreadlink\.us|star-cyber\.com|stu\.tc|subedlc\.com|subirfacil\.com|syl\.me|szort\.pl|t\.co|t7\.hu|takemyfile\.com|takemylinks\.com|textsave\.de|textsnip\.com|thecow\.me|thesefiles\.com|thinfi\.com|tilien\.net|tiny\.cc|tiny\.lt|tinylinks\.co|tinypaste\.com|tinyurl\.com|tinyurlscript\.info|tmf\.myegy\.com|togoto\.us|tot\.to|tra\.kz|trick\.ly|u\.to|uberpicz\.com|ubervidz\.com|ulinks\.net|ultrafiles\.net|undeadlink\.com|uploadjockey\.com|uploadmirrors\.com|uploadonall\.com|upmirror\.com|upsafe\.org|ur\.ly|url-go\.com|url-site\.com|url\.zeta24\.com|url4t\.com|urla\.in|urlbeat\.net|urlcash\.net|urlcorta\.es|urlcrypt\.com|urlcut\.com|urlcut\.in|urldefender\.com|urlink\.at|urln\.tk|urlpulse\.net|urlspy\.co\.cc|urwij|uselink\.info|uucc\.cc|uze\.in|wa9\.la|wcrypt\.in|webtooljungle\.com|weepax\.com|whackyvidz\.com|wtc\.la|x-ls\.ru|x\.co|xa\.ly|xc\.io|xr\.com|xtreemhost\.com|xurl\.cn|xurl\.es|xxs\.ru|youfap\.me|ysu\.me|yvy\.me|yyv\.co|zff\.co|zio\.in|zpag\.es)/.*"
+    __version__ = "0.23"
     __description__ = """linkdecrypter.com"""
-    __author_name__ = ("zoidberg")
-
+    __author_name__ = ("zoidberg", "flowlee")
+    
     TEXTAREA_PATTERN = r'<textarea name="links" wrap="off" readonly="1" class="caja_des">(.+)</textarea>'
     PASSWORD_PATTERN = r'<p class="textog" style="color:red"><b>PASSWORD:</b></p>'
     CAPTCHA_PATTERN = r'<img style="cursor:crosshair;" src="([^"]+)" alt="Loading CAPTCHA...">'
-
+    REDIR_PATTERN = r'<i>(Click <a href="./">here</a> if your browser does not redirect you).</i>'
+    
     def decrypt(self, pyfile):
-        self.html = self.load('http://linkdecrypter.com', cookies = True)
-        phpsessid = self.req.cj.getCookie("PHPSESSID")
-        
-        self.html = self.load('http://linkdecrypter.com', post={
-            "link_cache": "on",
-            "links" + phpsessid: self.pyfile.url,
-            "modo_links": "text"
-        }, cookies = True)
 
-        new_links = []
-        captcha = ''
-        passwords = self.getPassword().splitlines()
-
-        for i in range(5 + len(passwords)):
-            self.logDebug("Trying to decrypt #" + str(i))
-            self.html = self.load('http://linkdecrypter.com')
+        self.passwords = self.getPassword().splitlines()
+        
+        new_links = self.decryptAPI() or self.decryptHTML()                
+        if new_links:
+            self.core.files.addLinks(new_links, self.pyfile.package().id)
+        else:
+            self.fail('Could not extract any links')    
 
-            textarea = re.search(self.TEXTAREA_PATTERN, self.html, flags=re.DOTALL)
-            if textarea is not None:
-                self.logDebug(textarea.group(1))
-                new_links.extend(textarea.group(1).split())
-                break
-            elif re.search(self.PASSWORD_PATTERN, self.html):
-                if len(passwords):
-                    password = passwords.pop(0)
+    def decryptAPI(self):
+            
+        get_dict = { "t": "link", "url": self.pyfile.url, "lcache": "1" } 
+        self.html = self.load('http://linkdecrypter.com/api', get = get_dict)
+        if self.html.startswith('http://'): return self.html.splitlines()
+        
+        if self.html == 'INTERRUPTION(PASSWORD)':
+            for get_dict['pass'] in self.passwords:
+                self.html = self.load('http://linkdecrypter.com/api', get= get_dict)
+                if self.html.startswith('http://'): return self.html.splitlines()                                                
+        
+        self.logError('API', self.html)
+        if self.html == 'INTERRUPTION(PASSWORD)':
+            self.fail("No or incorrect password")
+        
+        return None                   
+            
+    def decryptHTML(self):
+        
+        self.html = self.load('http://linkdecrypter.com', cookies = True)        
+        links_sessid = "links" + self.req.cj.getCookie("PHPSESSID")
+        retries = 5
+        
+        post_dict = { "link_cache": "on", links_sessid: self.pyfile.url, "modo_links": "text" }                                              
+        self.html = self.load('http://linkdecrypter.com', post = post_dict, cookies = True)
+        
+        while self.passwords or retries:                                    
+            found = re.search(self.TEXTAREA_PATTERN, self.html, flags=re.DOTALL)                    
+            if found: return found.group(1).splitlines()
+                                             
+            found = re.search(self.CAPTCHA_PATTERN, self.html)
+            if found:
+                self.logInfo("Captcha protected link")
+                captcha = self.decryptCaptcha(url='http://linkdecrypter.com/' + found.group(1))
+                self.html = self.load('http://linkdecrypter.com', post={ "captcha": captcha })
+                retries -= 1
+                
+            elif self.PASSWORD_PATTERN in self.html:
+                if self.passwords:
+                    password = self.passwords.pop(0)
                     self.logInfo("Password protected link, trying " + password)
-                    self.html = self.load('http://linkdecrypter.com', post={
-                        "password": password
-                    })
+                    self.html = self.load('http://linkdecrypter.com', post= {'password': password})
                 else:
                     self.fail("No or incorrect password")
+            
             else:
-                found = re.search(self.CAPTCHA_PATTERN, self.html)
-                if found is not None:
-                    self.logInfo("Captcha protected link")
-                    if captcha:
-                        self.invalidCaptcha()
-                    captcha = self.decryptCaptcha(url='http://linkdecrypter.com/' + found.group(1))
-                    self.html = self.load('http://linkdecrypter.com', post={
-                        "captcha": captcha
-                    })
-        else:
-            self.fail('Max retries reached')
-
-        if new_links:
-            if captcha:
-                self.correctCaptcha()
-            self.core.files.addLinks(new_links, self.pyfile.package().id)
-        else:
-            self.fail('Could not extract any links')
\ No newline at end of file
+                retries -= 1            
+                self.html = self.load('http://linkdecrypter.com', cookies = True)
+        
+        return None                           
\ No newline at end of file
diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py
deleted file mode 100644
index 8ab9dd8eb..000000000
--- a/module/plugins/hoster/DlFreeFr.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Hoster import Hoster
-
-class DlFreeFr(Hoster):
-    __name__ = "DlFreeFr"
-    __type__ = "hoster"
-    __pattern__ = r"http://dl\.free\.fr/([a-zA-Z0-9]+|getfile\.pl\?file=/[a-zA-Z0-9]+)$"
-    __version__ = "0.1"
-    __description__ = """dl.free.fr download hoster"""
-    __author_name__ = ("the-razer")
-    __author_mail__ = ("daniel_ AT gmx DOT net")
-
-    def setup(self):
-        self.html = None
-        self.multiDL = False
-
-    def process(self, pyfile):
-
-        self.download_html()
-
-        if not self.file_exists():
-            self.log.debug(self.__name__+": File not yet available.")
-            self.offline()
-        
-        pyfile.name = self.get_file_name()
-        
-        url = self.get_file_url()
-        if url:
-            self.download(url)
-        else:
-            self.offline()
-
-    def download_html(self):
-        self.html = self.load(self.pyfile.url, cookies=False)
-        
-    def file_exists(self):
-        warnings = (r"Erreur 404 - Document non trouv",
-                    r"Fichier inexistant.",
-                    r"Le fichier demand&eacute; n'a pas &eacute;t&eacute; trouv&eacute;")
-        expr = '(' + '|'.join(warnings) + ')'
-        if re.search(expr, self.html) is not None:
-            return False 
-        return True
-        
-    def get_file_url(self):
-        self.log.debug(self.__name__+": Getting file URL")
-        file_url_pattern = r'href="(?P<url>http://.*?)">T&eacute;l&eacute;charger ce fichier'
-        
-        m = re.search(file_url_pattern, self.html)
-        if m is not None:
-            url = m.group('url')
-            self.log.debug(self.__name__+": File URL [%s]" % url)
-            return url
-        else:
-            self.log.debug(self.__name__+": Error getting URL")
-            return False
-
-    def get_file_name(self):
-        self.log.debug(self.__name__+": Getting file name")
-        
-        file_name_pattern = r"Fichier:</td>\s*<td.*>(?P<name>.*?)</td>"
-        m = re.search(file_name_pattern, self.html)
-        
-        if m is not None:
-            name = m.group('name').strip()
-            self.log.debug(self.__name__+": File name [%s]" % name)
-            return name
-        else:
-            self.log.debug(self.__name__+": Could not find filename")
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index 3343c7c8c..16401891b 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -1,80 +1,29 @@
 # -*- coding: utf-8 -*-
 
 import re
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
-from module.plugins.Hoster import Hoster
-from module.network.RequestFactory import getURL
-
-
-def getInfo(urls):
-    result = []
-    
-    for url in urls:
-        
-        # Get file info html
-        id = re.match(OneFichierCom.__pattern__, url).group('id')
-        url = 'http://%s.1fichier.com/en' % id  # Force response in english
-        html = getURL(url) 
-        
-        # Offline?
-        if re.search(OneFichierCom.FILE_OFFLINE_PATTERN, html):
-            result.append((url, 0, 1, url))
-            continue
-        
-        # Name
-        for pattern in OneFichierCom.FILE_NAME_PATTERNS:
-            m = re.search(pattern, html)
-            if m is not None:
-                name = m.group('name').strip()
-        
-        # Size
-        m = re.search(OneFichierCom.FILE_SIZE_PATTERN, html)
-        value = float(m.group('size'))
-        units = m.group('units')[0].upper()
-        pow = {'K' : 1, 'M' : 2, 'G' : 3}[units] 
-        size = int(value*1024**pow)
-    
-        # Return info
-        result.append((name, size, 2, url))
-        
-    yield result
-
-
-class OneFichierCom(Hoster):
+class OneFichierCom(SimpleHoster):
     __name__ = "OneFichierCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?P<id>[a-z0-9]+)\.1fichier\.com(?P<remain>.*)"
-    __version__ = "0.3"
+    __pattern__ = r"(http://\w+\.((1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl.fr))"
+    __version__ = "0.4"
     __description__ = """1fichier.com download hoster"""
-    __author_name__ = ("fragonib")
-    __author_mail__ = ("fragonib[AT]yahoo[DOT]es")
+    __author_name__ = ("fragonib", "the-razer", "zoidberg")
+    __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "daniel_ AT gmx DOT net", "zoidberg@mujmail.cz")
+    
+    FILE_NAME_PATTERN = r'">File name :</th>[\t\r\n ]+<td>(?P<N>.*?)</td>'
+    FILE_SIZE_PATTERN = r'<th>File size :</th>\s+<td>(?P<S>[\d\.]*) (?P<U>\w+)</td>'
+    FILE_OFFLINE_PATTERN = r'The (requested)? file (could not be found|has been deleted)' 
+    FILE_URL_REPLACEMENTS = [(r'(http://[^/]*).*', r'\1/en/')]
     
-    FILE_NAME_PATTERNS = (
-        r'">File name :</th>[\t\r\n ]+<td>(?P<name>.*?)</td>',
-        r">Click here to download (?P<name>.*?)</a>",
-        r"content=\"Download the file named (?P<name>.*?)\">", 
-        r"<title>Download the file\s*:\s*(?P<name>.*?)</title>"
-    )
-    FILE_SIZE_PATTERN = r"<th>File size :</th>\s+<td>(?P<size>[\d\.]*) (?P<units>\w+)</td>"
-    DOWNLOAD_LINK_PATTERN = r'<br/>&nbsp;<br/>&nbsp;<br/>&nbsp;\s+<a href="(?P<url>http://.*?)"'
-    FILE_OFFLINE_PATTERN = r"(The requested file could not be found|The file may has been deleted by its owner)"
+    DOWNLOAD_LINK_PATTERN = r'<br/>&nbsp;<br/>&nbsp;<br/>&nbsp;\s+<a href="(?P<url>http://.*?)"'       
     PASSWORD_PROTECTED_TOKEN = "protected by password"
     WAITING_TOKEN = "Please wait a few seconds"
-
-    def setup(self):
-        self.html = None
-        self.multiDL = False
-
-    def process(self, pyfile):
-
-        # Get main page (english version)
-        url = self.getEnglishURL()
-        self.html = self.load(url)  
-        self.handleErrors()
-        
-        # Get file info
-        pyfile.name = self.getFileName()
-        pyfile.size = self.getFileSize()
+    
+    def handleFree(self):
+        if self.WAITING_TOKEN in self.html:
+            self.waitAndRetry(60)
         
         # Check for protection 
         if self.isProtected():
@@ -86,33 +35,7 @@ class OneFichierCom(Hoster):
             self.download(downloadLink)
         
         # Check download 
-        self.handleDownloadedFile()
-
-    def getEnglishURL(self):
-        id = re.match(self.__pattern__, self.pyfile.url).group('id')
-        url = 'http://%s.1fichier.com/en' % id
-        return url
-
-    def getFileName(self):
-        for pattern in self.FILE_NAME_PATTERNS:
-            m = re.search(pattern, self.html)
-            if m is not None:
-                name = m.group('name').strip()
-                self.logDebug("Got file name [%s]" % name)
-                return name
-            
-    def getFileSize(self):
-        m = re.search(self.FILE_SIZE_PATTERN, self.html) 
-        if m is not None:
-            size = float(m.group('size'))
-            units = m.group('units')[0].upper()
-            try:
-                multiplier = 1024 ** {"K":1, "M":2, "G":3}[units]
-            except KeyError:
-                multiplier = 1
-            bytes = int(size * multiplier)
-            self.logDebug("Got file size of [%s] bytes" % bytes)
-            return bytes
+        self.checkDownloadedFile()
     
     def isProtected(self):
         if self.PASSWORD_PROTECTED_TOKEN in self.html:
@@ -126,16 +49,15 @@ class OneFichierCom(Hoster):
             url = m.group('url')
             self.logDebug("Got file URL [%s]" % url)
             return url
-        
-    def handleErrors(self):
-        if re.search(self.FILE_OFFLINE_PATTERN, self.html) is not None:
-            self.logDebug("File not yet available.")
-            self.offline()
             
-    def handleDownloadedFile(self):
+    def checkDownloadedFile(self):
         check = self.checkDownload({"wait": self.WAITING_TOKEN})
         if check == "wait":
-            wait = 5
-            self.setWait(wait, True)
-            self.wait()
-            self.retry()
\ No newline at end of file
+            self.waitAndRetry(60)
+    
+    def waitAndRetry(self, wait_time):
+        self.setWait(wait_time, True)
+        self.wait()
+        self.retry()
+        
+getInfo = create_getInfo(OneFichierCom)   
\ No newline at end of file
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index 9c9f502c3..6b699e39f 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -20,21 +20,21 @@ import re
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 def convertDecimalPrefix(m):
-    # decimal prefixes used in filesize and traffic     
-    return "%s%s%s B" % (m.group(1), m.group(2).ljust(3, '0') if m.group(2) else '000', {'k': '', 'M': '000', 'G': '000000'}[m.group(3)])
+    # decimal prefixes used in filesize and traffic
+    return ("%%.%df" % {'k':3,'M':6,'G':9}[m.group(2)] % float(m.group(1))).replace('.','')     
 
 class UlozTo(SimpleHoster):
     __name__ = "UlozTo"
     __type__ = "hoster"
     __pattern__ = r"http://(\w*\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/.*"
-    __version__ = "0.80"
+    __version__ = "0.81"
     __description__ = """uloz.to"""
     __author_name__ = ("zoidberg")
 
     FILE_NAME_PATTERN = r'<a share_url="[^&]*&amp;t=(?P<N>[^"]+)"'
     #FILE_NAME_PATTERN = r'<h2 class="nadpis" style="margin-left:196px;"><a href="[^"]+">(?P<N>[^<]+)</a></h2>'
     FILE_SIZE_PATTERN = r'<div class="info_velikost" style="top:-55px;">\s*<div>[^<]*\s+(?P<S>[0-9.]+\s[kMG]B)\s*</div>\s*</div>'   
-    FILE_SIZE_REPLACEMENTS = [('(\d+)\.?(\d+)? (\w)B', convertDecimalPrefix), (' ','')]       
+    FILE_SIZE_REPLACEMENTS = [('([0-9.]+)\s([kMG])B', convertDecimalPrefix)]       
     FILE_OFFLINE_PATTERN = r'http://www.uloz.to/(neexistujici|smazano|nenalezeno)'
     
     PASSWD_PATTERN = r'<input type="password" class="text" name="file_password" id="frmfilepasswordForm-file_password" />'
@@ -70,7 +70,7 @@ class UlozTo(SimpleHoster):
         if re.search(self.VIPLINK_PATTERN, self.html):
             self.html = self.load(pyfile.url, get={"disclaimer": "1"})
         
-        if self.premium and self.checkCredit():
+        if self.premium and self.checkTrafficLeft():
             self.handlePremium()
         else: 
             self.handleFree()
@@ -97,7 +97,7 @@ class UlozTo(SimpleHoster):
         self.log.debug('CAPTCHA_URL:' + captcha_url + ' CAPTCHA:' + captcha + ' CAPTCHA_NB:' + captcha_nb)
 
         # download and check        
-        self.download(parsed_url, post={"captcha_user": captcha, "captcha_nb": captcha_nb}, cookies=True, disposition = True)
+        self.download(parsed_url, post={"captcha_user": captcha, "captcha_nb": captcha_nb}, cookies=True)
         self.doCheckDownload()   
         
         self.setStorage("captchaUser", captcha)
@@ -105,7 +105,7 @@ class UlozTo(SimpleHoster):
     
     def handlePremium(self):
         parsed_url = self.findDownloadURL(premium=True)
-        self.download(parsed_url, disposition = True)
+        self.download(parsed_url)
         self.doCheckDownload()
         
     def findDownloadURL(self, premium=False):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index d4d74057e..12b629a81 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -20,13 +20,14 @@ from urlparse import urlparse
 import re
 
 from module.plugins.Hoster import Hoster
-from module.utils import html_unescape, parseFileSize
+from module.utils import html_unescape, fixup, parseFileSize
 from module.network.RequestFactory import getURL
 
 def reSub(string, ruleslist):
     for r in ruleslist:
         rf, rt = r
         string = re.sub(rf, rt, string)
+        #self.logDebug(rf, rt, string)
     return string
     
 def parseHtmlTagAttrValue(attr_name, tag):
@@ -81,7 +82,7 @@ class PluginParseError(Exception):
 
 class SimpleHoster(Hoster):
     __name__ = "SimpleHoster"
-    __version__ = "0.15"
+    __version__ = "0.16"
     __pattern__ = None
     __type__ = "hoster"
     __description__ = """Base hoster plugin"""
@@ -97,7 +98,7 @@ class SimpleHoster(Hoster):
     """
 
     FILE_SIZE_REPLACEMENTS = []
-    FILE_NAME_REPLACEMENTS = []
+    FILE_NAME_REPLACEMENTS = [("&#?\w+;", fixup)]
     FILE_URL_REPLACEMENTS = []
 
     def setup(self):
@@ -107,7 +108,7 @@ class SimpleHoster(Hoster):
         pyfile.url = reSub(pyfile.url, self.FILE_URL_REPLACEMENTS)
         self.html = self.load(pyfile.url, decode = True)
         self.file_info = self.getFileInfo()
-        if self.account:
+        if self.premium:
             self.handlePremium()
         else:
             self.handleFree()
@@ -156,4 +157,10 @@ class SimpleHoster(Hoster):
                 name = parseHtmlTagAttrValue("name", input.group(1))
                 if name:
                     inputs[name] = parseHtmlTagAttrValue("value", input.group(1)) 
-        return action, inputs
\ No newline at end of file
+        return action, inputs
+    
+    def checkTrafficLeft(self):                   
+        traffic = self.account.getAccountInfo(self.user, True)["trafficleft"]
+        size = self.pyfile.size / 1024
+        self.logInfo("Filesize: %i KiB, Traffic left for user %s: %i KiB" % (size, self.user, traffic))               
+        return  size <= traffic
\ No newline at end of file
-- 
cgit v1.2.3


From 3969802f78f80801979999c6ae258301a12e8fa9 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Thu, 12 Jan 2012 18:08:58 +0100
Subject: fix easybytez.com

---
 module/plugins/hoster/EasybytezCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index 3ee2e9ba5..4fbd08756 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -24,7 +24,7 @@ class EasybytezCom(SimpleHoster):
     __name__ = "EasybytezCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?easybytez.com/(\w+).*"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __description__ = """easybytez.com"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -38,7 +38,7 @@ class EasybytezCom(SimpleHoster):
     
     FORM_INPUT_PATTERN = r'<input[^>]* name="([^"]+)"[^>]*value="([^"]*)"'
     WAIT_PATTERN = r'<span id="countdown_str">[^>]*>(\d+)</span> seconds</span>'
-    DIRECT_LINK_PATTERN = r'(http://\w+\.easybytez\.com/files/\d+/\w+/[^"<]+)'
+    DIRECT_LINK_PATTERN = r'(http://(\w+\.easybytez\.com|\d+\.\d+\.\d+\.\d+)/files/\d+/\w+/[^"<]+)'
 
     FORM_PATTERN = r'<form name=["\']?%s[^>]*action=["\']?([^"\' ]+)(.*?)</form>'
     OVR_DOWNLOAD_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
-- 
cgit v1.2.3


From 6f1ba8a555516fdf922378f46add35d14eeea76c Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Fri, 13 Jan 2012 13:21:33 +0100
Subject: fix filesonic

---
 module/plugins/hoster/FilesonicCom.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index 736b5b96b..2788e7c62 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -3,6 +3,7 @@
 
 import re
 import string
+from urllib import unquote
 
 from module.plugins.Hoster import Hoster
 from module.plugins.ReCaptcha import ReCaptcha
@@ -30,7 +31,7 @@ def getInfo(urls):
                 if item["status"] != "AVAILABLE":
                     result.append((ids[str(item["id"])], 0, 1, ids[str(item["id"])]))
                 else:
-                    result.append((item["filename"], item["size"], 2, ids[str(item["id"])]))
+                    result.append((unquote(item["filename"]), item["size"], 2, ids[str(item["id"])]))
         yield result
 
 
@@ -46,7 +47,7 @@ class FilesonicCom(Hoster):
     __name__ = "FilesonicCom"
     __type__ = "hoster"
     __pattern__ = r"http://[\w\.]*?(sharingmatrix|filesonic)\..*?/.*?file/([a-zA-Z0-9]+(/.+)?|[a-z0-9]+/[0-9]+(/.+)?|[0-9]+(/.+)?)"
-    __version__ = "0.34"
+    __version__ = "0.35"
     __description__ = """FilesonicCom und Sharingmatrix Download Hoster"""
     __author_name__ = ("jeix", "paulking")
     __author_mail__ = ("jeix@hasnomail.de", "")
@@ -54,7 +55,7 @@ class FilesonicCom(Hoster):
     API_ADDRESS = "http://api.filesonic.com"
     URL_DOMAIN_PATTERN = r'(?P<prefix>.*?)(?P<domain>.(filesonic|sharingmatrix)\..+?)(?P<suffix>/.*)'
     FILE_ID_PATTERN = r'/file/(?P<id>([a-z][0-9]+/)?[a-zA-Z0-9\-._+]+)(/.*)?' #change may break wupload - be careful
-    FILE_LINK_PATTERN = r'<a href="(http://.+?\.(filesonic|sharingmatrix)\..+?)" class="downloadLink"><span>Start Download'
+    FILE_LINK_PATTERN = r'Your download is ready</p>\s*<a href="(http://[^"]+)'
     WAIT_TIME_PATTERN = r'countDownDelay = (?P<wait>\d+)'
     WAIT_TM_PATTERN = r"name='tm' value='(.*?)' />"
     WAIT_TM_HASH_PATTERN = r"name='tm_hash' value='(.*?)' />"
@@ -97,7 +98,7 @@ class FilesonicCom(Hoster):
             #if item["is_premium_only"] != 0 and not self.premium:
             #    self.fail("need premium account for file")
 
-            self.pyfile.name = item["filename"]
+            self.pyfile.name = unquote(item["filename"])
 
             # Fix the url and resolve the domain to the correct regional variation
             url = item["url"]
-- 
cgit v1.2.3


From 904f24ba78d6fd4a24dd78f667f4e7e92a5bac6d Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sat, 14 Jan 2012 22:02:58 +0100
Subject: additional extract logs

---
 module/plugins/hooks/ExtractArchive.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index b7960620d..c789495ca 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -58,7 +58,7 @@ class ExtractArchive(Hook):
     Provides: unrarFinished (folder, filename)
     """
     __name__ = "ExtractArchive"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __description__ = "Extract different kind of archives"
     __config__ = [("activated", "bool", "Activated", True),
         ("fullpath", "bool", "Extract full path", True),
@@ -160,6 +160,7 @@ class ExtractArchive(Hook):
                     makedirs(out)
 
             files_ids = [(save_join(dl, p.folder, x["name"]), x["id"]) for x in p.getChildren().itervalues()]
+            matched = False
 
             # check as long there are unseen files
             while files_ids:
@@ -167,7 +168,9 @@ class ExtractArchive(Hook):
 
                 for plugin in self.plugins:
                     targets = plugin.getTargets(files_ids)
-                    if targets: self.logDebug("Targets for %s: %s" % (plugin.__name__, targets))
+                    if targets:
+                        self.logDebug("Targets for %s: %s" % (plugin.__name__, targets))
+                        matched = True
                     for target, fid in targets:
                         if target in extracted:
                             self.logDebug(basename(target), "skipped")
@@ -192,6 +195,9 @@ class ExtractArchive(Hook):
 
                 files_ids = new_files_ids # also check extracted files
 
+            if not matched: self.logInfo(_("No files found to extract"))
+	
+
 
     def startExtracting(self, plugin, fid, passwords, thread):
         pyfile = self.core.files.getFile(fid)
-- 
cgit v1.2.3


From 8b569a22d9a5b12cc492e97d4cee28deb75a81ed Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Mon, 16 Jan 2012 17:39:27 +0100
Subject: workaround premium4.me overcharging

---
 module/plugins/accounts/Premium4Me.py     | 6 +++---
 module/plugins/accounts/ShareonlineBiz.py | 7 ++++---
 module/plugins/hoster/BezvadataCz.py      | 2 +-
 module/plugins/hoster/Premium4Me.py       | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'module')

diff --git a/module/plugins/accounts/Premium4Me.py b/module/plugins/accounts/Premium4Me.py
index c8c4064ef..de4fdc219 100644
--- a/module/plugins/accounts/Premium4Me.py
+++ b/module/plugins/accounts/Premium4Me.py
@@ -2,7 +2,7 @@ from module.plugins.Account import Account
 
 class Premium4Me(Account):
     __name__ = "Premium4Me"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __type__ = "account"
     __description__ = """Premium4.me account plugin"""
     __author_name__ = ("RaNaN", "zoidberg")
@@ -17,7 +17,7 @@ class Premium4Me(Account):
         return account_info
 
     def login(self, user, data, req):
-        self.authcode = req.load("http://premium4.me/api/getauthcode.php?username=%s&password=%s" % (user, data["password"]))[:-1]
-
+        self.authcode = req.load("http://premium4.me/api/getauthcode.php?username=%s&password=%s" % (user, data["password"])).strip()
+        
         if "wrong username" in self.authcode:
             self.wrongPassword()
\ No newline at end of file
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py
index 967142204..426f5a6a9 100644
--- a/module/plugins/accounts/ShareonlineBiz.py
+++ b/module/plugins/accounts/ShareonlineBiz.py
@@ -23,7 +23,7 @@ import re
 
 class ShareonlineBiz(Account):
     __name__ = "ShareonlineBiz"
-    __version__ = "0.2"
+    __version__ = "0.21"
     __type__ = "account"
     __description__ = """share-online.biz account plugin"""
     __author_name__ = ("mkaay")
@@ -33,8 +33,9 @@ class ShareonlineBiz(Account):
         src = req.load("http://api.share-online.biz/account.php?username=%s&password=%s&act=userDetails" % (user, self.accounts[user]["password"]))
         info = {}
         for line in src.splitlines():
-            key, value = line.split("=")
-            info[key] = value
+            if "=" in line:
+                key, value = line.split("=")
+                info[key] = value
         return info
     
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index f061fa2b5..680bbc173 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -29,7 +29,7 @@ class BezvadataCz(SimpleHoster):
     __author_mail__ = ("zoidberg@mujmail.cz")
 
     FILE_NAME_PATTERN = r'<p><b>Soubor: (?P<N>[^<]+)</b></p>'
-    FILE_SIZE_PATTERN = r'<li><strong>Velikost:</strong> (?P<S>[0-9.]+) (?P<U>[kKMG])i?)</li>'
+    FILE_SIZE_PATTERN = r'<li><strong>Velikost:</strong> (?P<S>[^<]+)</li>'
     FILE_OFFLINE_PATTERN = r'<title>BezvaData \| Soubor nenalezen</title>'
     DOWNLOAD_FORM_PATTERN = r'<form class="download" action="([^"]+)" method="post" id="frm-stahnoutForm">'
 
diff --git a/module/plugins/hoster/Premium4Me.py b/module/plugins/hoster/Premium4Me.py
index beccdf572..d029b3df1 100644
--- a/module/plugins/hoster/Premium4Me.py
+++ b/module/plugins/hoster/Premium4Me.py
@@ -6,7 +6,7 @@ from module.plugins.Hoster import Hoster
 
 class Premium4Me(Hoster):
     __name__ = "Premium4Me"
-    __version__ = "0.02"
+    __version__ = "0.03"
     __type__ = "hoster"
 
     __pattern__ = r"http://premium4.me/.*"
@@ -16,6 +16,7 @@ class Premium4Me(Hoster):
 
     def setup(self):
         self.resumeDownload = True
+        self.chunkLimit = 1
 
     def process(self, pyfile):
         if not self.account:
-- 
cgit v1.2.3


From 230147695a21b447273b7207f1370358600dc494 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Mon, 16 Jan 2012 23:41:31 +0100
Subject: megashares.com premium

---
 module/plugins/accounts/MegasharesCom.py | 42 ++++++++++++++++++++++++++++
 module/plugins/hoster/MegasharesCom.py   | 48 +++++++++++++++++++-------------
 2 files changed, 70 insertions(+), 20 deletions(-)
 create mode 100644 module/plugins/accounts/MegasharesCom.py

(limited to 'module')

diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py
new file mode 100644
index 000000000..91601fc95
--- /dev/null
+++ b/module/plugins/accounts/MegasharesCom.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.Account import Account
+import re
+from time import mktime, strptime
+
+class MegasharesCom(Account):
+    __name__ = "MegasharesCom"
+    __version__ = "0.02"
+    __type__ = "account"
+    __description__ = """megashares.com account plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")
+    
+    VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>'
+    
+    def loadAccountInfo(self, user, req):
+        #self.relogin(user)
+        html = req.load("http://d01.megashares.com/myms.php", decode = True)
+                    
+        premium = False if '>Premium Upgrade<' in html else True
+        
+        validuntil = trafficleft = -1
+        try:             
+            timestr = re.search(self.VALID_UNTIL_PATTERN, html).group(1)
+            self.logDebug(timestr)
+            validuntil = mktime(strptime(timestr, "%b %d, %Y"))
+        except Exception, e:
+            self.logError(e)                          
+         
+        return {"validuntil": validuntil, "trafficleft": -1, "premium": premium}
+    
+    def login(self, user, data, req):
+        html = req.load('http://d01.megashares.com/myms_login.php', post = {
+            "httpref":	"",
+            "myms_login":	"Login",
+            "mymslogin_name": user,
+            "mymspassword": data['password']
+            }, decode = True)
+        
+        if not '<span class="b ml">%s</span>' % user in html:
+            self.wrongPassword()
\ No newline at end of file
diff --git a/module/plugins/hoster/MegasharesCom.py b/module/plugins/hoster/MegasharesCom.py
index a1dd6e694..3fac633bc 100644
--- a/module/plugins/hoster/MegasharesCom.py
+++ b/module/plugins/hoster/MegasharesCom.py
@@ -19,20 +19,19 @@
 import re
 from time import time
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.network.RequestFactory import getURL
 
 class MegasharesCom(SimpleHoster):
     __name__ = "MegasharesCom"
     __type__ = "hoster"
     __pattern__ = r"http://(\w+\.)?megashares.com/.*"
-    __version__ = "0.13"
+    __version__ = "0.21"
     __description__ = """megashares.com plugin - free only"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
     FILE_NAME_PATTERN = '<h1 class="black xxl"[^>]*title="(?P<N>[^"]+)">'
     FILE_SIZE_PATTERN = '<strong><span class="black">Filesize:</span></strong> (?P<S>[0-9.]+) (?P<U>[kKMG])i?B<br />'
-    DOWNLOAD_URL_PATTERN = '<div id="show_download_button_2" style="display:none">\s*<a href="([^"]+)">'
+    DOWNLOAD_URL_PATTERN = '<div id="show_download_button_%d"[^>]*>\s*<a href="([^"]+)">'
     PASSPORT_LEFT_PATTERN = 'Your Download Passport is: <[^>]*>(\w+).*\s*You have\s*<[^>]*>\s*([0-9.]+) ([kKMG]i?B)'
     PASSPORT_RENEW_PATTERN = 'Your download passport will renew in\s*<strong>(\d+)</strong>:<strong>(\d+)</strong>:<strong>(\d+)</strong>'
     REACTIVATE_NUM_PATTERN = r'<input[^>]*id="random_num" value="(\d+)" />'
@@ -41,15 +40,21 @@ class MegasharesCom(SimpleHoster):
     NO_SLOTS_PATTERN = r'<dd class="red">All download slots for this link are currently filled'
     FILE_OFFLINE_PATTERN = r'<dd class="red">(Invalid Link Request|Link has been deleted)'
 
-    def process(self, pyfile):
-        self.html = self.load(pyfile.url, decode=True)
+    def setup(self):
+        self.resumeDownload = True
+        self.multiDL = True if self.premium else False
+       
+    def handlePremium(self):
+        self.handleDownload(True)
+
+    def handleFree(self):
+        self.html = self.load(self.pyfile.url, decode=True)
+        
         if self.NO_SLOTS_PATTERN in self.html:
             self.retry(wait_time = 300)
+        
         self.getFileInfo()
-        self.handleFree()
-
-    def handleFree(self):
-        if self.pyfile.size > 576716800: self.fail("This file is too large for free download")
+        #if self.pyfile.size > 576716800: self.fail("This file is too large for free download")
 
         # Reactivate passport if needed
         found = re.search(self.REACTIVATE_PASSPORT_PATTERN, self.html)
@@ -82,19 +87,22 @@ class MegasharesCom(SimpleHoster):
         self.logInfo("Download passport: %s" % found.group(1))
         data_left = float(found.group(2)) * 1024 ** {'KB': 1, 'MB': 2, 'GB': 3}[found.group(3)]
         self.logInfo("Data left: %s %s (%d MB needed)" % (found.group(2), found.group(3), self.pyfile.size / 1048576))
-        if self.pyfile.size > data_left:
+        
+        if not data_left:
             found = re.search(self.PASSPORT_RENEW_PATTERN, self.html)
-            if not found: self.fail('Passport renew time not found')
-            renew = found.group(1) + 60 * (found.group(2) + 60 * found.group(3))
-            self.retry(renew, 3, "Unable to get passport")
-
-        # Find download link
-        found = re.search(self.DOWNLOAD_URL_PATTERN, self.html)
-        if not found: self.fail('Download link not found')
+            renew = (found.group(1) + 60 * (found.group(2) + 60 * found.group(3))) if found else 600
+            self.retry(renew, 15, "Unable to get passport")
+            
+        self.handleDownload(False)
+    
+    def handleDownload(self, premium = False): 
+        # Find download link;
+        found = re.search(self.DOWNLOAD_URL_PATTERN % (1 if premium else 2), self.html)
+        msg = '%s download URL' % ('Premium' if premium else 'Free')
+        if not found: self.parseError(msg)
+        
         download_url = found.group(1)
-
-        # Download
-        self.logDebug("Download URL: %s" % download_url)
+        self.logDebug("%s: %s" % (msg, download_url))
         self.download(download_url)
 
 getInfo = create_getInfo(MegasharesCom)
\ No newline at end of file
-- 
cgit v1.2.3


From 5bd49e7478992109451ccda6472d440b4a7faba6 Mon Sep 17 00:00:00 2001
From: CryNickSystems <d.hardtke@yahoo.de>
Date: Tue, 17 Jan 2012 19:40:24 +0100
Subject: Oron.com Folder Plugin

---
 module/plugins/hoster/OronCom.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module')

diff --git a/module/plugins/hoster/OronCom.py b/module/plugins/hoster/OronCom.py
index 0b547e516..2b9f42798 100755
--- a/module/plugins/hoster/OronCom.py
+++ b/module/plugins/hoster/OronCom.py
@@ -32,9 +32,9 @@ def getInfo(urls):
 class OronCom(Hoster):
     __name__ = "OronCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:www.)?oron.com/"
-    __version__ = "0.14"
-    __description__ = "File Hoster: Oron.com"
+    __pattern__ = r"http://(?:www.)?oron.com/(?!folder)\w+"
+    __version__ = "0.15"
+    __description__ = "Oron.com Hoster Plugin"
     __author_name__ = ("chrox", "DHMH")
     __author_mail__ = ("chrox@pyload.org", "webmaster@pcProfil.de")
 
-- 
cgit v1.2.3


From b190e1d64872740d08cb9c693a528499eecc0638 Mon Sep 17 00:00:00 2001
From: CryNickSystems <d.hardtke@yahoo.de>
Date: Tue, 17 Jan 2012 19:46:04 +0100
Subject: Oron.com Folder Plugin

---
 module/plugins/crypter/OronComFolder.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 module/plugins/crypter/OronComFolder.py

(limited to 'module')

diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py
new file mode 100755
index 000000000..57b273163
--- /dev/null
+++ b/module/plugins/crypter/OronComFolder.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+import re 
+
+from module.plugins.Crypter import Crypter
+
+class OronComFolder(Crypter):
+    __name__ = "OronComFolder"
+    __type__ = "crypter"
+    __pattern__ = r"http://(?:www\.)?oron.com/folder/\w+"
+    __version__ = "0.1"
+    __description__ = """Oron.com Folder Plugin"""
+    __author_name__ = ("DHMH")
+    __author_mail__ = ("webmaster@pcProfil.de")
+
+    FOLDER_PATTERN = r'<table width="100%" cellpadding="7" cellspacing="1" class="tbl2">(.*)</table>\n		</div>'
+    LINK_PATTERN = r'<a href="([^"]+)" target="_blank">'
+
+    def decrypt(self, pyfile):
+        html = self.load(self.pyfile.url)
+
+        new_links = []
+
+        folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
+        if folder is None: self.fail("Parse error (FOLDER)")
+        
+        new_links.extend(re.findall(self.LINK_PATTERN, folder.group(0)))
+        
+        if new_links:
+            self.core.files.addLinks(new_links, self.pyfile.package().id)
+        else:
+            self.fail('Could not extract any links')
\ No newline at end of file
-- 
cgit v1.2.3


From aa4c4955b1b4c98b437006db545a5399ecdb25c5 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Thu, 19 Jan 2012 23:56:56 +0100
Subject: undelete DlFreeFr

---
 module/plugins/hoster/DlFreeFr.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 module/plugins/hoster/DlFreeFr.py

(limited to 'module')

diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py
new file mode 100644
index 000000000..138d0e056
--- /dev/null
+++ b/module/plugins/hoster/DlFreeFr.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import re
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+class DlFreeFr(SimpleHoster):
+    __name__ = "DlFreeFr"
+    __type__ = "hoster"
+    __pattern__ = r"http://dl\.free\.fr/([a-zA-Z0-9]+|getfile\.pl\?file=/[a-zA-Z0-9]+)$"
+    __version__ = "0.2"
+    __description__ = """dl.free.fr download hoster"""
+    __author_name__ = ("the-razer", "zoidberg")
+    __author_mail__ = ("daniel_ AT gmx DOT net", "zoidberg@mujmail.cz")
+       
+    FILE_NAME_PATTERN = r"Fichier:</td>\s*<td[^>]*>(?P<N>[^>]*)</td>"
+    FILE_SIZE_PATTERN = r"Taille:</td>\s*<td[^>]*>(?P<S>[\d.]+[KMG])</td>"
+    FILE_OFFLINE_PATTERN = r"Erreur 404 - Document non trouv|Fichier inexistant|Le fichier demand&eacute; n'a pas &eacute;t&eacute; trouv&eacute;"
+    FILE_URL_PATTERN = r'href="(?P<url>http://.*?)">T&eacute;l&eacute;charger ce fichier'
+    
+    def setup(self):
+        self.multiDL = True
+        self.limitDL = 5
+        self.resumeDownload = True
+        self.chunkLimit = 1
+
+    def handleFree(self):
+        if "Trop de slots utilis&eacute;s" in self.html:
+            self.retry(300)
+        
+        m = re.search(self.FILE_URL_PATTERN, self.html)
+        if not m: self.parseError('URL')
+        
+        url = m.group('url')
+        self.logDebug("File URL [%s]" % url)
+        self.download(url)
+
+getInfo = create_getInfo(DlFreeFr)   
\ No newline at end of file
-- 
cgit v1.2.3