summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/MergeFiles.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2015-01-29 15:56:57 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2015-01-29 15:56:57 +0100
commitcb9e67a5437ddfafd6a93f5a208b9faf3f2d5575 (patch)
tree2175310fe13226ac859dac57d5e3a1d14d9223bf /module/plugins/hooks/MergeFiles.py
parent[ExtractArchive] Fix typo (thx SelmaUrban) (diff)
downloadpyload-cb9e67a5437ddfafd6a93f5a208b9faf3f2d5575.tar.xz
Some file encoding fixup + optimizations
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
-rw-r--r--module/plugins/hooks/MergeFiles.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index 4de45f958..9f1348485 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -8,13 +8,13 @@ import re
from traceback import print_exc
from module.plugins.Hook import Hook, threaded
-from module.utils import save_join, fs_encode
+from module.utils import save_join
class MergeFiles(Hook):
__name__ = "MergeFiles"
__type__ = "hook"
- __version__ = "0.13"
+ __version__ = "0.14"
__config__ = [("activated", "bool", "Activated", True)]
@@ -65,7 +65,7 @@ class MergeFiles(Hook):
pyfile.setStatus("processing")
try:
- with open(os.path.join(download_folder, splitted_file), "rb") as s_file:
+ with open(save_join(download_folder, splitted_file), "rb") as s_file:
size_written = 0
s_file_size = int(os.path.getsize(os.path.join(download_folder, splitted_file)))
while True: