Merge commit 'a976b71c3c1996e02a5a0469013ba4762e7a8a85' into develop

airdcpp-web · Feb 8, 2016 · badf5f8 · badf5f8
2 parents c307dbb + a976b71
commit badf5f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/airdcpp-webapi/api/TransferApi.cpp b/airdcpp-webapi/api/TransferApi.cpp
@@ -219,8 +219,7 @@ namespace webserver {
 		if (timeSinceStarted < 1000) {
 			t->setStatusString(aIsDownload ? STRING(DOWNLOAD_STARTING) : STRING(UPLOAD_STARTING));
 		} else {
-			auto pct = t->getSize() > 0 ? (double)t->getBytesTransferred() * 100.0 / (double)t->getSize() : 0;
-			t->setStatusString(STRING_F(RUNNING_PCT, pct));
+			t->setStatusString(STRING_F(RUNNING_PCT, t->getPercentage()));
 		}
 
 		view.onItemUpdated(t, { PROP_STATUS, PROP_BYTES_TRANSFERRED, PROP_SPEED, PROP_SECONDS_LEFT });

diff --git a/airdcpp-webapi/api/TransferInfo.h b/airdcpp-webapi/api/TransferInfo.h
@@ -31,8 +31,8 @@ namespace webserver {
 	public:
 		enum ItemState {
 			STATE_WAITING,
-			STATE_RUNNING,
 			STATE_FAILED,
+			STATE_RUNNING,
 			STATE_FINISHED,
 			STATE_LAST,
 		};
@@ -65,6 +65,10 @@ namespace webserver {
 			return token;
 		}
 
+		double getPercentage() const noexcept {
+			return size > 0 ? static_cast<double>(bytesTransferred) * 100.0 / static_cast<double>(size) : 0;
+		}
+
 		const string& getStringToken() const noexcept {
 			return stringToken;
 		}

diff --git a/airdcpp-webapi/api/TransferUtils.cpp b/airdcpp-webapi/api/TransferUtils.cpp
@@ -69,7 +69,7 @@ namespace webserver {
 			}
 
 			if (a->getState() == TransferInfo::STATE_RUNNING) {
-				return compare(a->getBytesTransferred(), b->getBytesTransferred());
+				return compare(a->getPercentage(), b->getPercentage());
 			}
 
 			return Util::stricmp(a->getStatusString(), b->getStatusString());