better naming of archives

Author: ArtificialOwl

lib/Listeners/NodeEvent.php

@@ -41,8 +41,6 @@
 use OCP\Files\Events\Node\NodeCreatedEvent;
 use OCP\Files\Events\Node\NodeRenamedEvent;
 use OCP\Files\Events\Node\NodeWrittenEvent;
-use OCP\Files\InvalidPathException;
-use OCP\Files\NotFoundException;
 
 
 /**
@@ -74,9 +72,6 @@ public function __construct(FilesService $filesService) {
 
 	/**
 	 * @param Event $event
-	 *
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
 	 */
 	public function handle(Event $event): void {
 		$node = null;

lib/Model/RestoringChunk.php

@@ -59,6 +59,9 @@ class RestoringChunk implements JsonSerializable, IDeserializable {
 	/** @var string[] */
 	private $files = [];
 
+	/** @var RestoringChunkPart */
+	private $parts = [];
+
 	/** @var int */
 	private $count = 0;
 
@@ -69,42 +72,33 @@ class RestoringChunk implements JsonSerializable, IDeserializable {
 	private $checksum = '';
 
 	/** @var bool */
-	private $encrypted = false;
+	private $stored = false;
 
 	/** @var bool */
 	private $staticName = false;
 
-	/** @var string */
-	private $encryptedChecksum = '';
-
 
 	/**
-	 * only add $name for specific Chunk.
-	 *
 	 * RestoringChunk constructor.
 	 */
-	public function __construct(string $name = '') {
-		if ($name === '') {
-			$name = $this->uuid();
-		} else {
-			$this->staticName = true;
+	public function __construct(string $name = '', bool $staticName = false) {
+		$this->staticName = $staticName;
+		if (!$staticName) {
+			if ($name !== '') {
+				$name .= '-';
+			}
+			$name .= $this->uuid();
 		}
 
 		$this->name = $name;
 	}
 
 
 	/**
-	 * @param string $ext
-	 *
 	 * @return string
 	 */
-	public function getName(string $ext = ''): string {
-		if ($ext === '') {
-			return $this->name;
-		}
-
-		return $this->name . '.' . $ext;
+	public function getName(): string {
+		return $this->name;
 	}
 
 	/**
@@ -146,21 +140,10 @@ public function getFilename(): string {
 			return $this->getName();
 		}
 
-		if ($this->isEncrypted()) {
-			return $this->getName();
-		}
-
 		return $this->getName() . '.zip';
 	}
 
 
-//	/**
-//	 * @return int
-//	 */
-//	public function count(): int {
-//		return sizeof($this->files);
-//	}
-//
 	/**
 	 * @return int
 	 */
@@ -233,25 +216,6 @@ public function setSize(int $size): self {
 	}
 
 
-	/**
-	 * @param bool $encrypted
-	 *
-	 * @return RestoringChunk
-	 */
-	public function setEncrypted(bool $encrypted): self {
-		$this->encrypted = $encrypted;
-
-		return $this;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isEncrypted(): bool {
-		return $this->encrypted;
-	}
-
-
 	/**
 	 * @return string
 	 */
@@ -270,36 +234,6 @@ public function setChecksum(string $checksum): self {
 		return $this;
 	}
 
-	/**
-	 * @param string $checksum
-	 *
-	 * @return bool
-	 */
-	public function compareChecksum(string $checksum): bool {
-		if ($this->isEncrypted()) {
-			return ($this->getEncryptedChecksum() === $checksum);
-		}
-
-		return ($this->getChecksum() === $checksum);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEncryptedChecksum(): string {
-		return $this->encryptedChecksum;
-	}
-
-	/**
-	 * @param string $encryptedChecksum
-	 *
-	 * @return RestoringChunk
-	 */
-	public function setEncryptedChecksum(string $encryptedChecksum): self {
-		$this->encryptedChecksum = $encryptedChecksum;
-
-		return $this;
-	}
 
 	/**
 	 * @param string $content
@@ -331,10 +265,8 @@ public function import(array $data): IDeserializable {
 			 ->setCount($this->getInt('count', $data))
 			 ->setSize($this->getInt('size', $data))
 			 ->setContent($this->get('content', $data))
-			 ->setEncrypted($this->getBool('encrypted', $data))
 			 ->setStaticName($this->getBool('staticName', $data))
-			 ->setChecksum($this->get('checksum', $data))
-			 ->setEncryptedChecksum($this->get('encryptedChecksum', $data));
+			 ->setChecksum($this->get('checksum', $data));
 
 		return $this;
 	}
@@ -358,10 +290,8 @@ public function jsonSerialize(): array {
 			'name' => $this->getName(),
 			'count' => $this->getCount(),
 			'size' => $this->getSize(),
-			'encrypted' => $this->isEncrypted(),
 			'staticName' => $this->isStaticName(),
-			'checksum' => $this->getChecksum(),
-			'encryptedChecksum' => $this->getEncryptedChecksum()
+			'checksum' => $this->getChecksum()
 		];
 
 		if ($this->getContent() !== '') {
@@ -371,6 +301,5 @@ public function jsonSerialize(): array {
 		return $arr;
 	}
 
-
 }