From 50d4df8b4d48b855bd18e9922355b7f3f2b4da4e Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 20 Mar 2012 14:57:45 +0100
Subject: captcha decrypting for all plugin types, new interaction manager

---
 module/web/json_app.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'module/web/json_app.py')

diff --git a/module/web/json_app.py b/module/web/json_app.py
index fcaa906e1..ed4f6bcfb 100644
--- a/module/web/json_app.py
+++ b/module/web/json_app.py
@@ -11,6 +11,7 @@ from webinterface import PYLOAD
 
 from utils import login_required, render_to_response, toDict
 
+from module.Api import Output
 from module.utils import decode, format_size
 
 def get_sort_key(item):
@@ -23,7 +24,7 @@ def get_sort_key(item):
 def status():
     try:
         status = toDict(PYLOAD.statusServer())
-        status['captcha'] = PYLOAD.isCaptchaWaiting()
+        status['captcha'] = PYLOAD.isInteractionWaiting(Output.Captcha)
         return status
     except:
         return HTTPError()
@@ -34,7 +35,7 @@ def status():
 @login_required('LIST')
 def links():
     try:
-        links = [toDict(x) for x in PYLOAD.statusDownloads()]
+        links = [toDict(x) for x in PYLOAD.getProgressInfo()]
         ids = []
         for link in links:
             ids.append(link['fid'])
-- 
cgit v1.2.3