summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hooks')
-rw-r--r--module/plugins/hooks/AntiVirus.py4
-rw-r--r--module/plugins/hooks/Checksum.py3
-rw-r--r--module/plugins/hooks/ClickAndLoad.py4
-rw-r--r--module/plugins/hooks/DeleteFinished.py5
-rw-r--r--module/plugins/hooks/DownloadScheduler.py3
-rw-r--r--module/plugins/hooks/HotFolder.py1
-rw-r--r--module/plugins/hooks/JustPremium.py9
-rw-r--r--module/plugins/hooks/MergeFiles.py3
-rw-r--r--module/plugins/hooks/MultiHome.py5
-rw-r--r--module/plugins/hooks/RestartFailed.py1
-rw-r--r--module/plugins/hooks/SkipRev.py4
-rw-r--r--module/plugins/hooks/UnSkipOnFail.py3
-rw-r--r--module/plugins/hooks/XFileSharingPro.py20
13 files changed, 51 insertions, 14 deletions
diff --git a/module/plugins/hooks/AntiVirus.py b/module/plugins/hooks/AntiVirus.py
index b8a659f99..ffed86836 100644
--- a/module/plugins/hooks/AntiVirus.py
+++ b/module/plugins/hooks/AntiVirus.py
@@ -30,6 +30,10 @@ class AntiVirus(Hook):
pass
+ def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
+
+
@Expose
@threaded
def scan(self, pyfile, thread):
diff --git a/module/plugins/hooks/Checksum.py b/module/plugins/hooks/Checksum.py
index 9474f6968..42a4ca236 100644
--- a/module/plugins/hooks/Checksum.py
+++ b/module/plugins/hooks/Checksum.py
@@ -75,9 +75,12 @@ class Checksum(Hook):
def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
self.algorithms = sorted(
getattr(hashlib, "algorithms", ("md5", "sha1", "sha224", "sha256", "sha384", "sha512")), reverse=True)
+
self.algorithms.extend(["crc32", "adler32"])
+
self.formats = self.algorithms + ["sfv", "crc", "hash"]
diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py
index 731c8bd7e..812f969f9 100644
--- a/module/plugins/hooks/ClickAndLoad.py
+++ b/module/plugins/hooks/ClickAndLoad.py
@@ -41,6 +41,10 @@ class ClickAndLoad(Hook):
pass
+ def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
+
+
def coreReady(self):
if not self.config['webinterface']['activated']:
return
diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py
index 5d2b78d50..e2ad12adb 100644
--- a/module/plugins/hooks/DeleteFinished.py
+++ b/module/plugins/hooks/DeleteFinished.py
@@ -44,7 +44,7 @@ class DeleteFinished(Hook):
def coreReady(self):
- self.info = {'sleep': True}
+ self.info['sleep'] = True
interval = self.getConfig('interval')
self.pluginConfigChanged(self.__name__, 'interval', interval)
self.addEvent('packageFinished', self.wakeup)
@@ -75,5 +75,6 @@ class DeleteFinished(Hook):
def setup(self):
- self.m = self.manager
+ self.info = {} #@TODO: Remove in 0.4.10
+ self.m = self.manager
self.removeEvent = self.m.removeEvent
diff --git a/module/plugins/hooks/DownloadScheduler.py b/module/plugins/hooks/DownloadScheduler.py
index f24faa684..5f9388b57 100644
--- a/module/plugins/hooks/DownloadScheduler.py
+++ b/module/plugins/hooks/DownloadScheduler.py
@@ -27,7 +27,8 @@ class DownloadScheduler(Hook):
def setup(self):
- self.cb = None # callback to scheduler job; will be by removed hookmanager when hook unloaded
+ self.info = {} #@TODO: Remove in 0.4.10
+ self.cb = None # callback to scheduler job; will be by removed hookmanager when hook unloaded
def coreReady(self):
diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py
index 60ddf1621..f771cf232 100644
--- a/module/plugins/hooks/HotFolder.py
+++ b/module/plugins/hooks/HotFolder.py
@@ -27,6 +27,7 @@ class HotFolder(Hook):
def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
self.interval = 30
diff --git a/module/plugins/hooks/JustPremium.py b/module/plugins/hooks/JustPremium.py
index 3064743e2..b82af3e78 100644
--- a/module/plugins/hooks/JustPremium.py
+++ b/module/plugins/hooks/JustPremium.py
@@ -23,6 +23,15 @@ class JustPremium(Hook):
event_list = ["linksAdded"]
+ #@TODO: Remove in 0.4.10
+ def initPeriodical(self):
+ pass
+
+
+ def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
+
+
def linksAdded(self, links, pid):
hosterdict = self.core.pluginManager.hosterPlugins
linkdict = self.core.api.checkURLs(links)
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index 9f1348485..74bcbe3c1 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -32,8 +32,7 @@ class MergeFiles(Hook):
def setup(self):
- # nothing to do
- pass
+ self.info = {} #@TODO: Remove in 0.4.10
@threaded
diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py
index 7ea3378ec..94c671340 100644
--- a/module/plugins/hooks/MultiHome.py
+++ b/module/plugins/hooks/MultiHome.py
@@ -23,9 +23,12 @@ class MultiHome(Hook):
def setup(self):
- self.register = {}
+ self.info = {} #@TODO: Remove in 0.4.10
+ self.register = {}
self.interfaces = []
+
self.parseInterfaces(self.getConfig('interfaces').split(";"))
+
if not self.interfaces:
self.parseInterfaces([self.config['download']['interface']])
self.setConfig("interfaces", self.toConfig())
diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py
index d0424bd1f..6eef90ffe 100644
--- a/module/plugins/hooks/RestartFailed.py
+++ b/module/plugins/hooks/RestartFailed.py
@@ -37,6 +37,7 @@ class RestartFailed(Hook):
def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
self.interval = self.MIN_CHECK_INTERVAL
diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index dc45a2e6d..9109d4f80 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -29,6 +29,10 @@ class SkipRev(Hook):
pass
+ def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
+
+
@staticmethod
def _setup(self):
self.pyfile.plugin._setup()
diff --git a/module/plugins/hooks/UnSkipOnFail.py b/module/plugins/hooks/UnSkipOnFail.py
index a2665663c..f1f2288fe 100644
--- a/module/plugins/hooks/UnSkipOnFail.py
+++ b/module/plugins/hooks/UnSkipOnFail.py
@@ -20,6 +20,9 @@ class UnSkipOnFail(Hook):
def initPeriodical(self):
pass
+ def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
+
def downloadFailed(self, pyfile):
#: Check if pyfile is still "failed",
diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index d9552051e..69a49fba0 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -8,7 +8,7 @@ from module.plugins.Hook import Hook
class XFileSharingPro(Hook):
__name__ = "XFileSharingPro"
__type__ = "hook"
- __version__ = "0.33"
+ __version__ = "0.34"
__config__ = [("activated" , "bool", "Activated" , True ),
("use_hoster_list" , "bool", "Load listed hosters only" , False),
@@ -22,11 +22,11 @@ class XFileSharingPro(Hook):
__authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
- # event_list = ["pluginConfigChanged"]
- regexp = {'hoster' : (r'https?://(?:www\.)?(?P<DOMAIN>[\w\-.^_]{3,63}(?:\.[a-zA-Z]{2,})(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)',
- r'https?://(?:[^/]+\.)?(?P<DOMAIN>%s)/(?:embed-)?\w+'),
- 'crypter': (r'https?://(?:www\.)?(?P<DOMAIN>[\w\-.^_]{3,63}(?:\.[a-zA-Z]{2,})(?:\:\d+)?)/(?:user|folder)s?/\w+',
- r'https?://(?:[^/]+\.)?(?P<DOMAIN>%s)/(?:user|folder)s?/\w+')}
+ event_list = ["pluginConfigChanged"]
+ regexp = {'hoster' : (r'https?://(?:www\.)?(?P<DOMAIN>[\w\-.^_]{3,63}(?:\.[a-zA-Z]{2,})(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)',
+ r'https?://(?:[^/]+\.)?(?P<DOMAIN>%s)/(?:embed-)?\w+'),
+ 'crypter': (r'https?://(?:www\.)?(?P<DOMAIN>[\w\-.^_]{3,63}(?:\.[a-zA-Z]{2,})(?:\:\d+)?)/(?:user|folder)s?/\w+',
+ r'https?://(?:[^/]+\.)?(?P<DOMAIN>%s)/(?:user|folder)s?/\w+')}
HOSTER_BUILTIN = [#WORKING HOSTERS:
"backin.net", "eyesfile.ca", "file4safe.com", "fileband.com", "filedwon.com", "fileparadox.in",
@@ -41,8 +41,8 @@ class XFileSharingPro(Hook):
CRYPTER_BUILTIN = ["junocloud.me", "rapidfileshare.net"]
- # def pluginConfigChanged(self.__name__, plugin, name, value):
- # self.loadPattern()
+ def pluginConfigChanged(self.__name__, plugin, name, value):
+ self.loadPattern()
#@TODO: Remove in 0.4.10
@@ -50,6 +50,10 @@ class XFileSharingPro(Hook):
pass
+ def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
+
+
def coreReady(self):
self.loadPattern()