[stable24] Use '(n)' suffix instead of timestamp prefix for uploaded image names

lib/Service/ImageService.php

@@ -152,7 +152,7 @@ public function uploadImage(int $documentId, string $newFileName, $newFileResour
 			throw new NotPermittedException('No write permissions');
 		}
 		$saveDir = $this->getAttachmentDirectoryForFile($textFile, true);
-		$fileName = (string) time() . '-' . $newFileName;
+		$fileName = $this->getUniqueFileName($saveDir, $newFileName);
 		$savedFile = $saveDir->newFile($fileName, $newFileResource);
 		return [
 			'name' => $fileName,
@@ -179,7 +179,7 @@ public function uploadImagePublic(?int $documentId, string $newFileName, $newFil
 		}
 		$textFile = $this->getTextFilePublic($documentId, $shareToken);
 		$saveDir = $this->getAttachmentDirectoryForFile($textFile, true);
-		$fileName = (string) time() . '-' . $newFileName;
+		$fileName = $this->getUniqueFileName($saveDir, $newFileName);
 		$savedFile = $saveDir->newFile($fileName, $newFileResource);
 		return [
 			'name' => $fileName,
@@ -221,7 +221,7 @@ public function insertImageFile(int $documentId, string $path, string $userId):
 	private function copyImageFile(File $imageFile, Folder $saveDir, File $textFile): array {
 		$mimeType = $imageFile->getMimeType();
 		if (in_array($mimeType, ImageController::IMAGE_MIME_TYPES, true)) {
-			$fileName = (string) time() . '-' . $imageFile->getName();
+			$fileName = $this->getUniqueFileName($saveDir, $imageFile->getName());
 			$targetPath = $saveDir->getPath() . '/' . $fileName;
 			$targetFile = $imageFile->copy($targetPath);
 			// get file type and name
@@ -236,6 +236,30 @@ private function copyImageFile(File $imageFile, Folder $saveDir, File $textFile)
 		];
 	}
 
+	/**
+	 * Get unique file name in a directory. Add '(n)' suffix.
+	 * @param Folder $dir
+	 * @param string $fileName
+	 * @return string
+	 */
+	public static function getUniqueFileName(Folder $dir, string $fileName): string {
+		$extension = pathinfo($fileName, PATHINFO_EXTENSION);
+		$counter = 1;
+		$uniqueFileName = $fileName;
+		if ($extension !== '') {
+			while ($dir->nodeExists($uniqueFileName)) {
+				$counter++;
+				$uniqueFileName = preg_replace('/\.' . $extension . '$/', ' (' . $counter . ').' . $extension, $fileName);
+			}
+		} else {
+			while ($dir->nodeExists($uniqueFileName)) {
+				$counter++;
+				$uniqueFileName = preg_replace('/$/', ' (' . $counter . ')', $fileName);
+			}
+		}
+		return $uniqueFileName;
+	}
+
 	/**
 	 * Check if the shared access has write permissions
 	 *

tests/TextTest.php

@@ -4,6 +4,7 @@
 
 use OCA\Text\AppInfo\Application;
 use OCA\Text\Service\ImageService;
+use OCP\Files\Folder;
 
 class TextTest extends \PHPUnit\Framework\TestCase {
 	public function testDummy() {
@@ -34,4 +35,40 @@ public function testGetAttachmentNamesFromContent() {
 			$this->assertContains($contentName, $computedNames);
 		}
 	}
+
+	public function testGetUniqueFileName() {
+		$fileNameList = [
+			'foo.png',
+			'bar',
+			'plop.png',
+			'plop (2).png',
+			'lala.png',
+			'lala (2).png',
+			'lala (3).png',
+			'yay.png',
+			'yay (2).png',
+			'yay (3).png',
+			'yay (5).png',
+			'file.ext.ext',
+		];
+
+		$folder = $this->createMock(Folder::class);
+		$folder->expects(self::any())
+			->method('nodeExists')
+			->willReturnCallback(function ($name) use ($fileNameList) {
+				return in_array($name, $fileNameList);
+			});
+
+		// files that do not exist yet
+		$this->assertEquals('doesNotExistYet', ImageService::getUniqueFileName($folder, 'doesNotExistYet'));
+		$this->assertEquals('doesNotExistYet.png', ImageService::getUniqueFileName($folder, 'doesNotExistYet.png'));
+
+		// files that already exist
+		$this->assertEquals('foo (2).png', ImageService::getUniqueFileName($folder, 'foo.png'));
+		$this->assertEquals('bar (2)', ImageService::getUniqueFileName($folder, 'bar'));
+		$this->assertEquals('plop (3).png', ImageService::getUniqueFileName($folder, 'plop.png'));
+		$this->assertEquals('lala (4).png', ImageService::getUniqueFileName($folder, 'lala.png'));
+		$this->assertEquals('yay (4).png', ImageService::getUniqueFileName($folder, 'yay.png'));
+		$this->assertEquals('file.ext (2).ext', ImageService::getUniqueFileName($folder, 'file.ext.ext'));
+	}
 }