Merge pull request #5781 from getkirby/v4/fix/5730-same-file-uuid

Don't change uuid if exact same file

src/Cms/FileActions.php

@@ -229,9 +229,25 @@ public static function create(array $props, bool $move = false): File
 		// gather content
 		$content = $props['content'] ?? [];
 
-		// make sure that a UUID gets generated and
-		// added to content right away
-		if (Uuids::enabled() === true) {
+		// make sure that a UUID gets generated
+		// and added to content right away
+		if (
+			Uuids::enabled() === true &&
+			empty($content['uuid']) === true
+		) {
+			// sets the current uuid if it is the exact same file
+			if ($file->exists() === true) {
+				$existing = $file->parent()->file($file->filename());
+
+				if (
+					$file->sha1() === $upload->sha1() &&
+					$file->template() === $existing->template()
+				) {
+					// use existing content data if it is the exact same file
+					$content = $existing->content()->toArray();
+				}
+			}
+
 			$content['uuid'] ??= Uuid::generate();
 		}
 

tests/Cms/Files/FileActionsTest.php

@@ -542,6 +542,33 @@ public function testCreate($parent)
 		$this->assertIsString($result->content()->get('uuid')->value());
 	}
 
+	/**
+	 * @dataProvider parentProvider
+	 */
+	public function testCreateDuplicate($parent)
+	{
+		$source = static::TMP . '/source.md';
+
+		// create the dummy source
+		F::write($source, '# Test');
+
+		$result = File::create([
+			'filename' => 'test.md',
+			'source'   => $source,
+			'parent'   => $parent
+		]);
+
+		$uuid = $result->content()->get('uuid')->value();
+
+		$duplicate = File::create([
+			'filename' => 'test.md',
+			'source'   => $source,
+			'parent'   => $parent
+		]);
+
+		$this->assertSame($uuid, $duplicate->content()->get('uuid')->value());
+	}
+
 	/**
 	 * @dataProvider parentProvider
 	 */