From 9808c90314ded2d8bdaab636eb5ea750b4fa6aa9 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 20 Sep 2010 17:27:26 +0200 Subject: little fixes --- module/plugins/Plugin.py | 2 ++ module/plugins/hooks/ClickAndLoad.py | 7 ++++++- module/plugins/hoster/FileserveCom.py | 17 ++++++++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) (limited to 'module/plugins') diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 77e4e8183..e8ef15202 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -272,3 +272,5 @@ class Plugin(object): if self.core.config["permission"]["change_file"]: chmod(join(location, name), int(self.core.config["permission"]["file"],8)) + + return join(location, name) \ No newline at end of file diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py index f0372dbf8..0ca492cb7 100644 --- a/module/plugins/hooks/ClickAndLoad.py +++ b/module/plugins/hooks/ClickAndLoad.py @@ -64,7 +64,12 @@ def server(self, *settings): thread.start_new_thread(forward, (client_socket, server_socket)) thread.start_new_thread(forward, (server_socket, client_socket)) except socket.error, e: - if e.errno == 98: + if hasattr(e, "errno"): + errno = e.errno + else: + errno = e.args[0] + + if errno == 98: self.core.log.warning(_("Click'N'Load: Port 9666 already in use")) return thread.start_new_thread(server, (self,)+settings) diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py index adf62434d..c2deb3751 100644 --- a/module/plugins/hoster/FileserveCom.py +++ b/module/plugins/hoster/FileserveCom.py @@ -2,6 +2,7 @@ import re +from os import stat from os.path import join from module.plugins.Hoster import Hoster @@ -93,7 +94,21 @@ class FileserveCom(Hoster): self.load(self.pyfile.url, post={"downloadLink":"show"}) self.load(self.pyfile.url, post={"download":"normal"}, just_header=True) - self.download(self.pyfile.url, post={"download":"normal"}) + dl = self.download(self.pyfile.url, post={"download":"normal"}) + + size = stat(dl) + size = size.st_size + + if size < 40000: + f = open(dl, "rb") + content = f.read() + m = re.search(r'', content) + if m is not None: + self.setWait(720) + self.wantReconnect = True + self.wait() + self.handleFree() + return #TODO: validate download it could be html file with errors -- cgit v1.2.3