summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hooks')
-rw-r--r--module/plugins/hooks/AndroidPhoneNotify.py2
-rw-r--r--module/plugins/hooks/AntiStandby.py2
-rw-r--r--module/plugins/hooks/AntiVirus.py2
-rw-r--r--module/plugins/hooks/BypassCaptcha.py8
-rw-r--r--module/plugins/hooks/Captcha9Kw.py6
-rw-r--r--module/plugins/hooks/CaptchaBrotherhood.py6
-rw-r--r--module/plugins/hooks/Checksum.py2
-rw-r--r--module/plugins/hooks/ClickNLoad.py4
-rw-r--r--module/plugins/hooks/DeathByCaptcha.py6
-rw-r--r--module/plugins/hooks/DeleteFinished.py2
-rw-r--r--module/plugins/hooks/DownloadScheduler.py2
-rw-r--r--module/plugins/hooks/ExpertDecoders.py6
-rw-r--r--module/plugins/hooks/ExternalScripts.py2
-rw-r--r--module/plugins/hooks/ExtractArchive.py6
-rw-r--r--module/plugins/hooks/HotFolder.py2
-rw-r--r--module/plugins/hooks/IRCInterface.py2
-rw-r--r--module/plugins/hooks/ImageTyperz.py8
-rw-r--r--module/plugins/hooks/JustPremium.py2
-rw-r--r--module/plugins/hooks/LinkdecrypterComHook.py2
-rw-r--r--module/plugins/hooks/LogMarker.py2
-rw-r--r--module/plugins/hooks/MergeFiles.py2
-rw-r--r--module/plugins/hooks/MultiHome.py2
-rw-r--r--module/plugins/hooks/RestartFailed.py2
-rw-r--r--module/plugins/hooks/SkipRev.py2
-rw-r--r--module/plugins/hooks/TransmissionRPC.py4
-rw-r--r--module/plugins/hooks/UnSkipOnFail.py2
-rw-r--r--module/plugins/hooks/UserAgentSwitcher.py2
-rw-r--r--module/plugins/hooks/WindowsPhoneNotify.py2
-rw-r--r--module/plugins/hooks/XFileSharingPro.py6
-rw-r--r--module/plugins/hooks/XMPPInterface.py2
30 files changed, 50 insertions, 50 deletions
diff --git a/module/plugins/hooks/AndroidPhoneNotify.py b/module/plugins/hooks/AndroidPhoneNotify.py
index 60e9297e1..59c212b36 100644
--- a/module/plugins/hooks/AndroidPhoneNotify.py
+++ b/module/plugins/hooks/AndroidPhoneNotify.py
@@ -6,7 +6,7 @@ from module.plugins.internal.Addon import Addon, Expose
class AndroidPhoneNotify(Addon):
- __name__ = "AndroidPhoneNotify"
+ __name = "AndroidPhoneNotify"
__type__ = "hook"
__version__ = "0.11"
__status__ = "testing"
diff --git a/module/plugins/hooks/AntiStandby.py b/module/plugins/hooks/AntiStandby.py
index aa7a028a5..4ae0c2ea6 100644
--- a/module/plugins/hooks/AntiStandby.py
+++ b/module/plugins/hooks/AntiStandby.py
@@ -25,7 +25,7 @@ class Kernel32(object):
class AntiStandby(Addon):
- __name__ = "AntiStandby"
+ __name = "AntiStandby"
__type__ = "hook"
__version__ = "0.12"
__status__ = "testing"
diff --git a/module/plugins/hooks/AntiVirus.py b/module/plugins/hooks/AntiVirus.py
index c68e86c77..fcdca4e43 100644
--- a/module/plugins/hooks/AntiVirus.py
+++ b/module/plugins/hooks/AntiVirus.py
@@ -15,7 +15,7 @@ from module.utils import fs_encode, save_join as fs_join
class AntiVirus(Addon):
- __name__ = "AntiVirus"
+ __name = "AntiVirus"
__type__ = "hook"
__version__ = "0.14"
__status__ = "testing"
diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py
index a5e424532..2e1831860 100644
--- a/module/plugins/hooks/BypassCaptcha.py
+++ b/module/plugins/hooks/BypassCaptcha.py
@@ -4,7 +4,7 @@ import pycurl
from module.network.HTTPRequest import BadHeader
from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Hook import Hook, threaded
+from module.plugins.internal.Addon import Addon, threaded
class BypassCaptchaException(Exception):
@@ -25,8 +25,8 @@ class BypassCaptchaException(Exception):
return "<BypassCaptchaException %s>" % self.err
-class BypassCaptcha(Hook):
- __name__ = "BypassCaptcha"
+class BypassCaptcha(Addon):
+ __name = "BypassCaptcha"
__type__ = "hook"
__version__ = "0.08"
__status__ = "testing"
@@ -111,7 +111,7 @@ class BypassCaptcha(Hook):
self._process_captcha(task)
else:
- self.log_info(_("Your %s account has not enough credits") % self.__name__)
+ self.log_info(_("Your account has not enough credits"))
def captcha_correct(self, task):
diff --git a/module/plugins/hooks/Captcha9Kw.py b/module/plugins/hooks/Captcha9Kw.py
index 61b496ec6..16a76a792 100644
--- a/module/plugins/hooks/Captcha9Kw.py
+++ b/module/plugins/hooks/Captcha9Kw.py
@@ -8,11 +8,11 @@ import time
from base64 import b64encode
from module.network.HTTPRequest import BadHeader
-from module.plugins.internal.Hook import Hook, threaded
+from module.plugins.internal.Addon import Addon, threaded
-class Captcha9Kw(Hook):
- __name__ = "Captcha9Kw"
+class Captcha9Kw(Addon):
+ __name = "Captcha9Kw"
__type__ = "hook"
__version__ = "0.30"
__status__ = "testing"
diff --git a/module/plugins/hooks/CaptchaBrotherhood.py b/module/plugins/hooks/CaptchaBrotherhood.py
index a8abb1600..642bd23e6 100644
--- a/module/plugins/hooks/CaptchaBrotherhood.py
+++ b/module/plugins/hooks/CaptchaBrotherhood.py
@@ -14,7 +14,7 @@ except ImportError:
import Image
from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Hook import Hook, threaded
+from module.plugins.internal.Addon import Addon, threaded
class CaptchaBrotherhoodException(Exception):
@@ -35,8 +35,8 @@ class CaptchaBrotherhoodException(Exception):
return "<CaptchaBrotherhoodException %s>" % self.err
-class CaptchaBrotherhood(Hook):
- __name__ = "CaptchaBrotherhood"
+class CaptchaBrotherhood(Addon):
+ __name = "CaptchaBrotherhood"
__type__ = "hook"
__version__ = "0.10"
__status__ = "testing"
diff --git a/module/plugins/hooks/Checksum.py b/module/plugins/hooks/Checksum.py
index 4d0493212..4b351f76f 100644
--- a/module/plugins/hooks/Checksum.py
+++ b/module/plugins/hooks/Checksum.py
@@ -36,7 +36,7 @@ def compute_checksum(local_file, algorithm):
class Checksum(Addon):
- __name__ = "Checksum"
+ __name = "Checksum"
__type__ = "hook"
__version__ = "0.22"
__status__ = "testing"
diff --git a/module/plugins/hooks/ClickNLoad.py b/module/plugins/hooks/ClickNLoad.py
index 13975ecb5..8f2c1f36c 100644
--- a/module/plugins/hooks/ClickNLoad.py
+++ b/module/plugins/hooks/ClickNLoad.py
@@ -27,7 +27,7 @@ def forward(source, destination):
#@TODO: IPv6 support
class ClickNLoad(Addon):
- __name__ = "ClickNLoad"
+ __name = "ClickNLoad"
__type__ = "hook"
__version__ = "0.48"
__status__ = "testing"
@@ -37,7 +37,7 @@ class ClickNLoad(Addon):
("extern" , "bool" , "Listen for external connections", True ),
("dest" , "queue;collector", "Add packages to" , "collector")]
- __description__ = """Click'n'Load hook plugin"""
+ __description__ = """Click'n'Load support"""
__license__ = "GPLv3"
__authors__ = [("RaNaN" , "RaNaN@pyload.de" ),
("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py
index d3d00affa..c1f33be6d 100644
--- a/module/plugins/hooks/DeathByCaptcha.py
+++ b/module/plugins/hooks/DeathByCaptcha.py
@@ -11,7 +11,7 @@ from base64 import b64encode
from module.common.json_layer import json_loads
from module.network.HTTPRequest import BadHeader
from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Hook import Hook, threaded
+from module.plugins.internal.Addon import Addon, threaded
class DeathByCaptchaException(Exception):
@@ -48,8 +48,8 @@ class DeathByCaptchaException(Exception):
return "<DeathByCaptchaException %s>" % self.err
-class DeathByCaptcha(Hook):
- __name__ = "DeathByCaptcha"
+class DeathByCaptcha(Addon):
+ __name = "DeathByCaptcha"
__type__ = "hook"
__version__ = "0.08"
__status__ = "testing"
diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py
index e72439c0a..489591d1a 100644
--- a/module/plugins/hooks/DeleteFinished.py
+++ b/module/plugins/hooks/DeleteFinished.py
@@ -5,7 +5,7 @@ from module.plugins.internal.Addon import Addon
class DeleteFinished(Addon):
- __name__ = "DeleteFinished"
+ __name = "DeleteFinished"
__type__ = "hook"
__version__ = "1.16"
__status__ = "testing"
diff --git a/module/plugins/hooks/DownloadScheduler.py b/module/plugins/hooks/DownloadScheduler.py
index 8454438a1..f93410bc3 100644
--- a/module/plugins/hooks/DownloadScheduler.py
+++ b/module/plugins/hooks/DownloadScheduler.py
@@ -7,7 +7,7 @@ from module.plugins.internal.Addon import Addon
class DownloadScheduler(Addon):
- __name__ = "DownloadScheduler"
+ __name = "DownloadScheduler"
__type__ = "hook"
__version__ = "0.24"
__status__ = "testing"
diff --git a/module/plugins/hooks/ExpertDecoders.py b/module/plugins/hooks/ExpertDecoders.py
index cdb76a49d..993a66067 100644
--- a/module/plugins/hooks/ExpertDecoders.py
+++ b/module/plugins/hooks/ExpertDecoders.py
@@ -9,11 +9,11 @@ from base64 import b64encode
from module.network.HTTPRequest import BadHeader
from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Hook import Hook, threaded
+from module.plugins.internal.Addon import Addon, threaded
-class ExpertDecoders(Hook):
- __name__ = "ExpertDecoders"
+class ExpertDecoders(Addon):
+ __name = "ExpertDecoders"
__type__ = "hook"
__version__ = "0.06"
__status__ = "testing"
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index 3459eb3aa..694da4262 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -9,7 +9,7 @@ from module.utils import fs_encode, save_join as fs_join
class ExternalScripts(Addon):
- __name__ = "ExternalScripts"
+ __name = "ExternalScripts"
__type__ = "hook"
__version__ = "0.49"
__status__ = "testing"
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 034a4b81a..48ac029e5 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -97,7 +97,7 @@ class ArchiveQueue(object):
class ExtractArchive(Addon):
- __name__ = "ExtractArchive"
+ __name = "ExtractArchive"
__type__ = "hook"
__version__ = "1.52"
__status__ = "testing"
@@ -162,7 +162,7 @@ class ExtractArchive(Addon):
self.log_warning(_("Could not activate: %s") % p, e)
if self.extractors:
- self.log_debug(*["Found %s %s" % (Extractor.__name__, Extractor.VERSION) for Extractor in self.extractors])
+ self.log_debug(*["Found %s %s" % (Extractor.__name, Extractor.VERSION) for Extractor in self.extractors])
self.extract_queued() #: Resume unfinished extractions
else:
self.log_info(_("No Extract plugins activated"))
@@ -293,7 +293,7 @@ class ExtractArchive(Addon):
for Extractor in self.extractors:
targets = Extractor.get_targets(files_ids)
if targets:
- self.log_debug("Targets for %s: %s" % (Extractor.__name__, targets))
+ self.log_debug("Targets for %s: %s" % (Extractor.__name, targets))
matched = True
for fname, fid, fout in targets:
diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py
index c7631a1fc..8863af871 100644
--- a/module/plugins/hooks/HotFolder.py
+++ b/module/plugins/hooks/HotFolder.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join as fs_join
class HotFolder(Addon):
- __name__ = "HotFolder"
+ __name = "HotFolder"
__type__ = "hook"
__version__ = "0.19"
__status__ = "testing"
diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py
index 16640df0b..9760d5afa 100644
--- a/module/plugins/hooks/IRCInterface.py
+++ b/module/plugins/hooks/IRCInterface.py
@@ -16,7 +16,7 @@ from module.utils import formatSize
class IRCInterface(Thread, Addon):
- __name__ = "IRCInterface"
+ __name = "IRCInterface"
__type__ = "hook"
__version__ = "0.17"
__status__ = "testing"
diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py
index a22ddce7b..5fec52eb7 100644
--- a/module/plugins/hooks/ImageTyperz.py
+++ b/module/plugins/hooks/ImageTyperz.py
@@ -8,7 +8,7 @@ import re
from base64 import b64encode
from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Hook import Hook, threaded
+from module.plugins.internal.Addon import Addon, threaded
class ImageTyperzException(Exception):
@@ -29,8 +29,8 @@ class ImageTyperzException(Exception):
return "<ImageTyperzException %s>" % self.err
-class ImageTyperz(Hook):
- __name__ = "ImageTyperz"
+class ImageTyperz(Addon):
+ __name = "ImageTyperz"
__type__ = "hook"
__version__ = "0.08"
__status__ = "testing"
@@ -127,7 +127,7 @@ class ImageTyperz(Hook):
self._process_captcha(task)
else:
- self.log_info(_("Your %s account has not enough credits") % self.__name__)
+ self.log_info(_("Your account has not enough credits"))
def captcha_invalid(self, task):
diff --git a/module/plugins/hooks/JustPremium.py b/module/plugins/hooks/JustPremium.py
index f4c48cfa9..f33bcd015 100644
--- a/module/plugins/hooks/JustPremium.py
+++ b/module/plugins/hooks/JustPremium.py
@@ -6,7 +6,7 @@ from module.plugins.internal.Addon import Addon
class JustPremium(Addon):
- __name__ = "JustPremium"
+ __name = "JustPremium"
__type__ = "hook"
__version__ = "0.24"
__status__ = "testing"
diff --git a/module/plugins/hooks/LinkdecrypterComHook.py b/module/plugins/hooks/LinkdecrypterComHook.py
index 2fe780a0c..077f132d4 100644
--- a/module/plugins/hooks/LinkdecrypterComHook.py
+++ b/module/plugins/hooks/LinkdecrypterComHook.py
@@ -6,7 +6,7 @@ from module.plugins.internal.Addon import Addon
class LinkdecrypterComHook(Addon):
- __name__ = "LinkdecrypterComHook"
+ __name = "LinkdecrypterCom"
__type__ = "hook"
__version__ = "1.08"
__status__ = "testing"
diff --git a/module/plugins/hooks/LogMarker.py b/module/plugins/hooks/LogMarker.py
index 0efab602f..b4269164a 100644
--- a/module/plugins/hooks/LogMarker.py
+++ b/module/plugins/hooks/LogMarker.py
@@ -7,7 +7,7 @@ from module.plugins.internal.Plugin import seconds_to_nexthour
class LogMarker(Addon):
- __name__ = "LogMarker"
+ __name = "LogMarker"
__type__ = "hook"
__version__ = "0.03"
__status__ = "testing"
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index a7d6fc7ba..f25380c18 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -10,7 +10,7 @@ from module.utils import save_join as fs_join
class MergeFiles(Addon):
- __name__ = "MergeFiles"
+ __name = "MergeFiles"
__type__ = "hook"
__version__ = "0.17"
__status__ = "testing"
diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py
index 90e8a60d2..3ca3bf74d 100644
--- a/module/plugins/hooks/MultiHome.py
+++ b/module/plugins/hooks/MultiHome.py
@@ -42,7 +42,7 @@ class Interface(object):
class MultiHome(Addon):
- __name__ = "MultiHome"
+ __name = "MultiHome"
__type__ = "hook"
__version__ = "0.14"
__status__ = "testing"
diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py
index 74d570425..f85ad51fd 100644
--- a/module/plugins/hooks/RestartFailed.py
+++ b/module/plugins/hooks/RestartFailed.py
@@ -4,7 +4,7 @@ from module.plugins.internal.Addon import Addon
class RestartFailed(Addon):
- __name__ = "RestartFailed"
+ __name = "RestartFailed"
__type__ = "hook"
__version__ = "1.62"
__status__ = "testing"
diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index 891d2db6d..fcf6a4a9d 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -10,7 +10,7 @@ from module.plugins.internal.Addon import Addon
class SkipRev(Addon):
- __name__ = "SkipRev"
+ __name = "SkipRev"
__type__ = "hook"
__version__ = "0.34"
__status__ = "testing"
diff --git a/module/plugins/hooks/TransmissionRPC.py b/module/plugins/hooks/TransmissionRPC.py
index 7d3e24661..7a1ad1659 100644
--- a/module/plugins/hooks/TransmissionRPC.py
+++ b/module/plugins/hooks/TransmissionRPC.py
@@ -12,7 +12,7 @@ from module.plugins.internal.Addon import Addon
class TransmissionRPC(Addon):
- __name__ = "TransmissionRPC"
+ __name = "TransmissionRPC"
__type__ = "hook"
__version__ = "0.12"
__status__ = "testing"
@@ -31,7 +31,7 @@ class TransmissionRPC(Addon):
def links_added(self, links, pid):
- pattern = re.compile(self.__pattern__)
+ pattern = re.compile(self.__pattern)
urls = [link for link in links if pattern.match(link)]
for url in urls:
diff --git a/module/plugins/hooks/UnSkipOnFail.py b/module/plugins/hooks/UnSkipOnFail.py
index d467b8a01..a0a2681aa 100644
--- a/module/plugins/hooks/UnSkipOnFail.py
+++ b/module/plugins/hooks/UnSkipOnFail.py
@@ -5,7 +5,7 @@ from module.plugins.internal.Addon import Addon
class UnSkipOnFail(Addon):
- __name__ = "UnSkipOnFail"
+ __name = "UnSkipOnFail"
__type__ = "hook"
__version__ = "0.09"
__status__ = "testing"
diff --git a/module/plugins/hooks/UserAgentSwitcher.py b/module/plugins/hooks/UserAgentSwitcher.py
index 52f542268..4e714bf60 100644
--- a/module/plugins/hooks/UserAgentSwitcher.py
+++ b/module/plugins/hooks/UserAgentSwitcher.py
@@ -7,7 +7,7 @@ from module.plugins.internal.Plugin import encode
class UserAgentSwitcher(Addon):
- __name__ = "UserAgentSwitcher"
+ __name = "UserAgentSwitcher"
__type__ = "hook"
__version__ = "0.11"
__status__ = "testing"
diff --git a/module/plugins/hooks/WindowsPhoneNotify.py b/module/plugins/hooks/WindowsPhoneNotify.py
index 4343d16f2..62a8619c2 100644
--- a/module/plugins/hooks/WindowsPhoneNotify.py
+++ b/module/plugins/hooks/WindowsPhoneNotify.py
@@ -7,7 +7,7 @@ from module.plugins.internal.Addon import Addon, Expose
class WindowsPhoneNotify(Addon):
- __name__ = "WindowsPhoneNotify"
+ __name = "WindowsPhoneNotify"
__type__ = "hook"
__version__ = "0.13"
__status__ = "testing"
diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index 602010586..ccb8980ed 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -2,11 +2,11 @@
import re
-from module.plugins.internal.Hook import Hook
+from module.plugins.internal.Addon import Addon
-class XFileSharingPro(Hook):
- __name__ = "XFileSharingPro"
+class XFileSharingPro(Addon):
+ __name = "XFileSharingPro"
__type__ = "hook"
__version__ = "0.44"
__status__ = "testing"
diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py
index 811e2f5f4..0103fdcd6 100644
--- a/module/plugins/hooks/XMPPInterface.py
+++ b/module/plugins/hooks/XMPPInterface.py
@@ -10,7 +10,7 @@ from module.plugins.hooks.IRCInterface import IRCInterface
class XMPPInterface(IRCInterface, JabberClient):
- __name__ = "XMPPInterface"
+ __name = "XMPPInterface"
__type__ = "hook"
__version__ = "0.13"
__status__ = "testing"