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

archive/Lookup: move to fs/LookupFile.cxx

Browse Source 
This can be used for other purposes as well.
This commit is contained in:
Max Kellermann
2019-06-15 14:26:26 +02:00
parent fcf6415963
commit bd6b7aa88e
8 changed files with 43 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/archive/ArchiveLookup.cxx
View File

@@ -1,76 +0,0 @@
/*
* Copyright 2003-2019 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 "ArchiveLookup.hxx"
#include "fs/FileInfo.hxx"
#include "system/Error.hxx"
gcc_pure
static PathTraitsFS::pointer_type
FindSlash(PathTraitsFS::pointer_type p, size_t i) noexcept
{
for (; i > 0; --i)
if (p[i] == '/')
return p + i;
return nullptr;
}
ArchiveLookupResult
archive_lookup(Path pathname)
{
PathTraitsFS::string buffer(pathname.c_str());
size_t idx = buffer.size();
PathTraitsFS::pointer_type slash = nullptr;
while (true) {
try {
//try to stat if its real directory
const FileInfo file_info(Path::FromFS(buffer.c_str()));
//is something found ins original path (is not an archive)
if (slash == nullptr)
return {};
//its a file ?
if (file_info.IsRegular()) {
//so the upper should be file
return {AllocatedPath::FromFS(buffer.c_str()), AllocatedPath::FromFS(slash + 1)};
} else {
return {};
}
} catch (const std::system_error &e) {
if (!IsPathNotFound(e))
throw;
}
//find one dir up
if (slash != nullptr)
*slash = '/';
slash = FindSlash(&buffer.front(), idx - 1);
if (slash == nullptr)
return {};
*slash = 0;
idx = slash - buffer.c_str();
}
}

56
src/archive/ArchiveLookup.hxx
View File

@@ -1,56 +0,0 @@
/*
* Copyright 2003-2019 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_ARCHIVE_LOOKUP_HXX
#define MPD_ARCHIVE_LOOKUP_HXX
#include "fs/AllocatedPath.hxx"
struct ArchiveLookupResult {
AllocatedPath archive = nullptr;
AllocatedPath inside = nullptr;
operator bool() const noexcept {
return !archive.IsNull();
}
};
/**
*
* archive_lookup is used to determine if part of pathname refers to an regular
* file (archive). If so then its also used to split pathname into archive file
* and path used to locate file in archive.
* How it works:
* We do stat of the parent of input pathname as long as we find an regular file
* Normally this should never happen. When routine returns true pathname modified
* and split into archive and inpath. Otherwise nothing happens
*
* For example:
*
* /music/path/Talco.zip/Talco - Combat Circus/12 - A la pachenka.mp3
* is split into archive: /music/path/Talco.zip
* inarchive pathname: Talco - Combat Circus/12 - A la pachenka.mp3
*
* Throws on error.
*/
ArchiveLookupResult
archive_lookup(Path pathname);
#endif

1
src/archive/meson.build
View File

@@ -18,7 +18,6 @@ endif
archive_glue = static_library(
'archive_glue',
'ArchiveLookup.cxx',
'ArchivePlugin.cxx',
'../input/plugins/ArchiveInputPlugin.cxx',
include_directories: inc,