Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

expose FileSystem::AbsolutePath and FileSystem::JoinPath

master
John Bartholomew 2012-02-18 06:03:02 +00:00
parent dce1d24194
commit 6c523c368b
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/FileSystem.cpp
View File

@ -5,13 +5,24 @@
namespace FileSystem {
// note: GetUserDir() and GetDataDir() is in FileSystem{Posix,Win32}.cpp
static FileSourceFS dataFilesApp(GetDataDir());
static FileSourceFS dataFilesUser(GetUserDir() + "/data");
FileSourceUnion gameDataFiles;
FileSourceFS rawFileSystem("/");
// note: some functions are in FileSystem{Posix,Win32}.cpp
// -- GetUserDir(), GetDataDir(), AbsolutePath()
std::string JoinPath(const std::string &a, const std::string &b) {
if (!b.empty()) {
if (b[0] == '/')
return b;
else
return a + "/" + b;
} else
return a;
}
void Init()
{
gameDataFiles.AppendSource(&dataFilesUser);

3
src/FileSystem.h
View File

@ -34,6 +34,9 @@ namespace FileSystem {
std::string GetUserDir();
std::string GetDataDir();
std::string AbsolutePath(const std::string &path);
std::string JoinPath(const std::string &a, const std::string &b);
class FileInfo {
friend class FileSource;
public:

24
src/FileSystemPosix.cpp
View File

@ -6,7 +6,7 @@
namespace FileSystem {
static std::string absolute_path(const std::string &path) {
std::string AbsolutePath(const std::string &path) {
if (!path.empty() && path[0] == '/') { return path; }
else {
const size_t bufsize = 512;
@ -25,16 +25,6 @@ namespace FileSystem {
}
}
static std::string path_join(const std::string &a, const std::string &b) {
if (!b.empty()) {
if (b[0] == '/')
return b;
else
return a + "/" + b;
} else
return a;
}
std::string GetUserDir()
{
std::string path = getenv("HOME");
@ -53,18 +43,18 @@ namespace FileSystem {
std::string GetDataDir()
{
static const std::string data_path = absolute_path(std::string(PIONEER_DATA_DIR));
static const std::string data_path = AbsolutePath(std::string(PIONEER_DATA_DIR));
return data_path;
}
FileSourceFS::FileSourceFS(const std::string &root):
FileSource(absolute_path(root)) {}
FileSource(AbsolutePath(root)) {}
FileSourceFS::~FileSourceFS() {}
FileInfo FileSourceFS::Lookup(const std::string &path)
{
const std::string fullpath = path_join(GetSourcePath(), path);
const std::string fullpath = JoinPath(GetSourcePath(), path);
struct stat statinfo;
FileInfo::FileType ty;
if (stat(fullpath.c_str(), &statinfo) == 0) {
@ -83,7 +73,7 @@ namespace FileSystem {
RefCountedPtr<FileData> FileSourceFS::ReadFile(const std::string &path)
{
const std::string fullpath = path_join(GetSourcePath(), path);
const std::string fullpath = JoinPath(GetSourcePath(), path);
FILE *fl = fopen(fullpath.c_str(), "rb");
if (!fl) {
return RefCountedPtr<FileData>(0);
@ -110,7 +100,7 @@ namespace FileSystem {
bool FileSourceFS::ReadDirectory(const std::string &dirpath, std::vector<FileInfo> &output)
{
const std::string fulldirpath = path_join(GetSourcePath(), dirpath);
const std::string fulldirpath = JoinPath(GetSourcePath(), dirpath);
DIR *dir = opendir(fulldirpath.c_str());
if (!dir) { return false; }
struct dirent *entry;
@ -160,7 +150,7 @@ namespace FileSystem {
bool FileSourceFS::MakeDirectory(const std::string &path)
{
return MakeDirectory(path_join(GetSourcePath(), path));
return MakeDirectory(JoinPath(GetSourcePath(), path));
}
bool FileSourceFS::MakeDirectoryRaw(const std::string &path)