summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar spoob <spoob@gmx.de> 2010-04-07 20:05:59 +0200
committerGravatar spoob <spoob@gmx.de> 2010-04-07 20:05:59 +0200
commit90066c3ff7b923ee4d8d313668b1546368443c3e (patch)
treea4601f19fd7ce8700cbc49f029f4b9ee78eedf77
parentServer Error in Log (diff)
downloadpyload-90066c3ff7b923ee4d8d313668b1546368443c3e.tar.xz
Fixed #92
-rw-r--r--module/plugins/hoster/DepositfilesCom.py37
-rwxr-xr-xpyLoadCore.py3
2 files changed, 6 insertions, 34 deletions
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 6c5748096..11c202013 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -20,43 +20,16 @@ class DepositfilesCom(Plugin):
self.props = props
self.parent = parent
self.html = None
- self.want_reconnect = False
self.multi_dl = False
- def download_html(self):
- url = self.parent.url
- self.html = self.req.load(url)
-
def get_file_url(self):
- """ returns the absolute downloadable filepath
- """
- if self.html == None:
- self.download_html()
- if not self.want_reconnect:
- file_url = urllib.unquote(re.search('<form action="(http://.*\.depositfiles.com/.*)" method="get" onSubmit="download_started', self.html).group(1))
- return file_url
- else:
- return False
+ return urllib.unquote(re.search('<form action="(http://.+?\.depositfiles.com/.+?)" method="get"', self.html).group(1))
def get_file_name(self):
- if self.html == None:
- self.download_html()
- if not self.want_reconnect:
- file_name = re.search('File name: <b title="(.*)">', self.html).group(1)
- return file_name
- else:
- return self.parent.url
+ return re.search('File name: <b title="(.*)">', self.html).group(1)
def file_exists(self):
- """ returns True or False
- """
- if self.html == None:
- self.download_html()
- if re.search(r"Such file does not exist or it has been removed for infringement of copyrights.", self.html) != None:
+ self.html = self.req.load(self.parent.url)
+ if re.search(r"Such file does not exist or it has been removed for infringement of copyrights", self.html) != None:
return False
- else:
- return True
-
- def proceed(self, url, location):
-
- self.req.download(url, location, cookies=True)
+ return True
diff --git a/pyLoadCore.py b/pyLoadCore.py
index f2e067a43..5dc8d00b9 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -266,7 +266,7 @@ class Core(object):
pass
freeSpace = self.freeSpace()
- if freeSpace > 10 * 1024:
+ if freeSpace > 5 * 1024:
self.logger.info(_("Free space: %sGB") % (freeSpace / 1024))
else:
self.logger.info(_("Free space: %sMB") % self.freeSpace())
@@ -305,7 +305,6 @@ class Core(object):
import traceback
traceback.print_exc()
-
def init_webserver(self):
if self.config['webinterface']['activated']:
self.webserver = WebServer(self)