fs/Path: add methods GetBase() and GetDirectoryName()
This commit is contained in:
parent
6b3c525a9d
commit
bbdcbd1f08
@ -530,7 +530,7 @@ libfs_a_SOURCES = \
|
||||
src/fs/Traits.cxx src/fs/Traits.hxx \
|
||||
src/fs/Config.cxx src/fs/Config.hxx \
|
||||
src/fs/Charset.cxx src/fs/Charset.hxx \
|
||||
src/fs/Path.cxx src/fs/Path.hxx \
|
||||
src/fs/Path.cxx src/fs/Path2.cxx src/fs/Path.hxx \
|
||||
src/fs/AllocatedPath.cxx src/fs/AllocatedPath.hxx \
|
||||
src/fs/FileSystem.cxx src/fs/FileSystem.hxx \
|
||||
src/fs/StandardDirectory.cxx src/fs/StandardDirectory.hxx \
|
||||
|
@ -53,7 +53,7 @@ public:
|
||||
|
||||
Bzip2ArchiveFile(Path path, InputStream *_is)
|
||||
:ArchiveFile(bz2_archive_plugin),
|
||||
name(PathTraitsFS::GetBase(path.c_str())),
|
||||
name(path.GetBase().c_str()),
|
||||
istream(_is) {
|
||||
// remove .bz2 suffix
|
||||
const size_t len = name.length();
|
||||
|
@ -29,6 +29,8 @@
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
class AllocatedPath;
|
||||
|
||||
/**
|
||||
* A path name in the native file system character set.
|
||||
*
|
||||
@ -128,6 +130,22 @@ public:
|
||||
gcc_pure
|
||||
std::string ToUTF8() const;
|
||||
|
||||
/**
|
||||
* Determine the "base" file name.
|
||||
* The return value points inside this object.
|
||||
*/
|
||||
gcc_pure
|
||||
Path GetBase() const {
|
||||
return FromFS(PathTraitsFS::GetBase(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets directory name of this path.
|
||||
* Returns a "nulled" instance on error.
|
||||
*/
|
||||
gcc_pure
|
||||
AllocatedPath GetDirectoryName() const;
|
||||
|
||||
/**
|
||||
* Determine the relative part of the given path to this
|
||||
* object, not including the directory separator. Returns an
|
||||
|
28
src/fs/Path2.cxx
Normal file
28
src/fs/Path2.cxx
Normal file
@ -0,0 +1,28 @@
|
||||
/*
|
||||
* 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 "Path.hxx"
|
||||
#include "AllocatedPath.hxx"
|
||||
|
||||
AllocatedPath
|
||||
Path::GetDirectoryName() const
|
||||
{
|
||||
return AllocatedPath::FromFS(PathTraitsFS::GetParent(c_str()));
|
||||
}
|
Loading…
Reference in New Issue
Block a user