[daemon] [gui] downloads calcs (estimated interval, speed) now on daemon side #optimalization

Author: spaceAngel

gui/snippets/mainpanel/downloads.html

@@ -8,10 +8,10 @@
 				<% download.bytesReceived / 1024| bytesToHuman %> / <% download.bytesTotal / 1024 | bytesToHuman %>
 			</div>
 			<div class="w33">
-				<% (Date.parse(download.estimatedEndTime) - (new Date)) | milisecondsToHuman %>
+				<% download.estimatedInterval * 1000| milisecondsToHuman %>
 			</div>
 			<div class="w33">
-				<% (download.bytesTotal - download.bytesReceived) / (Date.parse(download.estimatedEndTime) - (new Date)) | bytesToHuman %> / s
+				<% download.speed | bytesToHuman %> / s 
 			</div>
 		</div>
 	</div>

src/CyberPanel/Commands/Commands/DownloadsCommand.php

@@ -13,7 +13,8 @@ public function run() : array {
 				'filename' => $download->getFilename(),
 				'bytesReceived' => $download->getDownloaded(),
 				'bytesTotal' => $download->getTotal(),
-				'estimatedEndTime' => $download->getEstimatedEndTime(),
+				'estimatedInterval' => $download->getCalculatedInterval(),
+				'speed' => $download->getCalculatedSpeed(),
 			];
 		}
 		return [

src/CyberPanel/Commands/Commands/StoreDownloadsCommand.php

@@ -17,7 +17,7 @@ public function run() : array {
 			$download->setTotal($parameter->bytesTotal);
 			$download->setDownloaded($parameter->bytesReceived);
 			$download->setEstimatedEndTime(
-				empty($parameter->estimatedEndTime) ? NULL : $parameter->estimatedEndTime
+				new \DateTime($parameter->estimatedEndTime ?? NULL )
 			);
 			self::$storedDownloads[] = $download;
 		}

src/CyberPanel/DataStructs/Download.php

@@ -2,43 +2,62 @@
 
 namespace CyberPanel\DataStructs;
 
+use \DateTime;
+
 class Download {
 
 	private string $filename;
 	private int $downloaded;
 	private int $total;
-	private $estimatedEndTime;
+	private ?DateTime $estimatedEndTime;
 
-	public function getFilename() {
+	public function getFilename() : string {
 		return $this->filename;
 	}
 
-	public function getDownloaded() {
+	public function getDownloaded() : int {
 		return $this->downloaded;
 	}
 
-	public function getTotal() {
+	public function getTotal() : int {
 		return $this->total;
 	}
 
-	public function getEstimatedEndTime() {
+	public function getEstimatedEndTime() : ?DateTime {
 		return $this->estimatedEndTime;
 	}
 
-	public function setFilename($filename) {
+	public function setFilename(string $filename) : void {
 		$this->filename = $filename;
 	}
 
-	public function setDownloaded($downloaded) {
+	public function setDownloaded(int $downloaded) : void {
 		$this->downloaded = $downloaded;
 	}
 
 	public function setTotal($total) {
 		$this->total = $total;
 	}
 
-	public function setEstimatedEndTime($estimatedEndTime) {
+	public function setEstimatedEndTime(\DateTime $estimatedEndTime = NULL) : void {
 		$this->estimatedEndTime = $estimatedEndTime;
 	}
 
+	public function getRemain() : int {
+		return $this->getTotal() - $this->getDownloaded();
+	}
+
+	public function getCalculatedSpeed() : int {
+		if (!empty($this->getEstimatedEndTime()) && $this->getCalculatedInterval() > 0) {
+			return (int) $this->getRemain() / $this->getCalculatedInterval();
+		}
+		return 0;
+	}
+
+	public function getCalculatedInterval() : int {
+		if (!empty($this->getEstimatedEndTime())) {
+			return (int)($this->getEstimatedEndTime()->getTimestamp() - time());
+		}
+		return 1;
+	}
 }