diff options
| author |  Stefano <l.stickell@yahoo.it>
| 2013-07-20 22:03:34 +0200 |
|---|---|---|
| committer | Stefano <l.stickell@yahoo.it>
| 2013-07-20 22:03:34 +0200 |
| commit | 4aa8241528f997509282bd9c8edbc83d7096d66a (patch) | |
| tree | 45148d014c8129c8cd1f2935adf49f9725280948 /pyload/plugins/addons/MergeFiles.py | |
| parent | added missing init file (diff) | |
| parent | Using the same translatable string (diff) | |
| download | pyload-4aa8241528f997509282bd9c8edbc83d7096d66a.tar.xz | |
Merge plugins from stable
Conflicts:
module/plugins/hoster/UnrestrictLi.py
pyload/plugins/hooks/Captcha9kw.py
pyload/plugins/hoster/AlldebridCom.py
pyload/plugins/hoster/BitshareCom.py
pyload/plugins/hoster/EgoFilesCom.py
pyload/plugins/hoster/FreakshareCom.py
pyload/plugins/hoster/LuckyShareNet.py
pyload/plugins/hoster/Premium4Me.py
pyload/plugins/hoster/PremiumizeMe.py
pyload/plugins/hoster/RapidshareCom.py
pyload/plugins/hoster/RealdebridCom.py
pyload/plugins/hoster/ShareplaceCom.py
pyload/plugins/hoster/UploadedTo.py
pyload/plugins/hoster/UploadingCom.py
pyload/plugins/hoster/Xdcc.py
pyload/plugins/hoster/YourfilesTo.py
pyload/plugins/hoster/ZeveraCom.py
Diffstat (limited to 'pyload/plugins/addons/MergeFiles.py')
| -rw-r--r-- | pyload/plugins/addons/MergeFiles.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pyload/plugins/addons/MergeFiles.py b/pyload/plugins/addons/MergeFiles.py index 48f997681..8d7f8aef1 100644 --- a/pyload/plugins/addons/MergeFiles.py +++ b/pyload/plugins/addons/MergeFiles.py @@ -30,7 +30,7 @@ BUFFER_SIZE = 4096 class MergeFiles(Addon): __name__ = "MergeFiles" - __version__ = "0.1" + __version__ = "0.11" __description__ = "Merges parts splitted with hjsplit" __config__ = [ ("activated" , "bool" , "Activated" , "False"), @@ -60,11 +60,11 @@ class MergeFiles(Addon): download_folder = save_join(download_folder, pack.folder) for name, file_list in files.iteritems(): - self.core.log.info("Starting merging of %s" % name) + self.logInfo("Starting merging of %s" % name) final_file = open(join(download_folder, fs_encode(name)), "wb") for splitted_file in file_list: - self.core.log.debug("Merging part %s" % splitted_file) + self.logDebug("Merging part %s" % splitted_file) pyfile = self.core.files.getFile(fid_dict[splitted_file]) pyfile.setStatus("processing") try: @@ -80,7 +80,7 @@ class MergeFiles(Addon): else: break s_file.close() - self.core.log.debug("Finished merging part %s" % splitted_file) + self.logDebug("Finished merging part %s" % splitted_file) except Exception, e: print traceback.print_exc() finally: @@ -89,6 +89,6 @@ class MergeFiles(Addon): pyfile.release() final_file.close() - self.core.log.info("Finished merging of %s" % name) + self.logInfo("Finished merging of %s" % name) |