From 58f38f399387b44b956e785e1d578d0f621354e6 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 2 Aug 2011 15:17:24 +0200
Subject: fixes, cleanup, summary for each package
---
module/plugins/hooks/MergeFiles.py | 5 ++---
module/plugins/hooks/UnRar.py | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
(limited to 'module/plugins/hooks')
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()
--
cgit v1.2.3