7e12aea1d8
Make the "open" method of plugins "file" and "archive" dummy methods that always fail. Instead, let InputStream::Open() hard-code access to these two plugins by using OpenLocalInputStream(). This allows simplifyin the algorithm for falling back to probing archive plugins.
60 lines
1.7 KiB
C++
60 lines
1.7 KiB
C++
/*
|
|
* 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 "LocalOpen.hxx"
|
|
#include "InputStream.hxx"
|
|
#include "plugins/FileInputPlugin.hxx"
|
|
|
|
#ifdef ENABLE_ARCHIVE
|
|
#include "plugins/ArchiveInputPlugin.hxx"
|
|
#endif
|
|
|
|
#include "fs/Path.hxx"
|
|
#include "util/Error.hxx"
|
|
|
|
#include <assert.h>
|
|
|
|
#ifdef ENABLE_ARCHIVE
|
|
#include <errno.h>
|
|
#endif
|
|
|
|
InputStream *
|
|
OpenLocalInputStream(Path path, Mutex &mutex, Cond &cond, Error &error)
|
|
{
|
|
assert(!error.IsDefined());
|
|
|
|
InputStream *is = OpenFileInputStream(path, mutex, cond, error);
|
|
#ifdef ENABLE_ARCHIVE
|
|
if (is == nullptr && error.IsDomain(errno_domain) &&
|
|
error.GetCode() == ENOTDIR) {
|
|
/* ENOTDIR means this may be a path inside an archive
|
|
file */
|
|
Error error2;
|
|
is = OpenArchiveInputStream(path, mutex, cond, error2);
|
|
if (is == nullptr && error2.IsDefined())
|
|
error = std::move(error2);
|
|
}
|
|
#endif
|
|
|
|
assert(is == nullptr || is->IsReady());
|
|
|
|
return is;
|
|
}
|