aboutsummaryrefslogtreecommitdiffstats
path: root/src/db/update
diff options
context:
space:
mode:
Diffstat (limited to 'src/db/update')
-rw-r--r--src/db/update/Service.hxx2
-rw-r--r--src/db/update/UpdateGlue.cxx2
-rw-r--r--src/db/update/UpdateIO.cxx14
-rw-r--r--src/db/update/UpdateIO.hxx16
-rw-r--r--src/db/update/Walk.cxx10
-rw-r--r--src/db/update/Walk.hxx6
6 files changed, 25 insertions, 25 deletions
diff --git a/src/db/update/Service.hxx b/src/db/update/Service.hxx
index cc5a61588..936c2bb55 100644
--- a/src/db/update/Service.hxx
+++ b/src/db/update/Service.hxx
@@ -61,7 +61,7 @@ class UpdateService final : DeferredMonitor {
public:
UpdateService(EventLoop &_loop, SimpleDatabase &_db,
- LocalStorage &_storage,
+ Storage &_storage,
DatabaseListener &_listener);
/**
diff --git a/src/db/update/UpdateGlue.cxx b/src/db/update/UpdateGlue.cxx
index 037d280b0..c1d563ffd 100644
--- a/src/db/update/UpdateGlue.cxx
+++ b/src/db/update/UpdateGlue.cxx
@@ -151,7 +151,7 @@ UpdateService::RunDeferred()
}
UpdateService::UpdateService(EventLoop &_loop, SimpleDatabase &_db,
- LocalStorage &_storage,
+ Storage &_storage,
DatabaseListener &_listener)
:DeferredMonitor(_loop), db(_db), listener(_listener),
progress(UPDATE_PROGRESS_IDLE),
diff --git a/src/db/update/UpdateIO.cxx b/src/db/update/UpdateIO.cxx
index 58b1fe296..73295cb02 100644
--- a/src/db/update/UpdateIO.cxx
+++ b/src/db/update/UpdateIO.cxx
@@ -22,7 +22,7 @@
#include "UpdateDomain.hxx"
#include "db/Directory.hxx"
#include "storage/FileInfo.hxx"
-#include "storage/LocalStorage.hxx"
+#include "storage/StorageInterface.hxx"
#include "fs/Traits.hxx"
#include "fs/FileSystem.hxx"
#include "util/Error.hxx"
@@ -32,7 +32,7 @@
#include <unistd.h>
bool
-GetInfo(LocalStorage &storage, const char *uri_utf8, FileInfo &info)
+GetInfo(Storage &storage, const char *uri_utf8, FileInfo &info)
{
Error error;
bool success = storage.GetInfo(uri_utf8, true, info, error);
@@ -42,7 +42,7 @@ GetInfo(LocalStorage &storage, const char *uri_utf8, FileInfo &info)
}
bool
-GetInfo(LocalDirectoryReader &reader, FileInfo &info)
+GetInfo(StorageDirectoryReader &reader, FileInfo &info)
{
Error error;
bool success = reader.GetInfo(true, info, error);
@@ -52,7 +52,7 @@ GetInfo(LocalDirectoryReader &reader, FileInfo &info)
}
bool
-DirectoryExists(LocalStorage &storage, const Directory &directory)
+DirectoryExists(Storage &storage, const Directory &directory)
{
FileInfo info;
if (!storage.GetInfo(directory.GetPath(), true, info, IgnoreError()))
@@ -65,7 +65,7 @@ DirectoryExists(LocalStorage &storage, const Directory &directory)
}
static bool
-GetDirectoryChildInfo(LocalStorage &storage, const Directory &directory,
+GetDirectoryChildInfo(Storage &storage, const Directory &directory,
const char *name_utf8, FileInfo &info, Error &error)
{
const auto uri_utf8 = PathTraitsUTF8::Build(directory.GetPath(),
@@ -74,7 +74,7 @@ GetDirectoryChildInfo(LocalStorage &storage, const Directory &directory,
}
bool
-directory_child_is_regular(LocalStorage &storage, const Directory &directory,
+directory_child_is_regular(Storage &storage, const Directory &directory,
const char *name_utf8)
{
FileInfo info;
@@ -84,7 +84,7 @@ directory_child_is_regular(LocalStorage &storage, const Directory &directory,
}
bool
-directory_child_access(LocalStorage &storage, const Directory &directory,
+directory_child_access(Storage &storage, const Directory &directory,
const char *name, int mode)
{
#ifdef WIN32
diff --git a/src/db/update/UpdateIO.hxx b/src/db/update/UpdateIO.hxx
index d5cbb2a5b..2dbb4ae83 100644
--- a/src/db/update/UpdateIO.hxx
+++ b/src/db/update/UpdateIO.hxx
@@ -25,30 +25,30 @@
struct Directory;
struct FileInfo;
-class LocalStorage;
-class LocalDirectoryReader;
+class Storage;
+class StorageDirectoryReader;
/**
- * Wrapper for LocalStorage::GetInfo() that logs errors instead of
+ * Wrapper for Storage::GetInfo() that logs errors instead of
* returning them.
*/
bool
-GetInfo(LocalStorage &storage, const char *uri_utf8, FileInfo &info);
+GetInfo(Storage &storage, const char *uri_utf8, FileInfo &info);
/**
* Wrapper for LocalDirectoryReader::GetInfo() that logs errors
* instead of returning them.
*/
bool
-GetInfo(LocalDirectoryReader &reader, FileInfo &info);
+GetInfo(StorageDirectoryReader &reader, FileInfo &info);
gcc_pure
bool
-DirectoryExists(LocalStorage &storage, const Directory &directory);
+DirectoryExists(Storage &storage, const Directory &directory);
gcc_pure
bool
-directory_child_is_regular(LocalStorage &storage, const Directory &directory,
+directory_child_is_regular(Storage &storage, const Directory &directory,
const char *name_utf8);
/**
@@ -56,7 +56,7 @@ directory_child_is_regular(LocalStorage &storage, const Directory &directory,
*/
gcc_pure
bool
-directory_child_access(LocalStorage &storage, const Directory &directory,
+directory_child_access(Storage &storage, const Directory &directory,
const char *name, int mode);
#endif
diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx
index d8b998f9e..5750f0223 100644
--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -27,7 +27,7 @@
#include "db/Song.hxx"
#include "db/PlaylistVector.hxx"
#include "db/Uri.hxx"
-#include "storage/LocalStorage.hxx"
+#include "storage/StorageInterface.hxx"
#include "playlist/PlaylistRegistry.hxx"
#include "Mapper.hxx"
#include "ExcludeList.hxx"
@@ -49,7 +49,7 @@
#include <errno.h>
UpdateWalk::UpdateWalk(EventLoop &_loop, DatabaseListener &_listener,
- LocalStorage &_storage)
+ Storage &_storage)
:storage(_storage),
editor(_loop, _listener)
{
@@ -140,7 +140,7 @@ UpdateWalk::PurgeDeletedFromDirectory(Directory &directory)
#ifndef WIN32
static bool
-update_directory_stat(LocalStorage &storage, Directory &directory)
+update_directory_stat(Storage &storage, Directory &directory)
{
FileInfo info;
if (!GetInfo(storage, directory.GetPath(), info))
@@ -152,7 +152,7 @@ update_directory_stat(LocalStorage &storage, Directory &directory)
#endif
static int
-find_inode_ancestor(LocalStorage &storage, Directory *parent,
+find_inode_ancestor(Storage &storage, Directory *parent,
unsigned inode, unsigned device)
{
#ifndef WIN32
@@ -320,7 +320,7 @@ UpdateWalk::UpdateDirectory(Directory &directory, const FileInfo &info)
directory_set_stat(directory, info);
Error error;
- LocalDirectoryReader *const reader =
+ StorageDirectoryReader *const reader =
storage.OpenDirectory(directory.GetPath(), error);
if (reader == nullptr) {
LogError(error);
diff --git a/src/db/update/Walk.hxx b/src/db/update/Walk.hxx
index 33387ab55..2bd56b067 100644
--- a/src/db/update/Walk.hxx
+++ b/src/db/update/Walk.hxx
@@ -29,7 +29,7 @@ struct stat;
struct FileInfo;
struct Directory;
struct archive_plugin;
-class LocalStorage;
+class Storage;
class ExcludeList;
class UpdateWalk final {
@@ -48,13 +48,13 @@ class UpdateWalk final {
bool walk_discard;
bool modified;
- LocalStorage &storage;
+ Storage &storage;
DatabaseEditor editor;
public:
UpdateWalk(EventLoop &_loop, DatabaseListener &_listener,
- LocalStorage &_storage);
+ Storage &_storage);
/**
* Returns true if the database was modified.