oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/update/Container: move MakeDirectoryIfModified() to VirtualDirectory.cxx

Browse Source
This commit is contained in:
Max Kellermann 2019-09-03 19:20:45 +02:00
parent fd1826cb91
commit e08298a66f
3 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/db/meson.build
View File

@ -30,6 +30,7 @@ db_glue_sources = [
'update/Playlist.cxx',
'update/Remove.cxx',
'update/ExcludeList.cxx',
'update/VirtualDirectory.cxx',
'DatabaseGlue.cxx',
'Configured.cxx',
'DatabaseSong.cxx',

25
src/db/update/Container.cxx
View File

@ -30,31 +30,6 @@
#include "storage/FileInfo.hxx"
#include "Log.hxx"
Directory *
UpdateWalk::MakeDirectoryIfModified(Directory &parent, const char *name,
const StorageFileInfo &info) noexcept
{
Directory *directory = parent.FindChild(name);
// directory exists already
if (directory != nullptr) {
if (directory->IsMount())
return nullptr;
if (directory->mtime == info.mtime && !walk_discard) {
/* not modified */
return nullptr;
}
editor.DeleteDirectory(directory);
modified = true;
}
directory = parent.MakeChild(name);
directory->mtime = info.mtime;
return directory;
}
bool
UpdateWalk::UpdateContainerFile(Directory &directory,
const char *name, const char *suffix,

47
src/db/update/VirtualDirectory.cxx Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright 2003-2019 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "Walk.hxx"
#include "db/plugins/simple/Directory.hxx"
#include "storage/FileInfo.hxx"
Directory *
UpdateWalk::MakeDirectoryIfModified(Directory &parent, const char *name,
const StorageFileInfo &info) noexcept
{
Directory *directory = parent.FindChild(name);
// directory exists already
if (directory != nullptr) {
if (directory->IsMount())
return nullptr;
if (directory->mtime == info.mtime && !walk_discard) {
/* not modified */
return nullptr;
}
editor.DeleteDirectory(directory);
modified = true;
}
directory = parent.MakeChild(name);
directory->mtime = info.mtime;
return directory;
}