From 6e8a0f79f5ad7182a0bc35308ae06c63222667ed Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 23 Mar 2013 21:56:42 +0100 Subject: implemented interactions for multi user, show waiting queries on webui --- module/api/CoreApi.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/api/CoreApi.py') diff --git a/module/api/CoreApi.py b/module/api/CoreApi.py index d75fe6ad6..e5c5e8b41 100644 --- a/module/api/CoreApi.py +++ b/module/api/CoreApi.py @@ -1,13 +1,12 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from module.Api import Api, RequirePerm, Permission, ServerStatus +from module.Api import Api, RequirePerm, Permission, ServerStatus, Interaction from module.utils.fs import join, free_space from module.utils import compare_time from ApiComponent import ApiComponent - class CoreApi(ApiComponent): """ This module provides methods for general interaction with the core, like status or progress retrieval """ @@ -34,7 +33,7 @@ class CoreApi(ApiComponent): serverStatus = ServerStatus(0, total[0], queue[0], total[1], queue[1], - 0, + self.isInteractionWaiting(Interaction.All), not self.core.threadManager.pause and self.isTimeDownload(), self.core.threadManager.pause, self.core.config['reconnect']['activated'] and self.isTimeReconnect()) -- cgit v1.2.3