From 270c1ee85edcd1e9e10511833b422d93dfca192a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 16 Feb 2015 22:38:45 +0100
Subject: Revert fcead1870013b6a970eca7878a66dbe783c80ea3
---
pyload/plugin/addon/AndroidPhoneNotify.py | 14 +++++++-------
pyload/plugin/addon/Checksum.py | 14 +++++++-------
pyload/plugin/addon/ClickAndLoad.py | 14 +++++++-------
pyload/plugin/addon/DeleteFinished.py | 16 ++++++++--------
pyload/plugin/addon/DownloadScheduler.py | 14 +++++++-------
pyload/plugin/addon/ExternalScripts.py | 14 +++++++-------
pyload/plugin/addon/ExtractArchive.py | 18 +++++++++---------
pyload/plugin/addon/HotFolder.py | 14 +++++++-------
pyload/plugin/addon/IRCInterface.py | 14 +++++++-------
pyload/plugin/addon/JustPremium.py | 14 +++++++-------
pyload/plugin/addon/MergeFiles.py | 14 +++++++-------
pyload/plugin/addon/MultiHome.py | 14 +++++++-------
pyload/plugin/addon/RestartFailed.py | 16 ++++++++--------
pyload/plugin/addon/RestartSlow.py | 14 +++++++-------
pyload/plugin/addon/SkipRev.py | 14 +++++++-------
pyload/plugin/addon/UnSkipOnFail.py | 14 +++++++-------
pyload/plugin/addon/UpdateManager.py | 30 +++++++++++++++---------------
pyload/plugin/addon/WindowsPhoneNotify.py | 14 +++++++-------
pyload/plugin/addon/XMPPInterface.py | 14 +++++++-------
19 files changed, 145 insertions(+), 145 deletions(-)
(limited to 'pyload/plugin/addon')
diff --git a/pyload/plugin/addon/AndroidPhoneNotify.py b/pyload/plugin/addon/AndroidPhoneNotify.py
index 2b4f8fcca..148008116 100644
--- a/pyload/plugin/addon/AndroidPhoneNotify.py
+++ b/pyload/plugin/addon/AndroidPhoneNotify.py
@@ -7,20 +7,20 @@ from pyload.plugin.Addon import Addon
class AndroidPhoneNotify(Addon):
- __name__ = "AndroidPhoneNotify"
- __type__ = "addon"
- __version__ = "0.05"
+ __name = "AndroidPhoneNotify"
+ __type = "addon"
+ __version = "0.05"
- __config__ = [("apikey" , "str" , "API key" , "" ),
+ __config = [("apikey" , "str" , "API key" , "" ),
("notifycaptcha" , "bool", "Notify captcha request" , True ),
("notifypackage" , "bool", "Notify package finished" , True ),
("notifyprocessed", "bool", "Notify processed packages status" , True ),
("timeout" , "int" , "Timeout between captchas in seconds" , 5 ),
("force" , "bool", "Send notifications if client is connected", False)]
- __description__ = """Send push notifications to your Android Phone using notifymyandroid.com"""
- __license__ = "GPLv3"
- __authors__ = [("Steven Kosyra", "steven.kosyra@gmail.com"),
+ __description = """Send push notifications to your Android Phone using notifymyandroid.com"""
+ __license = "GPLv3"
+ __authors = [("Steven Kosyra", "steven.kosyra@gmail.com"),
("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/addon/Checksum.py b/pyload/plugin/addon/Checksum.py
index 35be60773..043a1861c 100644
--- a/pyload/plugin/addon/Checksum.py
+++ b/pyload/plugin/addon/Checksum.py
@@ -38,20 +38,20 @@ def computeChecksum(local_file, algorithm):
class Checksum(Addon):
- __name__ = "Checksum"
- __type__ = "addon"
- __version__ = "0.16"
+ __name = "Checksum"
+ __type = "addon"
+ __version = "0.16"
- __config__ = [("activated" , "bool" , "Activated" , True ),
+ __config = [("activated" , "bool" , "Activated" , True ),
("check_checksum", "bool" , "Check checksum? (If False only size will be verified)", True ),
("check_action" , "fail;retry;nothing", "What to do if check fails?" , "retry"),
("max_tries" , "int" , "Number of retries" , 2 ),
("retry_action" , "fail;nothing" , "What to do if all retries fail?" , "fail" ),
("wait_time" , "int" , "Time to wait before each retry (seconds)" , 1 )]
- __description__ = """Verify downloaded file size and checksum"""
- __license__ = "GPLv3"
- __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+ __description = """Verify downloaded file size and checksum"""
+ __license = "GPLv3"
+ __authors = [("zoidberg", "zoidberg@mujmail.cz"),
("Walter Purcaro", "vuolter@gmail.com"),
("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/addon/ClickAndLoad.py b/pyload/plugin/addon/ClickAndLoad.py
index cd71e9972..98e650d15 100644
--- a/pyload/plugin/addon/ClickAndLoad.py
+++ b/pyload/plugin/addon/ClickAndLoad.py
@@ -53,17 +53,17 @@ def create_connection(address, timeout=object(), source_address=None):
class ClickAndLoad(Addon):
- __name__ = "ClickAndLoad"
- __type__ = "addon"
- __version__ = "0.35"
+ __name = "ClickAndLoad"
+ __type = "addon"
+ __version = "0.35"
- __config__ = [("activated", "bool", "Activated" , True),
+ __config = [("activated", "bool", "Activated" , True),
("port" , "int" , "Port" , 9666),
("extern" , "bool", "Listen on the public network interface", True)]
- __description__ = """Click'N'Load addon plugin"""
- __license__ = "GPLv3"
- __authors__ = [("RaNaN", "RaNaN@pyload.de"),
+ __description = """Click'N'Load addon plugin"""
+ __license = "GPLv3"
+ __authors = [("RaNaN", "RaNaN@pyload.de"),
("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/addon/DeleteFinished.py b/pyload/plugin/addon/DeleteFinished.py
index 59f2e3321..045f58d61 100644
--- a/pyload/plugin/addon/DeleteFinished.py
+++ b/pyload/plugin/addon/DeleteFinished.py
@@ -5,16 +5,16 @@ from pyload.plugin.Addon import Addon
class DeleteFinished(Addon):
- __name__ = "DeleteFinished"
- __type__ = "addon"
- __version__ = "1.11"
+ __name = "DeleteFinished"
+ __type = "addon"
+ __version = "1.11"
- __config__ = [('interval' , 'int' , 'Delete every (hours)' , '72' ),
+ __config = [('interval' , 'int' , 'Delete every (hours)' , '72' ),
('deloffline', 'bool', 'Delete packages with offline links', 'False')]
- __description__ = """Automatically delete all finished packages from queue"""
- __license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ __description = """Automatically delete all finished packages from queue"""
+ __license = "GPLv3"
+ __authors = [("Walter Purcaro", "vuolter@gmail.com")]
# event_list = ["pluginConfigChanged"]
@@ -45,7 +45,7 @@ class DeleteFinished(Addon):
def activate(self):
self.info = {'sleep': True}
interval = self.getConfig('interval')
- self.pluginConfigChanged(self.__name__, 'interval', interval)
+ self.pluginConfigChanged(self.__name, 'interval', interval)
self.addEvent('packageFinished', self.wakeup)
diff --git a/pyload/plugin/addon/DownloadScheduler.py b/pyload/plugin/addon/DownloadScheduler.py
index e5e25e389..7f05d89f4 100644
--- a/pyload/plugin/addon/DownloadScheduler.py
+++ b/pyload/plugin/addon/DownloadScheduler.py
@@ -8,16 +8,16 @@ from pyload.plugin.Addon import Addon
class DownloadScheduler(Addon):
- __name__ = "DownloadScheduler"
- __type__ = "addon"
- __version__ = "0.22"
+ __name = "DownloadScheduler"
+ __type = "addon"
+ __version = "0.22"
- __config__ = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)" , "0:00 full, 7:00 250, 10:00 0, 17:00 150"),
+ __config = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)" , "0:00 full, 7:00 250, 10:00 0, 17:00 150"),
("abort" , "bool", "Abort active downloads when start period with speed 0", False )]
- __description__ = """Download Scheduler"""
- __license__ = "GPLv3"
- __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+ __description = """Download Scheduler"""
+ __license = "GPLv3"
+ __authors = [("zoidberg", "zoidberg@mujmail.cz"),
("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/addon/ExternalScripts.py b/pyload/plugin/addon/ExternalScripts.py
index 5aebf2338..139a7e3e7 100644
--- a/pyload/plugin/addon/ExternalScripts.py
+++ b/pyload/plugin/addon/ExternalScripts.py
@@ -10,16 +10,16 @@ from pyload.utils import safe_join
class ExternalScripts(Addon):
- __name__ = "ExternalScripts"
- __type__ = "addon"
- __version__ = "0.29"
+ __name = "ExternalScripts"
+ __type = "addon"
+ __version = "0.29"
- __config__ = [("activated", "bool", "Activated" , True ),
+ __config = [("activated", "bool", "Activated" , True ),
("wait" , "bool", "Wait script ending", False)]
- __description__ = """Run external scripts"""
- __license__ = "GPLv3"
- __authors__ = [("mkaay", "mkaay@mkaay.de"),
+ __description = """Run external scripts"""
+ __license = "GPLv3"
+ __authors = [("mkaay", "mkaay@mkaay.de"),
("RaNaN", "ranan@pyload.org"),
("spoob", "spoob@pyload.org"),
("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py
index 951434e3e..b2460bf9d 100644
--- a/pyload/plugin/addon/ExtractArchive.py
+++ b/pyload/plugin/addon/ExtractArchive.py
@@ -102,11 +102,11 @@ class ArchiveQueue(object):
class ExtractArchive(Addon):
- __name__ = "ExtractArchive"
- __type__ = "addon"
- __version__ = "1.29"
+ __name = "ExtractArchive"
+ __type = "addon"
+ __version = "1.29"
- __config__ = [("activated" , "bool" , "Activated" , True ),
+ __config = [("activated" , "bool" , "Activated" , True ),
("fullpath" , "bool" , "Extract with full paths" , True ),
("overwrite" , "bool" , "Overwrite files" , False ),
("keepbroken" , "bool" , "Try to extract broken archives" , False ),
@@ -122,9 +122,9 @@ class ExtractArchive(Addon):
("waitall" , "bool" , "Wait for all downloads to be finished" , False ),
("renice" , "int" , "CPU priority" , 0 )]
- __description__ = """Extract different kind of archives"""
- __license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com"),
+ __description = """Extract different kind of archives"""
+ __license = "GPLv3"
+ __authors = [("Walter Purcaro", "vuolter@gmail.com"),
("Immenz" , "immenz@gmx.net" )]
@@ -167,7 +167,7 @@ class ExtractArchive(Addon):
print_exc()
if self.extractors:
- self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name__,Extractor.VERSION) for Extractor in self.extractors))
+ self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name,Extractor.VERSION) for Extractor in self.extractors))
if self.getConfig("waitall"):
self.extractPackage(*self.queue.get()) #: Resume unfinished extractions
@@ -267,7 +267,7 @@ class ExtractArchive(Addon):
for Extractor in self.extractors:
targets = Extractor.getTargets(files_ids)
if targets:
- self.logDebug("Targets for %s: %s" % (Extractor.__name__, targets))
+ self.logDebug("Targets for %s: %s" % (Extractor.__name, targets))
matched = True
for fname, fid, fout in targets:
diff --git a/pyload/plugin/addon/HotFolder.py b/pyload/plugin/addon/HotFolder.py
index eb607ac7e..6b1f6c02e 100644
--- a/pyload/plugin/addon/HotFolder.py
+++ b/pyload/plugin/addon/HotFolder.py
@@ -13,18 +13,18 @@ from pyload.utils import fs_encode, safe_join
class HotFolder(Addon):
- __name__ = "HotFolder"
- __type__ = "addon"
- __version__ = "0.12"
+ __name = "HotFolder"
+ __type = "addon"
+ __version = "0.12"
- __config__ = [("folder" , "str" , "Folder to observe" , "container"),
+ __config = [("folder" , "str" , "Folder to observe" , "container"),
("watch_file", "bool", "Observe link file" , False ),
("keep" , "bool", "Keep added containers", True ),
("file" , "str" , "Link file" , "links.txt")]
- __description__ = """Observe folder and file for changes and add container and links"""
- __license__ = "GPLv3"
- __authors__ = [("RaNaN", "RaNaN@pyload.de")]
+ __description = """Observe folder and file for changes and add container and links"""
+ __license = "GPLv3"
+ __authors = [("RaNaN", "RaNaN@pyload.de")]
def setup(self):
diff --git a/pyload/plugin/addon/IRCInterface.py b/pyload/plugin/addon/IRCInterface.py
index 86d9ea688..2f61479ab 100644
--- a/pyload/plugin/addon/IRCInterface.py
+++ b/pyload/plugin/addon/IRCInterface.py
@@ -18,11 +18,11 @@ from pyload.utils import formatSize
class IRCInterface(Thread, Addon):
- __name__ = "IRCInterface"
- __type__ = "addon"
- __version__ = "0.13"
+ __name = "IRCInterface"
+ __type = "addon"
+ __version = "0.13"
- __config__ = [("host" , "str" , "IRC-Server Address" , "Enter your server here!"),
+ __config = [("host" , "str" , "IRC-Server Address" , "Enter your server here!"),
("port" , "int" , "IRC-Server Port" , 6667 ),
("ident" , "str" , "Clients ident" , "pyload-irc" ),
("realname" , "str" , "Realname" , "pyload-irc" ),
@@ -33,9 +33,9 @@ class IRCInterface(Thread, Addon):
("info_pack", "bool", "Inform about every package finished" , True ),
("captcha" , "bool", "Send captcha requests" , True )]
- __description__ = """Connect to irc and let owner perform different tasks"""
- __license__ = "GPLv3"
- __authors__ = [("Jeix", "Jeix@hasnomail.com")]
+ __description = """Connect to irc and let owner perform different tasks"""
+ __license = "GPLv3"
+ __authors = [("Jeix", "Jeix@hasnomail.com")]
def __init__(self, core, manager):
diff --git a/pyload/plugin/addon/JustPremium.py b/pyload/plugin/addon/JustPremium.py
index d3c4d8eff..b902073a6 100644
--- a/pyload/plugin/addon/JustPremium.py
+++ b/pyload/plugin/addon/JustPremium.py
@@ -6,15 +6,15 @@ from pyload.plugin.Addon import Addon
class JustPremium(Addon):
- __name__ = "JustPremium"
- __type__ = "addon"
- __version__ = "0.21"
+ __name = "JustPremium"
+ __type = "addon"
+ __version = "0.21"
- __config__ = [("excluded", "str", "Exclude hosters (comma separated)", "")]
+ __config = [("excluded", "str", "Exclude hosters (comma separated)", "")]
- __description__ = """Remove all not premium links from urls added"""
- __license__ = "GPLv3"
- __authors__ = [("mazleu", "mazleica@gmail.com"),
+ __description = """Remove all not premium links from urls added"""
+ __license = "GPLv3"
+ __authors = [("mazleu", "mazleica@gmail.com"),
("Walter Purcaro", "vuolter@gmail.com"),
("immenz", "immenz@gmx.net")]
diff --git a/pyload/plugin/addon/MergeFiles.py b/pyload/plugin/addon/MergeFiles.py
index 11e869aee..5efb8383b 100644
--- a/pyload/plugin/addon/MergeFiles.py
+++ b/pyload/plugin/addon/MergeFiles.py
@@ -12,15 +12,15 @@ from pyload.utils import safe_join
class MergeFiles(Addon):
- __name__ = "MergeFiles"
- __type__ = "addon"
- __version__ = "0.14"
+ __name = "MergeFiles"
+ __type = "addon"
+ __version = "0.14"
- __config__ = [("activated", "bool", "Activated", True)]
+ __config = [("activated", "bool", "Activated", True)]
- __description__ = """Merges parts splitted with hjsplit"""
- __license__ = "GPLv3"
- __authors__ = [("and9000", "me@has-no-mail.com")]
+ __description = """Merges parts splitted with hjsplit"""
+ __license = "GPLv3"
+ __authors = [("and9000", "me@has-no-mail.com")]
BUFFER_SIZE = 4096
diff --git a/pyload/plugin/addon/MultiHome.py b/pyload/plugin/addon/MultiHome.py
index 521749fc8..2841c3a35 100644
--- a/pyload/plugin/addon/MultiHome.py
+++ b/pyload/plugin/addon/MultiHome.py
@@ -6,15 +6,15 @@ from pyload.plugin.Addon import Addon
class MultiHome(Addon):
- __name__ = "MultiHome"
- __type__ = "addon"
- __version__ = "0.12"
+ __name = "MultiHome"
+ __type = "addon"
+ __version = "0.12"
- __config__ = [("interfaces", "str", "Interfaces", "None")]
+ __config = [("interfaces", "str", "Interfaces", "None")]
- __description__ = """Ip address changer"""
- __license__ = "GPLv3"
- __authors__ = [("mkaay", "mkaay@mkaay.de")]
+ __description = """Ip address changer"""
+ __license = "GPLv3"
+ __authors = [("mkaay", "mkaay@mkaay.de")]
def setup(self):
diff --git a/pyload/plugin/addon/RestartFailed.py b/pyload/plugin/addon/RestartFailed.py
index 2fe5f13bf..5611cc791 100644
--- a/pyload/plugin/addon/RestartFailed.py
+++ b/pyload/plugin/addon/RestartFailed.py
@@ -4,16 +4,16 @@ from pyload.plugin.Addon import Addon
class RestartFailed(Addon):
- __name__ = "RestartFailed"
- __type__ = "addon"
- __version__ = "1.57"
+ __name = "RestartFailed"
+ __type = "addon"
+ __version = "1.57"
- __config__ = [("activated", "bool", "Activated" , True),
+ __config = [("activated", "bool", "Activated" , True),
("interval" , "int" , "Check interval in minutes", 90 )]
- __description__ = """Periodically restart all failed downloads in queue"""
- __license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ __description = """Periodically restart all failed downloads in queue"""
+ __license = "GPLv3"
+ __authors = [("Walter Purcaro", "vuolter@gmail.com")]
# event_list = ["pluginConfigChanged"]
@@ -42,4 +42,4 @@ class RestartFailed(Addon):
def activate(self):
- self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval"))
+ self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval"))
diff --git a/pyload/plugin/addon/RestartSlow.py b/pyload/plugin/addon/RestartSlow.py
index 332047da7..796aed257 100644
--- a/pyload/plugin/addon/RestartSlow.py
+++ b/pyload/plugin/addon/RestartSlow.py
@@ -6,19 +6,19 @@ from pyload.plugin.Addon import Addon
class RestartSlow(Addon):
- __name__ = "RestartSlow"
- __type__ = "addon"
- __version__ = "0.04"
+ __name = "RestartSlow"
+ __type = "addon"
+ __version = "0.04"
- __config__ = [("free_limit" , "int" , "Transfer speed threshold in kilobytes" , 100 ),
+ __config = [("free_limit" , "int" , "Transfer speed threshold in kilobytes" , 100 ),
("free_time" , "int" , "Sample interval in minutes" , 5 ),
("premium_limit", "int" , "Transfer speed threshold for premium download in kilobytes", 300 ),
("premium_time" , "int" , "Sample interval for premium download in minutes" , 2 ),
("safe_mode" , "bool", "Don't restart if download is not resumable" , True)]
- __description__ = """Restart slow downloads"""
- __license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ __description = """Restart slow downloads"""
+ __license = "GPLv3"
+ __authors = [("Walter Purcaro", "vuolter@gmail.com")]
event_map = {'download-start': "downloadStarts"}
diff --git a/pyload/plugin/addon/SkipRev.py b/pyload/plugin/addon/SkipRev.py
index efc96cb7b..5e56637a8 100644
--- a/pyload/plugin/addon/SkipRev.py
+++ b/pyload/plugin/addon/SkipRev.py
@@ -16,15 +16,15 @@ def _setup(self):
class SkipRev(Addon):
- __name__ = "SkipRev"
- __type__ = "addon"
- __version__ = "0.25"
+ __name = "SkipRev"
+ __type = "addon"
+ __version = "0.25"
- __config__ = [("tokeep", "int", "Number of rev files to keep for package (-1 to auto)", -1)]
+ __config = [("tokeep", "int", "Number of rev files to keep for package (-1 to auto)", -1)]
- __description__ = """Skip files ending with extension rev"""
- __license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ __description = """Skip files ending with extension rev"""
+ __license = "GPLv3"
+ __authors = [("Walter Purcaro", "vuolter@gmail.com")]
def _pyname(self, pyfile):
diff --git a/pyload/plugin/addon/UnSkipOnFail.py b/pyload/plugin/addon/UnSkipOnFail.py
index 7d787d1ed..bf9d781da 100644
--- a/pyload/plugin/addon/UnSkipOnFail.py
+++ b/pyload/plugin/addon/UnSkipOnFail.py
@@ -5,15 +5,15 @@ from pyload.plugin.Addon import Addon
class UnSkipOnFail(Addon):
- __name__ = "UnSkipOnFail"
- __type__ = "addon"
- __version__ = "0.05"
+ __name = "UnSkipOnFail"
+ __type = "addon"
+ __version = "0.05"
- __config__ = [("activated", "bool", "Activated", True)]
+ __config = [("activated", "bool", "Activated", True)]
- __description__ = """Queue skipped duplicates when download fails"""
- __license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ __description = """Queue skipped duplicates when download fails"""
+ __license = "GPLv3"
+ __authors = [("Walter Purcaro", "vuolter@gmail.com")]
def downloadFailed(self, pyfile):
diff --git a/pyload/plugin/addon/UpdateManager.py b/pyload/plugin/addon/UpdateManager.py
index cf138f64a..0c803bea6 100644
--- a/pyload/plugin/addon/UpdateManager.py
+++ b/pyload/plugin/addon/UpdateManager.py
@@ -14,26 +14,26 @@ from pyload.utils import safe_join
class UpdateManager(Addon):
- __name__ = "UpdateManager"
- __type__ = "addon"
- __version__ = "0.43"
+ __name = "UpdateManager"
+ __type = "addon"
+ __version = "0.43"
- __config__ = [("activated" , "bool" , "Activated" , True ),
+ __config = [("activated" , "bool" , "Activated" , True ),
("mode" , "pyLoad + plugins;plugins only", "Check updates for" , "pyLoad + plugins"),
("interval" , "int" , "Check interval in hours" , 8 ),
("autorestart" , "bool" , "Automatically restart pyLoad when required" , True ),
("reloadplugins", "bool" , "Monitor plugins for code changes in debug mode", True ),
("nodebugupdate", "bool" , "Don't check for updates in debug mode" , False )]
- __description__ = """Check for updates"""
- __license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ __description = """Check for updates"""
+ __license = "GPLv3"
+ __authors = [("Walter Purcaro", "vuolter@gmail.com")]
# event_list = ["pluginConfigChanged"]
SERVER_URL = "http://updatemanager.pyload.org"
- VERSION = re.compile(r'__version__.*=.*("|\')([\d.]+)')
+ VERSION = re.compile(r'__version.*=.*("|\')([\d.]+)')
MIN_INTERVAL = 3 * 60 * 60 #: 3h minimum check interval (value is in seconds)
@@ -55,13 +55,13 @@ class UpdateManager(Addon):
def activate(self):
- self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval"))
- x = lambda: self.pluginConfigChanged(self.__name__, "reloadplugins", self.getConfig("reloadplugins"))
+ self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval"))
+ x = lambda: self.pluginConfigChanged(self.__name, "reloadplugins", self.getConfig("reloadplugins"))
self.core.scheduler.addJob(10, x, threaded=False)
def deactivate(self):
- self.pluginConfigChanged(self.__name__, "reloadplugins", False)
+ self.pluginConfigChanged(self.__name, "reloadplugins", False)
def setup(self):
@@ -83,15 +83,15 @@ class UpdateManager(Addon):
def autoreloadPlugins(self):
""" reload and reindex all modified plugins """
modules = filter(
- lambda m: m and (m.__name__.startswith("pyload.plugin.") or
- m.__name__.startswith("userplugins.")) and
- m.__name__.count(".") >= 2, sys.modules.itervalues()
+ lambda m: m and (m.__name.startswith("pyload.plugin.") or
+ m.__name.startswith("userplugins.")) and
+ m.__name.count(".") >= 2, sys.modules.itervalues()
)
reloads = []
for m in modules:
- root, type, name = m.__name__.rsplit(".", 2)
+ root, type, name = m.__name.rsplit(".", 2)
id = (type, name)
if type in self.core.pluginManager.plugins:
f = m.__file__.replace(".pyc", ".py")
diff --git a/pyload/plugin/addon/WindowsPhoneNotify.py b/pyload/plugin/addon/WindowsPhoneNotify.py
index b9710c2f0..45324fbdb 100644
--- a/pyload/plugin/addon/WindowsPhoneNotify.py
+++ b/pyload/plugin/addon/WindowsPhoneNotify.py
@@ -8,11 +8,11 @@ from pyload.plugin.Addon import Addon
class WindowsPhoneNotify(Addon):
- __name__ = "WindowsPhoneNotify"
- __type__ = "addon"
- __version__ = "0.07"
+ __name = "WindowsPhoneNotify"
+ __type = "addon"
+ __version = "0.07"
- __config__ = [("id" , "str" , "Push ID" , "" ),
+ __config = [("id" , "str" , "Push ID" , "" ),
("url" , "str" , "Push url" , "" ),
("notifycaptcha" , "bool", "Notify captcha request" , True ),
("notifypackage" , "bool", "Notify package finished" , True ),
@@ -20,9 +20,9 @@ class WindowsPhoneNotify(Addon):
("timeout" , "int" , "Timeout between captchas in seconds" , 5 ),
("force" , "bool", "Send notifications if client is connected", False)]
- __description__ = """Send push notifications to Windows Phone"""
- __license__ = "GPLv3"
- __authors__ = [("Andy Voigt", "phone-support@hotmail.de"),
+ __description = """Send push notifications to Windows Phone"""
+ __license = "GPLv3"
+ __authors = [("Andy Voigt", "phone-support@hotmail.de"),
("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/addon/XMPPInterface.py b/pyload/plugin/addon/XMPPInterface.py
index 77a49af6f..8baffe284 100644
--- a/pyload/plugin/addon/XMPPInterface.py
+++ b/pyload/plugin/addon/XMPPInterface.py
@@ -10,11 +10,11 @@ from pyload.plugin.addon.IRCInterface import IRCInterface
class XMPPInterface(IRCInterface, JabberClient):
- __name__ = "XMPPInterface"
- __type__ = "addon"
- __version__ = "0.11"
+ __name = "XMPPInterface"
+ __type = "addon"
+ __version = "0.11"
- __config__ = [("jid" , "str" , "Jabber ID" , "user@exmaple-jabber-server.org" ),
+ __config = [("jid" , "str" , "Jabber ID" , "user@exmaple-jabber-server.org" ),
("pw" , "str" , "Password" , "" ),
("tls" , "bool", "Use TLS" , False ),
("owners" , "str" , "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"),
@@ -22,9 +22,9 @@ class XMPPInterface(IRCInterface, JabberClient):
("info_pack", "bool", "Inform about every package finished" , True ),
("captcha" , "bool", "Send captcha requests" , True )]
- __description__ = """Connect to jabber and let owner perform different tasks"""
- __license__ = "GPLv3"
- __authors__ = [("RaNaN", "RaNaN@pyload.org")]
+ __description = """Connect to jabber and let owner perform different tasks"""
+ __license = "GPLv3"
+ __authors = [("RaNaN", "RaNaN@pyload.org")]
implements(IMessageHandlersProvider)
--
cgit v1.2.3