diff options
Diffstat (limited to 'pyload/plugin/addon')
| -rw-r--r-- | pyload/plugin/addon/AndroidPhoneNotify.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/Checksum.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/ClickAndLoad.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/DeleteFinished.py | 16 | ||||
| -rw-r--r-- | pyload/plugin/addon/DownloadScheduler.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/ExternalScripts.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/ExtractArchive.py | 18 | ||||
| -rw-r--r-- | pyload/plugin/addon/HotFolder.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/IRCInterface.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/JustPremium.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/MergeFiles.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/MultiHome.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/RestartFailed.py | 16 | ||||
| -rw-r--r-- | pyload/plugin/addon/RestartSlow.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/SkipRev.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/UnSkipOnFail.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/UpdateManager.py | 30 | ||||
| -rw-r--r-- | pyload/plugin/addon/WindowsPhoneNotify.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/addon/XMPPInterface.py | 14 |
19 files changed, 145 insertions, 145 deletions
diff --git a/pyload/plugin/addon/AndroidPhoneNotify.py b/pyload/plugin/addon/AndroidPhoneNotify.py index 148008116..2b4f8fcca 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 76a4954ac..a45e21812 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 c5042ede6..728580cac 100644 --- a/pyload/plugin/addon/ClickAndLoad.py +++ b/pyload/plugin/addon/ClickAndLoad.py @@ -21,17 +21,17 @@ def forward(source, destination): #@TODO: IPv6 support class ClickAndLoad(Addon): - __name = "ClickAndLoad" - __type = "addon" - __version = "0.37" + __name__ = "ClickAndLoad" + __type__ = "addon" + __version__ = "0.37" - __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 045f58d61..59f2e3321 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 7f05d89f4..e5e25e389 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 137003595..3d490a1f5 100644 --- a/pyload/plugin/addon/ExternalScripts.py +++ b/pyload/plugin/addon/ExternalScripts.py @@ -10,16 +10,16 @@ from pyload.utils import fs_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 245b24322..337b3ea30 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.30" + __name__ = "ExtractArchive" + __type__ = "addon" + __version__ = "1.30" - __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 ), @@ -123,9 +123,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" )] @@ -170,7 +170,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)) self.extractQueued() #: Resume unfinished extractions else: self.logInfo(_("No Extract plugins activated")) @@ -282,7 +282,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 3d70853e6..1b1235f09 100644 --- a/pyload/plugin/addon/HotFolder.py +++ b/pyload/plugin/addon/HotFolder.py @@ -12,18 +12,18 @@ from pyload.utils import fs_encode, fs_join class HotFolder(Addon): - __name = "HotFolder" - __type = "addon" - __version = "0.13" + __name__ = "HotFolder" + __type__ = "addon" + __version__ = "0.13" - __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 2f61479ab..86d9ea688 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 b902073a6..d3c4d8eff 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 f1981e5f1..d4cecf05d 100644 --- a/pyload/plugin/addon/MergeFiles.py +++ b/pyload/plugin/addon/MergeFiles.py @@ -12,15 +12,15 @@ from pyload.utils import fs_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 2841c3a35..521749fc8 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 5611cc791..2fe5f13bf 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 796aed257..332047da7 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 5e56637a8..efc96cb7b 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 bf9d781da..7d787d1ed 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 fe5efe04c..5fdd6011a 100644 --- a/pyload/plugin/addon/UpdateManager.py +++ b/pyload/plugin/addon/UpdateManager.py @@ -14,26 +14,26 @@ from pyload.utils import fs_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 45324fbdb..b9710c2f0 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 8baffe284..77a49af6f 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) |