Main: move code to storage/Configured.cxx
This commit is contained in:
Max Kellermann
parent
570b12ec13
commit
37b6899660
@ -428,6 +428,7 @@ libstorage_a_SOURCES = \
|
||||
src/storage/StoragePlugin.hxx \
|
||||
src/storage/Registry.cxx src/storage/Registry.hxx \
|
||||
src/storage/StorageInterface.cxx src/storage/StorageInterface.hxx \
|
||||
src/storage/Configured.cxx src/storage/Configured.hxx \
|
||||
src/storage/plugins/LocalStorage.cxx src/storage/plugins/LocalStorage.hxx \
|
||||
src/storage/FileInfo.hxx
|
||||
|
||||
|
||||
32
src/Main.cxx
32
src/Main.cxx
@ -45,8 +45,6 @@
|
||||
#include "IOThread.hxx"
|
||||
#include "fs/AllocatedPath.hxx"
|
||||
#include "fs/Config.hxx"
|
||||
#include "fs/StandardDirectory.hxx"
|
||||
#include "fs/CheckFile.hxx"
|
||||
#include "playlist/PlaylistRegistry.hxx"
|
||||
#include "zeroconf/ZeroconfGlue.hxx"
|
||||
#include "decoder/DecoderList.hxx"
|
||||
@ -72,8 +70,7 @@
|
||||
#include "db/DatabaseGlue.hxx"
|
||||
#include "db/DatabaseSimple.hxx"
|
||||
#include "db/plugins/SimpleDatabasePlugin.hxx"
|
||||
#include "storage/plugins/LocalStorage.hxx"
|
||||
#include "storage/Registry.hxx"
|
||||
#include "storage/Configured.hxx"
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_NEIGHBOR_PLUGINS
|
||||
@ -151,31 +148,8 @@ glue_mapper_init(Error &error)
|
||||
static bool
|
||||
InitStorage(Error &error)
|
||||
{
|
||||
auto uri = config_get_string(CONF_MUSIC_DIR, nullptr);
|
||||
if (uri != nullptr && uri_has_scheme(uri)) {
|
||||
instance->storage = CreateStorageURI(uri, error);
|
||||
if (instance->storage == nullptr && !error.IsDefined())
|
||||
error.Format(config_domain,
|
||||
"Unrecognized storage URI: %s", uri);
|
||||
return instance->storage != nullptr;
|
||||
}
|
||||
|
||||
auto path_fs = config_get_path(CONF_MUSIC_DIR, error);
|
||||
if (path_fs.IsNull() && error.IsDefined())
|
||||
return false;
|
||||
|
||||
if (path_fs.IsNull()) {
|
||||
path_fs = GetUserMusicDir();
|
||||
if (path_fs.IsNull())
|
||||
/* no music directory; that's ok */
|
||||
return true;
|
||||
}
|
||||
|
||||
path_fs.ChopSeparators();
|
||||
CheckDirectoryReadable(path_fs);
|
||||
|
||||
instance->storage = CreateLocalStorage(path_fs);
|
||||
return true;
|
||||
instance->storage = CreateConfiguredStorage(error);
|
||||
return !error.IsDefined();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
78
src/storage/Configured.cxx
Normal file
78
src/storage/Configured.cxx
Normal file
@ -0,0 +1,78 @@
|
||||
/*
|
||||
* Copyright (C) 2003-2014 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 "config.h"
|
||||
#include "Configured.hxx"
|
||||
#include "Registry.hxx"
|
||||
#include "plugins/LocalStorage.hxx"
|
||||
#include "config/ConfigGlobal.hxx"
|
||||
#include "config/ConfigError.hxx"
|
||||
#include "fs/StandardDirectory.hxx"
|
||||
#include "fs/CheckFile.hxx"
|
||||
#include "util/UriUtil.hxx"
|
||||
#include "util/Error.hxx"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
static Storage *
|
||||
CreateConfiguredStorageUri(const char *uri, Error &error)
|
||||
{
|
||||
Storage *storage = CreateStorageURI(uri, error);
|
||||
if (storage == nullptr && !error.IsDefined())
|
||||
error.Format(config_domain,
|
||||
"Unrecognized storage URI: %s", uri);
|
||||
return storage;
|
||||
}
|
||||
|
||||
static AllocatedPath
|
||||
GetConfiguredMusicDirectory(Error &error)
|
||||
{
|
||||
AllocatedPath path = config_get_path(CONF_MUSIC_DIR, error);
|
||||
if (path.IsNull() && !error.IsDefined())
|
||||
path = GetUserMusicDir();
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
static Storage *
|
||||
CreateConfiguredStorageLocal(Error &error)
|
||||
{
|
||||
AllocatedPath path = GetConfiguredMusicDirectory(error);
|
||||
if (path.IsNull())
|
||||
return nullptr;
|
||||
|
||||
path.ChopSeparators();
|
||||
CheckDirectoryReadable(path);
|
||||
return CreateLocalStorage(path);
|
||||
}
|
||||
|
||||
Storage *
|
||||
CreateConfiguredStorage(Error &error)
|
||||
{
|
||||
assert(!error.IsDefined());
|
||||
|
||||
auto uri = config_get_string(CONF_MUSIC_DIR, nullptr);
|
||||
if (uri == nullptr)
|
||||
return nullptr;
|
||||
|
||||
if (uri_has_scheme(uri))
|
||||
return CreateConfiguredStorageUri(uri, error);
|
||||
|
||||
return CreateConfiguredStorageLocal(error);
|
||||
}
|
||||
36
src/storage/Configured.hxx
Normal file
36
src/storage/Configured.hxx
Normal file
@ -0,0 +1,36 @@
|
||||
/*
|
||||
* Copyright (C) 2003-2014 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.
|
||||
*/
|
||||
|
||||
#ifndef MPD_STORAGE_CONFIG_HXX
|
||||
#define MPD_STORAGE_CONFIG_HXX
|
||||
|
||||
#include "check.h"
|
||||
|
||||
class Error;
|
||||
class Storage;
|
||||
|
||||
/**
|
||||
* Read storage configuration settings and create a #Storage instance
|
||||
* from it. Returns nullptr on error or if no storage is configured
|
||||
* (no #Error set in that case).
|
||||
*/
|
||||
Storage *
|
||||
CreateConfiguredStorage(Error &error);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user