From ad5727021807ca0ff7720a74dce551a53310eeca Mon Sep 17 00:00:00 2001
From: Kurt Kartaltepe <kkartaltepe@gmail.com>
Date: Tue, 20 Sep 2016 17:58:00 -0500
Subject: [PATCH] Add status for 'verifing' and 'verifyPending'

---
 index.html       | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
 js/ctrls/main.js | 19 +++++++++-----
 2 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index d4d0a31..8eb8eee 100755
--- a/index.html
+++ b/index.html
@@ -555,6 +555,72 @@
 
           <!-- }}} -->
         </ul>
+        
+        <ul class="stats pull-left" ng-switch-when="verifing">
+          <!-- {{{ active download statistics -->
+          <li class="label label-warning hidden-phone hidden-tablet">
+            <span title="{{ 'Download status' | translate }}"><span class="fa fa-fw fa-play">&nbsp;</span> {{download.status}}</span>
+          </li>
+
+          <li class="label label-default" ng-class="{'label-active': download.downloadSpeed > 2048, 'label-warning': download.downloadSpeed <= 2048}">
+            <span title="{{ 'Download Speed' | translate }}"><span class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</span> {{download.downloadSpeed | bspeed}}</span>
+          </li>
+
+          <li ng-show="download.bittorrent" class="label label-default hidden-phone" ng-class="{'label-info': download.uploadSpeed > 2048}">
+            <span title="{{ 'Upload Speed' | translate }}"><span class="fa fa-fw fa-arrow-circle-o-up">&nbsp;</span> {{download.uploadSpeed | bspeed}}</span>
+          </li>
+
+          <li class="label label-active">
+            <span title="{{ 'Estimated time' | translate }}"><span class="fa fa-fw fa-clock-o">&nbsp;</span> {{getEta(download) | time}}</span>
+          </li>
+
+          <li class="label label-active hidden-phone">
+            <span title="{{ 'Download Size' | translate }}"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
+          </li>
+
+          <li class="label label-active hidden-phone">
+            <span title="{{ 'Downloaded' | translate }}"><span class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</span> {{download.fmtCompletedLength}}</span>
+          </li>
+
+          <li class="label label-active hidden-phone hidden-tablet">
+            <span title="{{ 'Progress' | translate }}"><span class="fa fa-fw fa-chevron-right">&nbsp;</span> {{getProgress(download)}}%</span>
+          </li>
+
+          <!-- }}} -->
+        </ul>
+
+        <ul class="stats pull-left" ng-switch-when="verifyPending">
+          <!-- {{{ active download statistics -->
+          <li class="label label-warning hidden-phone hidden-tablet">
+            <span title="{{ 'Download status' | translate }}"><span class="fa fa-fw fa-play">&nbsp;</span> {{download.status}}</span>
+          </li>
+
+          <li class="label label-default" ng-class="{'label-active': download.downloadSpeed > 2048, 'label-warning': download.downloadSpeed <= 2048}">
+            <span title="{{ 'Download Speed' | translate }}"><span class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</span> {{download.downloadSpeed | bspeed}}</span>
+          </li>
+
+          <li ng-show="download.bittorrent" class="label label-default hidden-phone" ng-class="{'label-info': download.uploadSpeed > 2048}">
+            <span title="{{ 'Upload Speed' | translate }}"><span class="fa fa-fw fa-arrow-circle-o-up">&nbsp;</span> {{download.uploadSpeed | bspeed}}</span>
+          </li>
+
+          <li class="label label-active">
+            <span title="{{ 'Estimated time' | translate }}"><span class="fa fa-fw fa-clock-o">&nbsp;</span> {{getEta(download) | time}}</span>
+          </li>
+
+          <li class="label label-active hidden-phone">
+            <span title="{{ 'Download Size' | translate }}"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
+          </li>
+
+          <li class="label label-active hidden-phone">
+            <span title="{{ 'Downloaded' | translate }}"><span class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</span> {{download.fmtCompletedLength}}</span>
+          </li>
+
+          <li class="label label-active hidden-phone hidden-tablet">
+            <span title="{{ 'Progress' | translate }}"><span class="fa fa-fw fa-chevron-right">&nbsp;</span> {{getProgress(download)}}%</span>
+          </li>
+
+          <!-- }}} -->
+        </ul>
 
         <ul class="stats pull-left" ng-switch-when="paused">
           <!-- {{{ paused download statistics -->
diff --git a/js/ctrls/main.js b/js/ctrls/main.js
index 467dfce..5c34bc2 100755
--- a/js/ctrls/main.js
+++ b/js/ctrls/main.js
@@ -398,16 +398,24 @@ function(
 				animCollapsed: true,
 				files: [],
 			};
-			if (d.verifiedLength)
+			if (d.verifiedLength) {
 				ctx.verifiedLength = d.verifiedLength;
-			if (d.verifyIntegrityPending)
+				ctx.status = "verifing";
+			}
+			if (d.verifyIntegrityPending) {
 				ctx.verifyIntegrityPending = d.verifyIntegrityPending;
+				ctx.status = "verifyPending";
+			}
 		}
 		else {
 		    if (ctx.gid !== d.gid)
 		        ctx.files = [];
 			ctx.dir = d.dir;
 			ctx.status = d.status;
+			if(d.verifiedLength)
+				ctx.status = "verifing";
+			if(d.verifyIntegrityPending)
+				ctx.status = "verifyPending"
 			ctx.errorCode = d.errorCode;
 			ctx.gid = d.gid;
 			ctx.followedBy = (d.followedBy && d.followedBy.length == 1
@@ -534,10 +542,9 @@ function(
 			case "removed":
 				return "progress-bar-warning";
 			case "active":
-				if (d.verifyIntegrityPending || d.verifiedLength)
-					return "progress-bar-warning"
-				else
-					return "active";
+				return "active";
+			case "verifing":
+				return "progress-bar-warning";
 			case "complete":
 				return "progress-bar-success";
 			default: