summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--module/plugins/hooks/PushOver.py8
-rw-r--r--module/plugins/hoster/OneFichierCom.py1
-rw-r--r--module/plugins/hoster/ZahikiNet.py2
-rw-r--r--module/plugins/internal/Addon.py18
-rw-r--r--module/plugins/internal/Captcha.py2
-rw-r--r--module/plugins/internal/CaptchaService.py2
-rw-r--r--module/plugins/internal/Container.py2
-rw-r--r--module/plugins/internal/Crypter.py2
-rw-r--r--module/plugins/internal/Extractor.py12
-rw-r--r--module/plugins/internal/Hoster.py2
-rw-r--r--module/plugins/internal/MultiCrypter.py2
-rw-r--r--module/plugins/internal/Notifier.py6
-rw-r--r--module/plugins/internal/OCR.py2
-rw-r--r--module/plugins/internal/Plugin.py2
-rw-r--r--module/plugins/internal/SimpleCrypter.py2
-rw-r--r--module/plugins/internal/UnZip.py2
-rw-r--r--module/plugins/internal/utils.py2
17 files changed, 32 insertions, 37 deletions
diff --git a/module/plugins/hooks/PushOver.py b/module/plugins/hooks/PushOver.py
index 06bbd6ab8..5d5e927ac 100644
--- a/module/plugins/hooks/PushOver.py
+++ b/module/plugins/hooks/PushOver.py
@@ -8,7 +8,7 @@ from module.plugins.internal.Notifier import Notifier
class PushOver(Notifier):
__name__ = "PushOver"
__type__ = "hook"
- __version__ = "0.03"
+ __version__ = "0.04"
__status__ = "testing"
__config__ = [("activated" , "bool", "Activated" , False),
@@ -33,13 +33,9 @@ class PushOver(Notifier):
def send(self, event, msg, key):
- self.log_info("Sending notification")
token, user = key
- # msg can not be None or empty
- if not msg:
- msg = event
self.load("https://api.pushover.net/1/messages.json",
post={'token' : token,
'user' : user,
'title' : event,
- 'message': msg})
+ 'message': msg or event}) #@NOTE: msg can not be None or empty
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index 67873cf4f..17bb09bc3 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -31,7 +31,6 @@ class OneFichierCom(SimpleHoster):
URL_REPLACEMENTS = [("https:", "http:")] #@TODO: Remove in 0.4.10
COOKIES = [("1fichier.com", "LG", "en")]
- DIRECT_LINK = True
NAME_PATTERN = r'>File\s*Name :</td>\s*<td.*>(?P<N>.+?)<'
SIZE_PATTERN = r'>Size :</td>\s*<td.*>(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
diff --git a/module/plugins/hoster/ZahikiNet.py b/module/plugins/hoster/ZahikiNet.py
index 3206ccba4..212582d6d 100644
--- a/module/plugins/hoster/ZahikiNet.py
+++ b/module/plugins/hoster/ZahikiNet.py
@@ -17,8 +17,6 @@ class ZahikiNet(SimpleHoster):
__authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
- DIRECT_LINK = True
-
NAME_PATTERN = r'/(?P<N>.+?) </title>'
OFFLINE_PATTERN = r'>(Not Found|Il file selezionato non esiste)'
diff --git a/module/plugins/internal/Addon.py b/module/plugins/internal/Addon.py
index e6de50aaa..ee0febffc 100644
--- a/module/plugins/internal/Addon.py
+++ b/module/plugins/internal/Addon.py
@@ -23,7 +23,7 @@ class Addon(Plugin):
__name__ = "Addon"
__type__ = "hook" #@TODO: Change to `addon` in 0.4.10
__version__ = "0.14"
- __status__ = "testing"
+ __status__ = "stable"
__threaded__ = [] #@TODO: Remove in 0.4.10
@@ -58,6 +58,14 @@ class Addon(Plugin):
self.init_events()
+ @property
+ def activated(self):
+ """
+ Checks if addon is activated
+ """
+ return self.get_config("activated")
+
+
#@TODO: Remove in 0.4.10
def _log(self, level, plugintype, pluginname, messages):
plugintype = "addon" if plugintype is "hook" else plugintype
@@ -131,14 +139,6 @@ class Addon(Plugin):
raise NotImplementedError
- @property
- def activated(self):
- """
- Checks if addon is activated
- """
- return self.get_config("activated")
-
-
#: Deprecated method, use `activated` property instead (Remove in 0.4.10)
def isActivated(self, *args, **kwargs):
return self.activated
diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py
index 71eee0659..c58231b71 100644
--- a/module/plugins/internal/Captcha.py
+++ b/module/plugins/internal/Captcha.py
@@ -13,7 +13,7 @@ class Captcha(Plugin):
__name__ = "Captcha"
__type__ = "captcha"
__version__ = "0.47"
- __status__ = "testing"
+ __status__ = "stable"
__description__ = """Base anti-captcha plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 96195a6f2..353ac4e13 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -7,7 +7,7 @@ class CaptchaService(Captcha):
__name__ = "CaptchaService"
__type__ = "captcha"
__version__ = "0.33"
- __status__ = "testing"
+ __status__ = "stable"
__description__ = """Base anti-captcha service plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/internal/Container.py b/module/plugins/internal/Container.py
index ba8b96f3b..b96e6e9b0 100644
--- a/module/plugins/internal/Container.py
+++ b/module/plugins/internal/Container.py
@@ -13,7 +13,7 @@ class Container(Crypter):
__name__ = "Container"
__type__ = "container"
__version__ = "0.08"
- __status__ = "testing"
+ __status__ = "stable"
__pattern__ = r'^unmatchable$'
__config__ = [("activated", "bool", "Activated", True)]
diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py
index 3e5b1f59d..71076ad0a 100644
--- a/module/plugins/internal/Crypter.py
+++ b/module/plugins/internal/Crypter.py
@@ -8,7 +8,7 @@ class Crypter(Base):
__name__ = "Crypter"
__type__ = "crypter"
__version__ = "0.14"
- __status__ = "testing"
+ __status__ = "stable"
__pattern__ = r'^unmatchable$'
__config__ = [("activated" , "bool", "Activated" , True),
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 6c26e3a7c..e821f7aa4 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -24,7 +24,7 @@ class Extractor(Plugin):
__name__ = "Extractor"
__type__ = "extractor"
__version__ = "0.40"
- __status__ = "testing"
+ __status__ = "stable"
__description__ = """Base extractor plugin"""
__license__ = "GPLv3"
@@ -76,11 +76,6 @@ class Extractor(Plugin):
return targets
- @property
- def target(self):
- return encode(self.filename)
-
-
def __init__(self, plugin, filename, out,
fullpath=True,
overwrite=False,
@@ -110,6 +105,11 @@ class Extractor(Plugin):
self.init()
+ @property
+ def target(self):
+ return encode(self.filename)
+
+
def _log(self, level, plugintype, pluginname, messages):
messages = (self.__name__,) + messages
return self.plugin._log(level, plugintype, self.plugin.__name__, messages)
diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py
index 10cfe6262..d1fb9bd56 100644
--- a/module/plugins/internal/Hoster.py
+++ b/module/plugins/internal/Hoster.py
@@ -15,7 +15,7 @@ class Hoster(Base):
__name__ = "Hoster"
__type__ = "hoster"
__version__ = "0.44"
- __status__ = "testing"
+ __status__ = "stable"
__pattern__ = r'^unmatchable$'
__config__ = [("activated" , "bool", "Activated" , True),
diff --git a/module/plugins/internal/MultiCrypter.py b/module/plugins/internal/MultiCrypter.py
index 106875f61..576d6d4b4 100644
--- a/module/plugins/internal/MultiCrypter.py
+++ b/module/plugins/internal/MultiCrypter.py
@@ -7,7 +7,7 @@ class MultiCrypter(SimpleCrypter):
__name__ = "MultiCrypter"
__type__ = "hoster"
__version__ = "0.06"
- __status__ = "testing"
+ __status__ = "stable"
__pattern__ = r'^unmatchable$'
__config__ = [("activated" , "bool", "Activated" , True),
diff --git a/module/plugins/internal/Notifier.py b/module/plugins/internal/Notifier.py
index b397b8f38..d0fd28906 100644
--- a/module/plugins/internal/Notifier.py
+++ b/module/plugins/internal/Notifier.py
@@ -9,7 +9,7 @@ from module.plugins.internal.utils import isiterable
class Notifier(Addon):
__name__ = "Notifier"
__type__ = "hook"
- __version__ = "0.03"
+ __version__ = "0.04"
__status__ = "testing"
__config__ = [("activated" , "bool", "Activated" , False),
@@ -96,12 +96,14 @@ class Notifier(Addon):
if elapsed_time < self.get_config("sendtimewait"):
return
- if elapsed_time > 60:
+ elif elapsed_time > 60:
self.notifications = 0
elif self.notifications >= self.get_config("sendpermin"):
return
+ self.log_info(_("Sending notification..."))
+
try:
resp = self.send(event, msg, key)
diff --git a/module/plugins/internal/OCR.py b/module/plugins/internal/OCR.py
index e3044f6c3..89eed1832 100644
--- a/module/plugins/internal/OCR.py
+++ b/module/plugins/internal/OCR.py
@@ -21,7 +21,7 @@ class OCR(Plugin):
__name__ = "OCR"
__type__ = "ocr"
__version__ = "0.21"
- __status__ = "testing"
+ __status__ = "stable"
__description__ = """OCR base plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index 9f14855ab..274cff301 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -21,7 +21,7 @@ class Plugin(object):
__name__ = "Plugin"
__type__ = "plugin"
__version__ = "0.59"
- __status__ = "testing"
+ __status__ = "stable"
__config__ = [] #: [("name", "type", "desc", "default")]
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index bdd58da1b..a404e47f6 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -11,7 +11,7 @@ from module.plugins.internal.utils import replace_patterns, set_cookie, set_cook
class SimpleCrypter(Crypter):
__name__ = "SimpleCrypter"
__type__ = "crypter"
- __version__ = "0.75"
+ __version__ = "0.76"
__status__ = "testing"
__pattern__ = r'^unmatchable$'
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 2c4e8e475..ff929ae00 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -13,7 +13,7 @@ class UnZip(Extractor):
__name__ = "UnZip"
__type__ = "extractor"
__version__ = "1.20"
- __status__ = "testing"
+ __status__ = "stable"
__description__ = """Zip extractor plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/internal/utils.py b/module/plugins/internal/utils.py
index e07d1c833..4bb5d21b2 100644
--- a/module/plugins/internal/utils.py
+++ b/module/plugins/internal/utils.py
@@ -25,7 +25,7 @@ class utils(object):
__name__ = "utils"
__type__ = "plugin"
__version__ = "0.06"
- __status__ = "testing"
+ __status__ = "stable"
__pattern__ = r'^unmatchable$'
__config__ = []
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-03 06:31:04 +0100