From eaaeb5ed2141cda9491f1d8feda8dfaf0faf6116 Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Mon, 6 Feb 2012 18:10:19 +0100
Subject: fix zippyshare, 1fichier, uloz.to live, add some hoster

---
 module/plugins/hoster/DepositfilesCom.py | 36 +++++++-------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

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

diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 87e5e7254..c5cca6409 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -3,50 +3,26 @@
 
 import re
 from urllib import unquote
-from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 from module.network.RequestFactory import getURL
 from module.plugins.ReCaptcha import ReCaptcha
 
-def getInfo(urls):
-    result = []
-
-    for url in urls:
-        file_info = parseFileInfo(DepositfilesCom, url, getURL(re.sub(r"\.com(/.*?)?/files", ".com/en/files", url), decode=True)) 
-        result.append(file_info)
-            
-    yield result
-
 class DepositfilesCom(SimpleHoster):
     __name__ = "DepositfilesCom"
     __type__ = "hoster"
     __pattern__ = r"http://[\w\.]*?depositfiles\.com(/\w{1,3})?/files/[\w]+"
-    __version__ = "0.36"
+    __version__ = "0.37"
     __description__ = """Depositfiles.com Download Hoster"""
     __author_name__ = ("spoob", "zoidberg")
     __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz")
 
     FILE_INFO_PATTERN = r'File name: <b title="(?P<N>[^"]+)">.*\s*<span class="nowrap">File size: <b>(?P<S>[0-9.]+)&nbsp;(?P<U>[kKMG])i?B</b>'
     FILE_OFFLINE_PATTERN = r'<span class="html_download_api-not_exists"></span>'
+    FILE_URL_REPLACEMENTS = [(r"\.com(/.*?)?/files", ".com/en/files"), (r"\.html$", "")]
+    
     RECAPTCHA_PATTERN = r"Recaptcha.create\('([^']+)', this\);"
     DOWNLOAD_LINK_PATTERN = r'<form action="(http://.+?\.depositfiles.com/.+?)" method="get"'
 
-    def setup(self):
-        self.resumeDownload = self.multiDL = True if self.account else False
-
-        self.pyfile.url = re.sub(r"\.com(/.*?)?/files", ".com/en/files", self.pyfile.url)
-
-    def process(self, pyfile):
-        if re.search(r"(.*)\.html", self.pyfile.url):
-            self.pyfile.url = re.search(r"(.*)\.html", self.pyfile.url).group(1)
-
-        self.html = self.load(self.pyfile.url, cookies=True if self.account else False, decode = True)
-        self.getFileInfo()
-
-        if self.account:
-            self.handlePremium()
-        else:
-            self.handleFree()
-
     def handleFree(self):
         self.html = self.load(self.pyfile.url, post={"gateway_result":"1"})
         if re.search(self.FILE_OFFLINE_PATTERN, self.html): self.offline()
@@ -117,4 +93,6 @@ class DepositfilesCom(SimpleHoster):
 
     def handlePremium(self):
         link = unquote(re.search('<div id="download_url">\s*<a href="(http://.+?\.depositfiles.com/.+?)"', self.html).group(1))
-        self.download(link)
\ No newline at end of file
+        self.download(link)
+
+getInfo = create_getInfo(DepositfilesCom)
\ No newline at end of file
-- 
cgit v1.2.3