libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Implement FSNode::createDirectoryRecursive()

Browse Source
This commit is contained in:
Cameron Cawley 2019-07-02 18:08:33 +01:00 committed by Filippos Karapetis
parent 04c57babbc
commit aca627bec7
4 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/saves/default/default-saves.cpp
View File

@ -63,7 +63,7 @@ DefaultSaveFileManager::DefaultSaveFileManager(const Common::String &defaultSave
void DefaultSaveFileManager::checkPath(const Common::FSNode &dir) {
clearError();
if (!dir.exists()) {
if (!dir.createDirectory()) {
if (!dir.createDirectoryRecursive()) {
setError(Common::kPathDoesNotExist, "Failed to create directory '"+dir.getPath()+"'");
}
} else if (!dir.isDirectory()) {

20
common/file.cpp
View File

@ -155,24 +155,10 @@ bool DumpFile::open(const String &filename, bool createPath) {
assert(!filename.empty());
assert(!_handle);
if (createPath) {
for (uint32 i = 0; i < filename.size(); ++i) {
if (filename[i] == '/' || filename[i] == '\\') {
Common::String subpath = filename;
subpath.erase(i);
if (subpath.empty()) continue;
AbstractFSNode *node = g_system->getFilesystemFactory()->makeFileNodePath(subpath);
if (node->exists()) {
delete node;
continue;
}
if (!node->createDirectory()) warning("DumpFile: unable to create directories from path prefix");
delete node;
}
}
}
FSNode node(filename);
if (createPath)
node.getParent().createDirectoryRecursive();
return open(node);
}

21
common/fs.cpp
View File

@ -168,6 +168,27 @@ bool FSNode::createDirectory() const {
return _realNode->createDirectory();
}
bool FSNode::createDirectoryRecursive() const {
if (_realNode == nullptr)
return false;
if (_realNode->exists()) {
if (!_realNode->isDirectory()) {
warning("FSNode::createDirectoryRecursive: '%s' is a file", _realNode->getName().c_str());
return false;
} else {
return true;
}
}
FSNode parent = getParent();
assert(parent.getPath() != _realNode->getPath());
if (!parent.createDirectoryRecursive())
return false;
return _realNode->createDirectory();
}
FSDirectory::FSDirectory(const FSNode &node, int depth, bool flat)
: _node(node), _cached(false), _depth(depth), _flat(flat) {
}

8
common/fs.h
View File

@ -239,6 +239,14 @@ public:
* @return true if the directory was created, false otherwise.
*/
bool createDirectory() const;
/**
* Creates a directory referred by this node. The parent directory
* will also be created if it doesn't exist.
*
* @return true if the directory was created, false otherwise.
*/
bool createDirectoryRecursive() const;
};
/**