#60: active queue-scripts indicated in webui

- the number of active (and queued) scripts are shown in the status dialog in web-interface; this new row is hidden if no scripts are queued; - active queue scripts accounts for activity indicator in web-interface (rotating button); - new field “QueueScriptCount” in API-method “status” indicates number of queue-scripts queued for execution including the currently running.
nzbget · Aug 11, 2015 · ca0af70 · ca0af70
1 parent 6e0a3e0
commit ca0af70
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/daemon/extension/QueueScript.cpp b/daemon/extension/QueueScript.cpp
@@ -504,3 +504,16 @@ bool QueueScriptCoordinator::HasJob(int iNZBID, bool* pActive)
 
 	return bWorking;
 }
+
+int QueueScriptCoordinator::GetQueueSize()
+{
+	m_mutexQueue.Lock();
+	int iQueuedCount = m_Queue.size();
+	if (m_pCurItem)
+	{
+		iQueuedCount++;
+	}
+	m_mutexQueue.Unlock();
+
+	return iQueuedCount;
+}
diff --git a/daemon/extension/QueueScript.h b/daemon/extension/QueueScript.h
@@ -74,6 +74,7 @@ class QueueScriptCoordinator
 	void				EnqueueScript(NZBInfo* pNZBInfo, EEvent eEvent);
 	void				CheckQueue();
 	bool				HasJob(int iNZBID, bool* pActive);
+	int					GetQueueSize();
 };
 
 extern QueueScriptCoordinator* g_pQueueScriptCoordinator;

diff --git a/daemon/remote/XmlRpc.cpp b/daemon/remote/XmlRpc.cpp
@@ -1267,6 +1267,7 @@ void StatusXmlCommand::Execute()
 		"<member><name>ServerTime</name><value><i4>%i</i4></value></member>\n"
 		"<member><name>ResumeTime</name><value><i4>%i</i4></value></member>\n"
 		"<member><name>FeedActive</name><value><boolean>%s</boolean></value></member>\n"
+		"<member><name>QueueScriptCount</name><value><i4>%i</i4></value></member>\n"
 		"<member><name>NewsServers</name><value><array><data>\n";
 
 	const char* XML_STATUS_END =
@@ -1308,6 +1309,7 @@ void StatusXmlCommand::Execute()
 		"\"ServerTime\" : %i,\n"
 		"\"ResumeTime\" : %i,\n"
 		"\"FeedActive\" : %s,\n"
+		"\"QueueScriptCount\" : %i,\n"
 		"\"NewsServers\" : [\n";
 
 	const char* JSON_STATUS_END = 
@@ -1374,7 +1376,8 @@ void StatusXmlCommand::Execute()
 	int iServerTime = time(NULL);
 	int iResumeTime = g_pOptions->GetResumeTime();
 	bool bFeedActive = g_pFeedCoordinator->HasActiveDownloads();
-
+	int iQueuedScripts = g_pQueueScriptCoordinator->GetQueueSize();
+
 	char szContent[3072];
 	snprintf(szContent, 3072, IsJson() ? JSON_STATUS_START : XML_STATUS_START, 
 		iRemainingSizeLo, iRemainingSizeHi, iRemainingMBytes, iForcedSizeLo,
@@ -1385,7 +1388,7 @@ void StatusXmlCommand::Execute()
 		BoolToStr(bDownloadPaused), BoolToStr(bDownloadPaused), BoolToStr(bDownloadPaused), 
 		BoolToStr(bServerStandBy), BoolToStr(bPostPaused), BoolToStr(bScanPaused),
 		iFreeDiskSpaceLo, iFreeDiskSpaceHi,	iFreeDiskSpaceMB, iServerTime, iResumeTime,
-		BoolToStr(bFeedActive));
+		BoolToStr(bFeedActive), iQueuedScripts);
 	szContent[3072-1] = '\0';
 
 	AppendResponse(szContent);

diff --git a/webui/index.html b/webui/index.html
@@ -721,6 +721,7 @@ <h3 id="StatDialog_Title">Statistics and Status</h3>
 							<tr><td>Current download speed</td><td class="text-right" id="StatDialog_DataCurrentSpeed"></td></tr>
 							<tr><td>Current speed limit</td><td class="text-right" id="StatDialog_DataSpeedLimit"></td></tr>
 							<tr id="StatDialog_ArticleCache_Row"><td>Article cache</td><td class="text-right" id="StatDialog_ArticleCache"></td></tr>
+							<tr id="StatDialog_QueueScripts_Row"><td>Queue-scripts</td><td class="text-right" id="StatDialog_QueueScripts"></td></tr>
 						</tbody>
 					</table>
 					<br>

diff --git a/webui/status.js b/webui/status.js
@@ -229,7 +229,7 @@ var Status = (new function($)
 	function updatePlayAnim()
 	{
 		// Animate if either any downloads or post-processing is in progress
-		var Anim = (!status.ServerStandBy || status.FeedActive ||
+		var Anim = (!status.ServerStandBy || status.FeedActive || status.QueueScriptCount > 0 ||
 			(status.PostJobCount > 0 && !status.PostPaused) ||
 			(status.UrlCount > 0 && (!status.DownloadPaused || Options.option('UrlForce') === 'yes'))) &&
 			(UISettings.refreshInterval !== 0) && !UISettings.connectionError;
@@ -375,6 +375,7 @@ var StatDialog = (new function($)
 	var $StatDialog_DataCurrentSpeed;
 	var $StatDialog_DataSpeedLimit;
 	var $StatDialog_ArticleCache;
+	var $StatDialog_QueueScripts;
 	var $StatDialog_ChartBlock;
 	var $StatDialog_Server;
 	var $StatRangeDialog;
@@ -421,7 +422,8 @@ var StatDialog = (new function($)
 		$StatDialog_DataAverageSpeed = $('#StatDialog_DataAverageSpeed');
 		$StatDialog_DataCurrentSpeed = $('#StatDialog_DataCurrentSpeed');
 		$StatDialog_DataSpeedLimit = $('#StatDialog_DataSpeedLimit');
-		$StatDialog_ArticleCache = $('#StatDialog_ArticleCache');		
+		$StatDialog_ArticleCache = $('#StatDialog_ArticleCache');
+		$StatDialog_QueueScripts = $('#StatDialog_QueueScripts');
 		$StatDialog_ChartBlock = $('#StatDialog_ChartBlock');
 		$StatDialog_Server = $('#StatDialog_Server');
 		$StatRangeDialog = $('#StatRangeDialog');
@@ -498,6 +500,7 @@ var StatDialog = (new function($)
 		$('#StatDialog_BackSpace').show();
 		$('#StatDialog_Title').text('Statistics and Status');
 		Util.show('#StatDialog_ArticleCache_Row', Options.option('ArticleCache') !== '0');
+		Util.show('#StatDialog_QueueScripts_Row', Status.status.QueueScriptCount > 0);
 		$StatDialog.removeClass('modal-large').addClass('modal-mini');
 		monthListInitialized = false;
 		updateServerList();
@@ -546,6 +549,7 @@ var StatDialog = (new function($)
 		$StatDialog_DataCurrentSpeed.html(Util.formatSpeed(status.DownloadRate));
 		$StatDialog_DataSpeedLimit.html(Util.formatSpeed(status.DownloadLimit));
 		$StatDialog_ArticleCache.html(Util.formatSizeMB(status.ArticleCacheMB, status.ArticleCacheLo));
+		$StatDialog_QueueScripts.html(status.QueueScriptCount);
 
 		var content = '';
 		content += '<tr><td>Download</td><td class="text-right">' +