db/simple: purge special directories for unavailable plugins on update
This commit is contained in:
parent
0779333064
commit
ecaa51e322
2
NEWS
2
NEWS
|
@ -1,4 +1,6 @@
|
|||
ver 0.22.2 (not yet released)
|
||||
* database
|
||||
- simple: purge virtual directories for unavailable plugins on update
|
||||
|
||||
ver 0.22.1 (2020/10/17)
|
||||
* decoder
|
||||
|
|
|
@ -31,6 +31,7 @@ db_glue_sources = [
|
|||
'update/Remove.cxx',
|
||||
'update/ExcludeList.cxx',
|
||||
'update/VirtualDirectory.cxx',
|
||||
'update/SpecialDirectory.cxx',
|
||||
'DatabaseGlue.cxx',
|
||||
'Configured.cxx',
|
||||
'DatabaseSong.cxx',
|
||||
|
|
|
@ -132,6 +132,13 @@ public:
|
|||
return mounted_database != nullptr;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether this is a "special" directory
|
||||
* (e.g. #DEVICE_PLAYLIST) and whether the underlying plugin
|
||||
* is available.
|
||||
*/
|
||||
bool IsPluginAvailable() const noexcept;
|
||||
|
||||
/**
|
||||
* Remove this #Directory object from its parent and free it. This
|
||||
* must not be called with the root Directory.
|
||||
|
|
|
@ -0,0 +1,74 @@
|
|||
/*
|
||||
* Copyright 2003-2020 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 "db/plugins/simple/Directory.hxx"
|
||||
#include "archive/ArchiveList.hxx"
|
||||
#include "decoder/DecoderList.hxx"
|
||||
#include "playlist/PlaylistRegistry.hxx"
|
||||
#include "fs/Traits.hxx"
|
||||
|
||||
gcc_pure
|
||||
static bool
|
||||
HaveArchivePluginForFilename(const char *filename) noexcept
|
||||
{
|
||||
#ifdef ENABLE_ARCHIVE
|
||||
const char *suffix = PathTraitsUTF8::GetFilenameSuffix(filename);
|
||||
return suffix != nullptr &&
|
||||
archive_plugin_from_suffix(suffix) != nullptr;
|
||||
#else
|
||||
(void)filename;
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
gcc_pure
|
||||
static bool
|
||||
HaveContainerPluginForFilename(const char *filename) noexcept
|
||||
{
|
||||
const char *suffix = PathTraitsUTF8::GetFilenameSuffix(filename);
|
||||
return suffix != nullptr &&
|
||||
// TODO: check if this plugin really supports containers
|
||||
decoder_plugins_supports_suffix(suffix);
|
||||
}
|
||||
|
||||
gcc_pure
|
||||
static bool
|
||||
HavePlaylistPluginForFilename(const char *filename) noexcept
|
||||
{
|
||||
const char *suffix = PathTraitsUTF8::GetFilenameSuffix(filename);
|
||||
return suffix != nullptr && playlist_suffix_supported(suffix);
|
||||
}
|
||||
|
||||
bool
|
||||
Directory::IsPluginAvailable() const noexcept
|
||||
{
|
||||
switch (device) {
|
||||
case DEVICE_INARCHIVE:
|
||||
return HaveArchivePluginForFilename(GetName());
|
||||
|
||||
case DEVICE_CONTAINER:
|
||||
return HaveContainerPluginForFilename(GetName());
|
||||
|
||||
case DEVICE_PLAYLIST:
|
||||
return HavePlaylistPluginForFilename(GetName());
|
||||
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
}
|
|
@ -93,7 +93,11 @@ inline void
|
|||
UpdateWalk::PurgeDeletedFromDirectory(Directory &directory) noexcept
|
||||
{
|
||||
directory.ForEachChildSafe([&](Directory &child){
|
||||
if (child.IsMount() || DirectoryExists(storage, child))
|
||||
if (child.IsMount())
|
||||
return;
|
||||
|
||||
if (DirectoryExists(storage, child) &&
|
||||
child.IsPluginAvailable())
|
||||
return;
|
||||
|
||||
editor.LockDeleteDirectory(&child);
|
||||
|
|
Loading…
Reference in New Issue