diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-08-02 15:17:24 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-08-02 15:17:24 +0200 |
| commit | 58f38f399387b44b956e785e1d578d0f621354e6 (patch) | |
| tree | 8e9a6bb9f659db8f58d73b0c416572a8212abfcf /module/plugins | |
| parent | youtube, new file format (diff) | |
| download | pyload-58f38f399387b44b956e785e1d578d0f621354e6.tar.xz | |
fixes, cleanup, summary for each package
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/Plugin.py | 2 | ||||
| -rw-r--r-- | module/plugins/container/CCF.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/MergeFiles.py | 5 | ||||
| -rw-r--r-- | module/plugins/hooks/UnRar.py | 5 |
4 files changed, 6 insertions, 8 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index c1b6684af..94e2b0aca 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -456,7 +456,7 @@ class Plugin(object): try: newname = self.req.httpDownload(url, filename, get=get, post=post, ref=ref, cookies=cookies, chunks=self.getChunkCount(), resume=self.resumeDownload, - progressNotify=self.pyfile.progress.setValue, disposition=disposition) + progressNotify=self.pyfile.setProgress, disposition=disposition) finally: self.pyfile.size = self.req.size diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index d7da2f93b..301b033d4 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -13,7 +13,7 @@ from os.path import exists, join class CCF(Container): __name__ = "CCF" __version__ = "0.2" - __pattern__ = r"(?!http://).*\.ccf" + __pattern__ = r"(?!http://).*\.ccf$" __description__ = """CCF Container Convert Plugin""" __author_name__ = ("Willnix") __author_mail__ = ("Willnix@pyload.org") diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py index b4c98df08..02d343096 100644 --- a/module/plugins/hooks/MergeFiles.py +++ b/module/plugins/hooks/MergeFiles.py @@ -67,7 +67,6 @@ class MergeFiles(Hook): self.core.log.debug("Merging part %s" % splitted_file) pyfile = self.core.files.getFile(fid_dict[splitted_file]) pyfile.setStatus("processing") - pyfile.progress.setRange(0, 100) try: s_file = open(os.path.join(download_folder, splitted_file), "rb") size_written = 0 @@ -77,7 +76,7 @@ class MergeFiles(Hook): if f_buffer: final_file.write(f_buffer) size_written += BUFFER_SIZE - pyfile.progress.setValue((size_written*100)/s_file_size) + pyfile.setProgress((size_written*100)/s_file_size) else: break s_file.close() @@ -85,7 +84,7 @@ class MergeFiles(Hook): except Exception, e: print traceback.print_exc() finally: - pyfile.progress.setValue(100) + pyfile.setProgress(100) pyfile.setStatus("finished") pyfile.release() diff --git a/module/plugins/hooks/UnRar.py b/module/plugins/hooks/UnRar.py index c636664ee..778ae669c 100644 --- a/module/plugins/hooks/UnRar.py +++ b/module/plugins/hooks/UnRar.py @@ -149,10 +149,9 @@ class UnRar(Hook): self.core.log.info(_("starting Unrar of %s") % fname) pyfile = self.core.files.getFile(fid) pyfile.setStatus("processing") - pyfile.progress.setRange(0, 100) def s(p): - pyfile.progress.setValue(p) + pyfile.setProgress(p) download_folder = self.core.config['general']['download_folder'] self.core.log.debug(_("download folder %s") % download_folder) @@ -237,7 +236,7 @@ class UnRar(Hook): else: self.core.log.info(_("Unrar of %s failed (wrong password or bad parts)") % fname) finally: - pyfile.progress.setValue(100) + pyfile.setProgress(100) pyfile.setStatus("finished") pyfile.release() |