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

storage/local: hide the class declarations

Browse Source 
Hide inside CreateLocalStorage().
This commit is contained in:
Max Kellermann 2014-02-07 01:11:52 +01:00
parent c13810ebaa
commit b2e3fdef0f
3 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main.cxx
View File

@ -210,8 +210,8 @@ glue_db_init_and_load(void)
return true;
SimpleDatabase &db = *(SimpleDatabase *)instance->database;
instance->storage = new LocalStorage(mapper_get_music_directory_utf8(),
mapper_get_music_directory_fs());
instance->storage = CreateLocalStorage(mapper_get_music_directory_utf8(),
mapper_get_music_directory_fs());
instance->update = new UpdateService(*instance->event_loop, db,
*instance->storage,
*instance);

55
src/storage/plugins/LocalStorage.cxx
View File

@ -19,9 +19,58 @@
#include "config.h"
#include "LocalStorage.hxx"
#include "storage/StorageInterface.hxx"
#include "storage/FileInfo.hxx"
#include "util/Error.hxx"
#include "fs/FileSystem.hxx"
#include "fs/AllocatedPath.hxx"
#include "fs/DirectoryReader.hxx"
#include <string>
class LocalDirectoryReader final : public StorageDirectoryReader {
AllocatedPath base_fs;
DirectoryReader reader;
std::string name_utf8;
public:
LocalDirectoryReader(AllocatedPath &&_base_fs)
:base_fs(std::move(_base_fs)), reader(base_fs) {}
bool HasFailed() {
return reader.HasFailed();
}
/* virtual methods from class StorageDirectoryReader */
virtual const char *Read() override;
virtual bool GetInfo(bool follow, FileInfo &info,
Error &error) override;
};
class LocalStorage final : public Storage {
const std::string base_utf8;
const AllocatedPath base_fs;
public:
LocalStorage(const char *_base_utf8, Path _base_fs)
:base_utf8(_base_utf8), base_fs(_base_fs) {}
/* virtual methods from class Storage */
virtual bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info,
Error &error) override;
virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8,
Error &error) override;
virtual std::string MapUTF8(const char *uri_utf8) const override;
virtual AllocatedPath MapFS(const char *uri_utf8) const override;
private:
AllocatedPath MapFS(const char *uri_utf8, Error &error) const;
};
static bool
Stat(Path path, bool follow, FileInfo &info, Error &error)
@ -144,3 +193,9 @@ LocalDirectoryReader::GetInfo(bool follow, FileInfo &info, Error &error)
AllocatedPath::Build(base_fs, reader.GetEntry());
return Stat(path_fs, follow, info, error);
}
Storage *
CreateLocalStorage(const char *base_utf8, Path base_fs)
{
return new LocalStorage(base_utf8, base_fs);
}

53
src/storage/plugins/LocalStorage.hxx
View File

@ -21,54 +21,13 @@
#define MPD_STORAGE_LOCAL_HXX
#include "check.h"
#include "storage/StorageInterface.hxx"
#include "fs/AllocatedPath.hxx"
#include "fs/DirectoryReader.hxx"
#include "Compiler.h"
#include <string>
class Storage;
class Path;
class LocalDirectoryReader final : public StorageDirectoryReader {
AllocatedPath base_fs;
DirectoryReader reader;
std::string name_utf8;
public:
LocalDirectoryReader(AllocatedPath &&_base_fs)
:base_fs(std::move(_base_fs)), reader(base_fs) {}
bool HasFailed() {
return reader.HasFailed();
}
/* virtual methods from class StorageDirectoryReader */
virtual const char *Read() override;
virtual bool GetInfo(bool follow, FileInfo &info,
Error &error) override;
};
class LocalStorage final : public Storage {
const std::string base_utf8;
const AllocatedPath base_fs;
public:
LocalStorage(const char *_base_utf8, Path _base_fs)
:base_utf8(_base_utf8), base_fs(_base_fs) {}
/* virtual methods from class Storage */
virtual bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info,
Error &error) override;
virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8,
Error &error) override;
virtual std::string MapUTF8(const char *uri_utf8) const override;
virtual AllocatedPath MapFS(const char *uri_utf8) const override;
private:
AllocatedPath MapFS(const char *uri_utf8, Error &error) const;
};
gcc_malloc gcc_nonnull_all
Storage *
CreateLocalStorage(const char *base_utf8, Path base_fs);
#endif