__config__ cleanup for addons

11 files changed, 63 insertions, 55 deletions

diff --git a/pyload/plugins/addon/Checksum.py b/pyload/plugins/addon/Checksum.py
index 4c5bb39ef..3e1b90941 100644
--- a/pyload/plugins/addon/Checksum.py
+++ b/pyload/plugins/addon/Checksum.py
@@ -42,11 +42,12 @@ class Checksum(Addon):
     __type__    = "addon"
     __version__ = "0.14"
 
-    __config__ = [("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)]
+    __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"
diff --git a/pyload/plugins/addon/DeleteFinished.py b/pyload/plugins/addon/DeleteFinished.py
index c21b0a589..6c2ba38d8 100644
--- a/pyload/plugins/addon/DeleteFinished.py
+++ b/pyload/plugins/addon/DeleteFinished.py
@@ -9,8 +9,8 @@ class DeleteFinished(Addon):
     __type__    = "addon"
     __version__ = "1.11"
 
-    __config__ = [('activated', 'bool', 'Activated', 'False'),
-                  ('interval', 'int', 'Delete every (hours)', '72'),
+    __config__ = [("activated" , "bool", "Activated"                         , False  ),
+                  ('interval'  , 'int' , 'Delete every (hours)'              , '72'   ),
                   ('deloffline', 'bool', 'Delete packages with offline links', 'False')]
 
     __description__ = """Automatically delete all finished packages from queue"""
diff --git a/pyload/plugins/addon/DownloadScheduler.py b/pyload/plugins/addon/DownloadScheduler.py
index 9ca4609a6..a35bba04e 100644
--- a/pyload/plugins/addon/DownloadScheduler.py
+++ b/pyload/plugins/addon/DownloadScheduler.py
@@ -12,9 +12,8 @@ class DownloadScheduler(Addon):
     __type__    = "addon"
     __version__ = "0.21"
 
-    __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)]
+    __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"
diff --git a/pyload/plugins/addon/ExtractArchive.py b/pyload/plugins/addon/ExtractArchive.py
index 6946190ed..91f477cf8 100644
--- a/pyload/plugins/addon/ExtractArchive.py
+++ b/pyload/plugins/addon/ExtractArchive.py
@@ -59,17 +59,17 @@ class ExtractArchive(Addon):
     __type__    = "addon"
     __version__ = "0.17"
 
-    __config__ = [("activated", "bool", "Activated", True),
-                  ("fullpath", "bool", "Extract full path", True),
-                  ("overwrite", "bool", "Overwrite files", True),
-                  ("passwordfile", "file", "password file", "archive_password.txt"),
-                  ("deletearchive", "bool", "Delete archives when done", False),
-                  ("subfolder", "bool", "Create subfolder for each package", False),
-                  ("destination", "folder", "Extract files to", ""),
-                  ("excludefiles", "str", "Exclude files from unpacking (seperated by ;)", ""),
-                  ("recursive", "bool", "Extract archives in archvies", True),
-                  ("queue", "bool", "Wait for all downloads to be finished", True),
-                  ("renice", "int", "CPU Priority", 0)]
+    __config__ = [("activated"    , "bool"  , "Activated"                                    , True                  ),
+                  ("fullpath"     , "bool"  , "Extract full path"                            , True                  ),
+                  ("overwrite"    , "bool"  , "Overwrite files"                              , True                  ),
+                  ("passwordfile" , "file"  , "password file"                                , "archive_password.txt"),
+                  ("deletearchive", "bool"  , "Delete archives when done"                    , False                 ),
+                  ("subfolder"    , "bool"  , "Create subfolder for each package"            , False                 ),
+                  ("destination"  , "folder", "Extract files to"                             , ""                    ),
+                  ("excludefiles" , "str"   , "Exclude files from unpacking (seperated by ;)", ""                    ),
+                  ("recursive"    , "bool"  , "Extract archives in archvies"                 , True                  ),
+                  ("queue"        , "bool"  , "Wait for all downloads to be finished"        , True                  ),
+                  ("renice"       , "int"   , "CPU Priority"                                 , 0                     )]
 
     __description__ = """Extract different kind of archives"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/addon/HotFolder.py b/pyload/plugins/addon/HotFolder.py
index 491b9e2da..e91b9e04f 100644
--- a/pyload/plugins/addon/HotFolder.py
+++ b/pyload/plugins/addon/HotFolder.py
@@ -15,10 +15,11 @@ class HotFolder(Addon):
     __type__    = "addon"
     __version__ = "0.11"
 
-    __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")]
+    __config__ = [("activated" , "bool", "Activated"            , False      ),
+                  ("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"
diff --git a/pyload/plugins/addon/IRCInterface.py b/pyload/plugins/addon/IRCInterface.py
index cbb97038b..a89efcd0c 100644
--- a/pyload/plugins/addon/IRCInterface.py
+++ b/pyload/plugins/addon/IRCInterface.py
@@ -22,16 +22,17 @@ class IRCInterface(Thread, Addon):
     __type__    = "addon"
     __version__ = "0.12"
 
-    __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"),
-                  ("ssl", "bool", "Use SSL", False),
-                  ("nick", "str", "Nickname the Client will take", "pyLoad-IRC"),
-                  ("owner", "str", "Nickname the Client will accept commands from", "Enter your nick here!"),
-                  ("info_file", "bool", "Inform about every file finished", False),
-                  ("info_pack", "bool", "Inform about every package finished", True),
-                  ("captcha", "bool", "Send captcha requests", True)]
+    __config__ = [("activated", "bool", "Activated", False),
+                  ("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"             ),
+                  ("ssl"      , "bool", "Use SSL"                                      , False                    ),
+                  ("nick"     , "str" , "Nickname the Client will take"                , "pyLoad-IRC"             ),
+                  ("owner"    , "str" , "Nickname the Client will accept commands from", "Enter your nick here!"  ),
+                  ("info_file", "bool", "Inform about every file finished"             , False                    ),
+                  ("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"
diff --git a/pyload/plugins/addon/MultiHome.py b/pyload/plugins/addon/MultiHome.py
index e7ae5168c..4371125dc 100644
--- a/pyload/plugins/addon/MultiHome.py
+++ b/pyload/plugins/addon/MultiHome.py
@@ -10,7 +10,8 @@ class MultiHome(Addon):
     __type__    = "addon"
     __version__ = "0.11"
 
-    __config__ = [("interfaces", "str", "Interfaces", "None")]
+    __config__ = [("activated" , "bool", "Activated" , False ),
+                  ("interfaces", "str" , "Interfaces", "None")]
 
     __description__ = """Ip address changer"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/addon/RestartFailed.py b/pyload/plugins/addon/RestartFailed.py
index 7405e2f75..861223f3d 100644
--- a/pyload/plugins/addon/RestartFailed.py
+++ b/pyload/plugins/addon/RestartFailed.py
@@ -8,7 +8,8 @@ class RestartFailed(Addon):
     __type__    = "addon"
     __version__ = "1.57"
 
-    __config__ = [("interval", "int", "Check interval in minutes", 90)]
+    __config__ = [("activated", "bool", "Activated"                , True),
+                  ("interval" , "int" , "Check interval in minutes", 90  )]
 
     __description__ = """Periodically restart all failed downloads in queue"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/addon/UpdateManager.py b/pyload/plugins/addon/UpdateManager.py
index 7b2ab1524..082721e2f 100644
--- a/pyload/plugins/addon/UpdateManager.py
+++ b/pyload/plugins/addon/UpdateManager.py
@@ -16,11 +16,11 @@ class UpdateManager(Addon):
     __type__    = "addon"
     __version__ = "0.40"
 
-    __config__ = [("activated", "bool", "Activated", True),
-                  ("mode", "pyLoad + plugins;plugins only", "Check updates for", "pyLoad + plugins"),
-                  ("interval", "int", "Check interval in hours", 8),
-                  ("reloadplugins", "bool", "Monitor plugins for code changes (debug mode only)", True),
-                  ("nodebugupdate", "bool", "Don't check for updates in debug mode", True)]
+    __config__ = [("activated"    , "bool"                         , "Activated"                                         , True              ),
+                  ("mode"         , "pyLoad + plugins;plugins only", "Check updates for"                                 , "pyLoad + plugins"),
+                  ("interval"     , "int"                          , "Check interval in hours"                           , 8                 ),
+                  ("reloadplugins", "bool"                         , "Monitor plugins for code changes (debug mode only)", True              ),
+                  ("nodebugupdate", "bool"                         , "Don't check for updates in debug mode"             , True              )]
 
     __description__ = """Check for updates"""
     __license__     = "GPLv3"
@@ -106,8 +106,10 @@ class UpdateManager(Addon):
 
 
     def periodical(self):
-        if not self.info['pyload'] and not (self.getConfig("nodebugupdate") and self.core.debug):
-            self.updateThread()
+        if self.info['pyload'] or self.getConfig("nodebugupdate") and self.core.debug:
+            return
+
+        self.updateThread()
 
 
     def server_request(self):
diff --git a/pyload/plugins/addon/WindowsPhoneToastNotify.py b/pyload/plugins/addon/WindowsPhoneToastNotify.py
index 4c57ff72c..5b62c49a8 100644
--- a/pyload/plugins/addon/WindowsPhoneToastNotify.py
+++ b/pyload/plugins/addon/WindowsPhoneToastNotify.py
@@ -11,10 +11,11 @@ class WindowsPhoneToastNotify(Addon):
     __type__    = "addon"
     __version__ = "0.02"
 
-    __config__ = [("force", "bool", "Force even if client is connected", False),
-                  ("pushId", "str", "pushId", ""),
-                  ("pushUrl", "str", "pushUrl", ""),
-                  ("pushTimeout", "int", "Timeout between notifications in seconds", 0)]
+    __config__ = [("activated"  , "bool", "Activated"                               , False),
+                  ("force"      , "bool", "Force even if client is connected"       , False),
+                  ("pushId"     , "str" , "pushId"                                  , ""   ),
+                  ("pushUrl"    , "str" , "pushUrl"                                 , ""   ),
+                  ("pushTimeout", "int" , "Timeout between notifications in seconds", 0    )]
 
     __description__ = """Send push notifications to Windows Phone"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/addon/XMPPInterface.py b/pyload/plugins/addon/XMPPInterface.py
index 07db5c66a..7b11bd4dd 100644
--- a/pyload/plugins/addon/XMPPInterface.py
+++ b/pyload/plugins/addon/XMPPInterface.py
@@ -14,13 +14,14 @@ class XMPPInterface(IRCInterface, JabberClient):
     __type__    = "addon"
     __version__ = "0.11"
 
-    __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"),
-                  ("info_file", "bool", "Inform about every file finished", False),
-                  ("info_pack", "bool", "Inform about every package finished", True),
-                  ("captcha", "bool", "Send captcha requests", True)]
+    __config__ = [("activated", "bool", "Activated"                           , False                                    ),
+                  ("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"),
+                  ("info_file", "bool", "Inform about every file finished"    , False                                    ),
+                  ("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"