diff options
author | RaNaN <Mast3rRaNaN@hotmail.de> | 2011-01-19 18:18:25 +0100 |
---|---|---|
committer | RaNaN <Mast3rRaNaN@hotmail.de> | 2011-01-19 18:18:25 +0100 |
commit | eb9a72aeda45be2370522d79f686f0f43d973fa5 (patch) | |
tree | b27f55268a8d8a5e5b7bde91da74b2f309ee020a /module | |
parent | new cryptit plugin (diff) | |
download | pyload-eb9a72aeda45be2370522d79f686f0f43d973fa5.tar.xz |
fixed cleanup
Diffstat (limited to 'module')
-rw-r--r-- | module/PyFile.py | 2 | ||||
-rw-r--r-- | module/ThreadManager.py | 3 | ||||
-rw-r--r-- | module/plugins/crypter/CryptItCom.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/module/PyFile.py b/module/PyFile.py index 68b25fd58..1a574d51d 100644 --- a/module/PyFile.py +++ b/module/PyFile.py @@ -123,6 +123,8 @@ class PyFile(): if hasattr(self, "plugin") and self.plugin: self.plugin.clean() del self.plugin + if hasattr(self.progress, "notify"): + del self.progress.notify self.m.releaseLink(self.id) diff --git a/module/ThreadManager.py b/module/ThreadManager.py index 6a1802b9e..8e92c1a6e 100644 --- a/module/ThreadManager.py +++ b/module/ThreadManager.py @@ -125,7 +125,6 @@ class ThreadManager: while [x.active.plugin.waiting for x in self.threads if x.active].count(True) != 0: sleep(0.25) - sleep(0.25) ip = self.getIP() @@ -184,7 +183,7 @@ class ThreadManager: def cleanPycurl(self): - """ make a global curl cleanup (currently ununused """ + """ make a global curl cleanup (currently ununused) """ if self.downloadingIds() or self.processingIds(): return False pycurl.global_cleanup() diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py index 6d3e8d433..4935758c7 100644 --- a/module/plugins/crypter/CryptItCom.py +++ b/module/plugins/crypter/CryptItCom.py @@ -31,7 +31,7 @@ class CryptItCom(Crypter): repl_pattern = r"/(s|e|d|c)/" url = re.sub(repl_pattern, r"/d/", self.pyfile.url) - pyfile.name = "cryptit_%s_tmp.ccf" % randint(0,1000) + pyfile.name = "tmp_cryptit_%s.ccf" % randint(0,1000) location = self.download(url) self.packages.append(["Crypt-it Package", [location], "Crypt-it Package"]) |