db/simple/Directory: pass std::string_view to several methods

This commit is contained in:
Max Kellermann
2020-04-02 19:23:04 +02:00
parent 386235e2d2
commit 6593b5998a
9 changed files with 29 additions and 30 deletions
+4 -5
View File
@@ -38,14 +38,14 @@
#include <string.h>
static Directory *
LockMakeChild(Directory &directory, const char *name) noexcept
LockMakeChild(Directory &directory, std::string_view name) noexcept
{
const ScopeDatabaseLock protect;
return directory.MakeChild(name);
}
static Song *
LockFindSong(Directory &directory, const char *name) noexcept
LockFindSong(Directory &directory, std::string_view name) noexcept
{
const ScopeDatabaseLock protect;
return directory.FindSong(name);
@@ -57,10 +57,9 @@ UpdateWalk::UpdateArchiveTree(ArchiveFile &archive, Directory &directory,
{
const char *tmp = strchr(name, '/');
if (tmp) {
const std::string child_name(name, tmp);
const std::string_view child_name(name, tmp - name);
//add dir is not there already
Directory *subdir = LockMakeChild(directory,
child_name.c_str());
Directory *subdir = LockMakeChild(directory, child_name);
subdir->device = DEVICE_INARCHIVE;
//create directories first
+1 -1
View File
@@ -32,7 +32,7 @@
bool
UpdateWalk::UpdateContainerFile(Directory &directory,
const char *name, const char *suffix,
std::string_view name, const char *suffix,
const StorageFileInfo &info) noexcept
{
const DecoderPlugin *_plugin = decoder_plugins_find([suffix](const DecoderPlugin &plugin){
+1 -1
View File
@@ -88,7 +88,7 @@ DatabaseEditor::LockDeleteDirectory(Directory *directory)
}
bool
DatabaseEditor::DeleteNameIn(Directory &parent, const char *name)
DatabaseEditor::DeleteNameIn(Directory &parent, std::string_view name)
{
const ScopeDatabaseLock protect;
+1 -1
View File
@@ -59,7 +59,7 @@ public:
*
* @return true if the database was modified
*/
bool DeleteNameIn(Directory &parent, const char *name);
bool DeleteNameIn(Directory &parent, std::string_view name);
private:
void ClearDirectory(Directory &directory);
+2 -2
View File
@@ -34,7 +34,7 @@
#include "Log.hxx"
void
UpdateWalk::UpdatePlaylistFile(Directory &parent, const char *name,
UpdateWalk::UpdatePlaylistFile(Directory &parent, std::string_view name,
const StorageFileInfo &info,
const PlaylistPlugin &plugin) noexcept
{
@@ -88,7 +88,7 @@ UpdateWalk::UpdatePlaylistFile(Directory &parent, const char *name,
bool
UpdateWalk::UpdatePlaylistFile(Directory &directory,
const char *name, const char *suffix,
std::string_view name, const char *suffix,
const StorageFileInfo &info) noexcept
{
const auto *const plugin = FindPlaylistPluginBySuffix(suffix);
+2 -2
View File
@@ -23,7 +23,7 @@
#include "storage/FileInfo.hxx"
Directory *
UpdateWalk::MakeVirtualDirectoryIfModified(Directory &parent, const char *name,
UpdateWalk::MakeVirtualDirectoryIfModified(Directory &parent, std::string_view name,
const StorageFileInfo &info,
unsigned virtual_device) noexcept
{
@@ -53,7 +53,7 @@ UpdateWalk::MakeVirtualDirectoryIfModified(Directory &parent, const char *name,
Directory *
UpdateWalk::LockMakeVirtualDirectoryIfModified(Directory &parent,
const char *name,
std::string_view name,
const StorageFileInfo &info,
unsigned virtual_device) noexcept
{
+6 -5
View File
@@ -26,6 +26,7 @@
#include "config.h"
#include <atomic>
#include <string_view>
struct StorageFileInfo;
struct Directory;
@@ -93,7 +94,7 @@ private:
const StorageFileInfo &info) noexcept;
bool UpdateContainerFile(Directory &directory,
const char *name, const char *suffix,
std::string_view name, const char *suffix,
const StorageFileInfo &info) noexcept;
@@ -119,12 +120,12 @@ private:
}
#endif
void UpdatePlaylistFile(Directory &parent, const char *name,
void UpdatePlaylistFile(Directory &parent, std::string_view name,
const StorageFileInfo &info,
const PlaylistPlugin &plugin) noexcept;
bool UpdatePlaylistFile(Directory &directory,
const char *name, const char *suffix,
std::string_view name, const char *suffix,
const StorageFileInfo &info) noexcept;
bool UpdateRegularFile(Directory &directory,
@@ -151,12 +152,12 @@ private:
* specifying the kind of virtual directory
*/
Directory *MakeVirtualDirectoryIfModified(Directory &parent,
const char *name,
std::string_view name,
const StorageFileInfo &info,
unsigned virtual_device) noexcept;
Directory *LockMakeVirtualDirectoryIfModified(Directory &parent,
const char *name,
std::string_view name,
const StorageFileInfo &info,
unsigned virtual_device) noexcept;