1 files changed, 0 insertions, 85 deletions
diff --git a/pyload/plugins/addon/MergeFiles.py b/pyload/plugins/addon/MergeFiles.py
deleted file mode 100644
index 71ad7a39d..000000000
--- a/pyload/plugins/addon/MergeFiles.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import with_statement
-
-import os
-import re
-
-from traceback import print_exc
-
-from pyload.plugins.Addon import Addon, threaded
-from pyload.utils import safe_join, fs_encode
-
-
-class MergeFiles(Addon):
-    __name    = "MergeFiles"
-    __type    = "addon"
-    __version = "0.13"
-
-    __config = [("activated", "bool", "Activated", True)]
-
-    __description = """Merges parts splitted with hjsplit"""
-    __license     = "GPLv3"
-    __authors     = [("and9000", "me@has-no-mail.com")]
-
-
-    BUFFER_SIZE = 4096
-
-
-    def setup(self):
-        pass
-
-
-    @threaded
-    def packageFinished(self, pack):
-        files = {}
-        fid_dict = {}
-        for fid, data in pack.getChildren().iteritems():
-            if re.search("\.\d{3}$", data['name']):
-                if data['name'][:-4] not in files:
-                    files[data['name'][:-4]] = []
-                files[data['name'][:-4]].append(data['name'])
-                files[data['name'][:-4]].sort()
-                fid_dict[data['name']] = fid
-
-        download_folder = self.config['general']['download_folder']
-
-        if self.config['general']['folder_per_package']:
-            download_folder = safe_join(download_folder, pack.folder)
-
-        for name, file_list in files.iteritems():
-            self.logInfo(_("Starting merging of"), name)
-
-            final_file = open(safe_join(download_folder, name), "wb")
-                for splitted_file in file_list:
-                    self.logDebug("Merging part", splitted_file)
-
-                    pyfile = self.core.files.getFile(fid_dict[splitted_file])
-
-                    pyfile.setStatus("processing")
-
-                    try:
-                        with open(os.path.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:
-                                f_buffer = s_file.read(self.BUFFER_SIZE)
-                                if f_buffer:
-                                    final_file.write(f_buffer)
-                                    size_written += self.BUFFER_SIZE
-                                    pyfile.setProgress((size_written * 100) / s_file_size)
-                                else:
-                                    break
-
-                        self.logDebug("Finished merging part", splitted_file)
-
-                    except Exception, e:
-                        print_exc()
-
-                    finally:
-                        pyfile.setProgress(100)
-                        pyfile.setStatus("finished")
-                        pyfile.release()
-
-            self.logInfo(_("Finished merging of"), name)