stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 23:05:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Uniqify the name and slug when we move an item to a new location with

Browse Source 
a conflict.  This fixes #1364.
This commit is contained in:
Bharat Mediratta
2010-09-11 23:37:12 -07:00
parent 9f11d8ad83
commit f84c4a6192
2 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/models/item.php
+30 -20
View File
@@ -357,26 +357,7 @@ class Item_Model extends ORM_MPTT {
}
}
// Randomize the name or slug if there's a conflict. Preserve the extension.
// @todo Improve this. Random numbers are not user friendly
$base_name = pathinfo($this->name, PATHINFO_FILENAME);
$base_ext = pathinfo($this->name, PATHINFO_EXTENSION);
$base_slug = $this->slug;
while (ORM::factory("item")
->where("parent_id", "=", $this->parent_id)
->and_open()
->where("name", "=", $this->name)
->or_where("slug", "=", $this->slug)
->close()
->find()->id) {
$rand = rand();
if ($base_ext) {
$this->name = "$base_name-$rand.$base_ext";
} else {
$this->name = "$base_name-$rand";
}
$this->slug = "$base_slug-$rand";
}
$this->_randomize_name_or_slug_on_conflict();
parent::save();
@@ -427,6 +408,8 @@ class Item_Model extends ORM_MPTT {
$this->relative_url_cache = null;
}
$this->_randomize_name_or_slug_on_conflict();
parent::save();
// Now update the filesystem and any database caches if there were significant value
@@ -504,6 +487,33 @@ class Item_Model extends ORM_MPTT {
return $this;
}
/**
* Check to see if there's another item that occupies the same name or slug that this item
* intends to use, and if so choose a new name/slug while preserving the extension.
* @todo Improve this. Random numbers are not user friendly
*/
private function _randomize_name_or_slug_on_conflict() {
$base_name = pathinfo($this->name, PATHINFO_FILENAME);
$base_ext = pathinfo($this->name, PATHINFO_EXTENSION);
$base_slug = $this->slug;
while (ORM::factory("item")
->where("parent_id", "=", $this->parent_id)
->where("id", "<>", $this->id)
->and_open()
->where("name", "=", $this->name)
->or_where("slug", "=", $this->slug)
->close()
->find()->id) {
$rand = rand();
if ($base_ext) {
$this->name = "$base_name-$rand.$base_ext";
} else {
$this->name = "$base_name-$rand";
}
$this->slug = "$base_slug-$rand";
}
}
/**
* Return the Item_Model representing the cover for this album.
* @return Item_Model or null if there's no cover
modules/gallery/tests/Item_Model_Test.php
+25 -32
View File
@@ -136,20 +136,17 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
$this->assert_true(false, "Shouldn't get here");
}
public function item_rename_fails_with_existing_name_test() {
public function item_rename_over_existing_name_gets_uniqified_test() {
// Create a test photo
$item = test::random_photo();
$item2 = test::random_photo();
try {
$item->name = $item2->name;
$item->save();
} catch (ORM_Validation_Exception $e) {
$this->assert_true(in_array("conflict", $e->validation->errors()));
return;
}
$item->name = $item2->name;
$item->save();
$this->assert_false(true, "rename should conflict");
// foo.jpg should become foo-####.jpg
$this->assert_true(
preg_match("/" . str_replace(".jpg", "", $item2->name) . "-\d+\.jpg/", $item->name));
}
public function move_album_test() {
@@ -208,24 +205,21 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
$this->assert_equal("file", file_get_contents($photo->file_path()));
}
public function move_album_fails_conflicting_target_test() {
public function move_album_with_conflicting_target_gets_uniqified_test() {
$album = test::random_album();
$source = test::random_album_unsaved($album);
$source->name = $album->name;
$source->save();
// $source and $album have the same name, so if we move $source into the root they should
// conflict.
// conflict and get randomized
try {
$source->parent_id = item::root()->id;
$source->save();
} catch (ORM_Validation_Exception $e) {
$this->assert_equal(
array("name" => "conflict", "slug" => "conflict"), $e->validation->errors());
return;
}
$this->assert_true(false, "Shouldn't get here");
$source->parent_id = item::root()->id;
$source->save();
// foo should become foo-####
$this->assert_true(preg_match("/{$album->name}-\d+/", $source->name));
$this->assert_true(preg_match("/{$album->slug}-\d+/", $source->slug));
}
public function move_album_fails_wrong_target_type_test() {
@@ -245,7 +239,7 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
$this->assert_true(false, "Shouldn't get here");
}
public function move_photo_fails_conflicting_target_test() {
public function move_photo_with_conflicting_target_gets_uniqified_test() {
$photo1 = test::random_photo();
$album = test::random_album();
$photo2 = test::random_photo_unsaved($album);
@@ -253,18 +247,17 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
$photo2->save();
// $photo1 and $photo2 have the same name, so if we move $photo1 into the root they should
// conflict.
// conflict and get uniqified.
try {
$photo2->parent_id = item::root()->id;
$photo2->save();
} catch (Exception $e) {
// pass
$this->assert_equal(
array("name" => "conflict", "slug" => "conflict"), $e->validation->errors());
return;
}
$this->assert_true(false, "Shouldn't get here");
$photo2->parent_id = item::root()->id;
$photo2->save();
// foo.jpg should become foo-####.jpg
$this->assert_true(
preg_match("/" . str_replace(".jpg", "", $photo1->name) . "-\d+\.jpg/", $photo2->name));
// foo should become foo
$this->assert_true(preg_match("/{$photo1->slug}/", $photo2->name));
}
public function move_album_inside_descendent_fails_test() {