added progress type enum, new DebugCrypter + Hoster, little improvements for crypter api

3 files changed, 3 insertions, 4 deletions

diff --git a/pyload/threads/AddonThread.py b/pyload/threads/AddonThread.py
index fd613bdec..d8d84cbfa 100644
--- a/pyload/threads/AddonThread.py
+++ b/pyload/threads/AddonThread.py
@@ -4,7 +4,7 @@
 from copy import copy
 from traceback import print_exc
 
-from pyload.Api import ProgressInfo
+from pyload.Api import ProgressInfo, ProgressType
 from BaseThread import BaseThread
 
 class AddonThread(BaseThread):
@@ -38,7 +38,7 @@ class AddonThread(BaseThread):
         if self.active:
             active = self.active[0]
             return ProgressInfo(active.pluginname, active.name, active.getStatusName(), 0,
-                                self.progress, 100)
+                                self.progress, 100, self.owner, ProgressType.Addon)
 
     def addActive(self, pyfile):
         """ Adds a pyfile to active list and thus will be displayed on overview"""
diff --git a/pyload/threads/DecrypterThread.py b/pyload/threads/DecrypterThread.py
index 10d47fcc2..a0bebdfbf 100644
--- a/pyload/threads/DecrypterThread.py
+++ b/pyload/threads/DecrypterThread.py
@@ -35,7 +35,7 @@ class DecrypterThread(BaseThread):
         for p in packages:
             self.m.core.api.addPackage(p.name, p.getURLs(), pack.password)
 
-    def decrypt(self, plugin_map, password=None, err=None):
+    def decrypt(self, plugin_map, password=None, err=False):
         result = []
 
         # TODO QUEUE_DECRYPT
diff --git a/pyload/threads/DownloadThread.py b/pyload/threads/DownloadThread.py
index 4c4ee597c..d1672531b 100644
--- a/pyload/threads/DownloadThread.py
+++ b/pyload/threads/DownloadThread.py
@@ -216,7 +216,6 @@ class DownloadThread(BaseThread):
         if self.active:
             return self.active.getProgressInfo()
 
-
     def put(self, job):
         """assign a job to the thread"""
         self.queue.put(job)