arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge albums including subalbums.

Browse Source
This commit is contained in:
Nils Asmussen 2016-07-29 21:58:29 +02:00
parent eddb666b5a
commit 1b6c74bcb6
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
php/Modules/Album.php
View File

@ -634,6 +634,17 @@ final class Album {
$albumID = array_splice($albumIDs, 0, 1); $albumID = array_splice($albumIDs, 0, 1);
$albumID = $albumID[0]; $albumID = $albumID[0];
// Ensure that we don't merge an album into its own subalbum
foreach($albumIDs as $id) {
foreach($this->getSubAlbums($id) as $sid) {
if($sid == $albumID) {
Log::error(Database::get(), __METHOD__, __LINE__, 'Cannot move album into its own subalbum');
return false;
}
}
}
// Move photos
$query = Database::prepare(Database::get(), "UPDATE ? SET album = ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->albumIDs)); $query = Database::prepare(Database::get(), "UPDATE ? SET album = ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->albumIDs));
$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__); $result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
@ -643,6 +654,13 @@ final class Album {
// Convert to string // Convert to string
$filteredIDs = implode(',', $albumIDs); $filteredIDs = implode(',', $albumIDs);
// Move subalbums
$query = Database::prepare(Database::get(), "UPDATE ? SET parent = ? WHERE parent IN (?)", array(LYCHEE_TABLE_ALBUMS, $albumID, $filteredIDs));
$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
if ($result===false) return false;
// Delete other albums
$query = Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $filteredIDs)); $query = Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $filteredIDs));
$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__); $result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);