summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/MergeFiles.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-19 09:42:34 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-19 09:42:34 +0200
commit502517f37c7540b0bddb092e69386d9d6f08800c (patch)
treea90f2143063538f466b0283383a97067f7ea829d /module/plugins/hooks/MergeFiles.py
parentImprove fixurl method (diff)
downloadpyload-502517f37c7540b0bddb092e69386d9d6f08800c.tar.xz
Fix addons
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
-rw-r--r--module/plugins/hooks/MergeFiles.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index 9aa70aa71..b5245cc14 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -6,11 +6,11 @@ import os
import re
import traceback
-from module.plugins.internal.Hook import Hook, threaded
+from module.plugins.internal.Addon import Addon, threaded
from module.utils import save_join as fs_join
-class MergeFiles(Hook):
+class MergeFiles(Addon):
__name__ = "MergeFiles"
__type__ = "hook"
__version__ = "0.16"
@@ -22,15 +22,9 @@ class MergeFiles(Hook):
__authors__ = [("and9000", "me@has-no-mail.com")]
- interval = 0 #@TODO: Remove in 0.4.10
-
BUFFER_SIZE = 4096
- def setup(self):
- self.info = {} #@TODO: Remove in 0.4.10
-
-
@threaded
def package_finished(self, pack):
files = {}