From 964caae2ddc681eec5bd7353a162f584c4fef7d8 Mon Sep 17 00:00:00 2001 From: Marcus Comstedt Date: Sat, 1 Mar 2008 15:45:54 +0000 Subject: Moved Dreamcast filesystem factory to platform directory. svn-id: r31021 --- backends/platform/dc/Makefile | 2 +- backends/platform/dc/dc-fs.cpp | 193 ++++++++++++++++++++++++++++ backends/platform/dc/dc.h | 4 + backends/platform/dc/ronincd-fs-factory.cpp | 40 ++++++ backends/platform/dc/ronincd-fs-factory.h | 44 +++++++ 5 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 backends/platform/dc/dc-fs.cpp create mode 100644 backends/platform/dc/ronincd-fs-factory.cpp create mode 100644 backends/platform/dc/ronincd-fs-factory.h (limited to 'backends/platform/dc') diff --git a/backends/platform/dc/Makefile b/backends/platform/dc/Makefile index e40445b515..26088cdf17 100644 --- a/backends/platform/dc/Makefile +++ b/backends/platform/dc/Makefile @@ -35,7 +35,7 @@ POST_OBJS_FLAGS = -Wl,--no-whole-archive endif OBJS := dcmain.o time.o display.o audio.o input.o selector.o icon.o \ - label.o vmsave.o softkbd.o dcloader.o cache.o + label.o vmsave.o softkbd.o dcloader.o cache.o ronincd-fs-factory.o MODULE_DIRS += . diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp new file mode 100644 index 0000000000..16b77857c0 --- /dev/null +++ b/backends/platform/dc/dc-fs.cpp @@ -0,0 +1,193 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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. + * + * $URL$ + * $Id$ + */ + +#if defined(__DC__) + +#include "backends/fs/abstract-fs.h" + +#include +#include +#include + +/** + * Implementation of the ScummVM file system API based on Ronin. + * + * Parts of this class are documented in the base interface class, AbstractFilesystemNode. + */ +class RoninCDFilesystemNode : public AbstractFilesystemNode { +protected: + String _displayName; + String _path; + bool _isDirectory; + bool _isValid; + +public: + /** + * Creates a RoninCDFilesystemNode with the root node as path. + */ + RoninCDFilesystemNode(); + + /** + * Creates a RoninCDFilesystemNode for a given path. + * + * @param path String with the path the new node should point to. + * @param verify true if the isValid and isDirectory flags should be verified during the construction. + */ + RoninCDFilesystemNode(const String &path, bool verify); + + virtual bool exists() const { return _isValid; } + virtual String getDisplayName() const { return _displayName; } + virtual String getName() const { return _displayName; } + virtual String getPath() const { return _path; } + virtual bool isDirectory() const { return _isDirectory; } + virtual bool isReadable() const { return true; } + virtual bool isWritable() const { return false; } + + virtual AbstractFilesystemNode *getChild(const String &n) const; + virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const; + virtual AbstractFilesystemNode *getParent() const; +}; + +/** + * Returns the last component of a given path. + * + * Examples: + * /foo/bar.txt would return /bar.txt + * /foo/bar/ would return /bar/ + * + * @param str String containing the path. + * @return Pointer to the first char of the last component inside str. + */ +const char *lastPathComponent(const Common::String &str) { + if(str.empty()) + return ""; + + const char *start = str.c_str(); + const char *cur = start + str.size() - 2; + + while (cur >= start && *cur != '/') { + --cur; + } + + return cur + 1; +} + +RoninCDFilesystemNode::RoninCDFilesystemNode() { + // The root dir. + _path = "/"; + _displayName = _path; + _isValid = true; + _isDirectory = true; +} + +RoninCDFilesystemNode::RoninCDFilesystemNode(const String &p, bool verify) { + assert(p.size() > 0); + + _path = p; + _displayName = lastPathComponent(_path); + _isValid = true; + _isDirectory = true; + + if (verify) { + int fd; + + if ((fd = open(_path.c_str(), O_RDONLY)) >= 0) { + close(fd); + _isDirectory = false; + } + else if ((fd = open(_path.c_str(), O_DIR|O_RDONLY)) >= 0) { + close(fd); + } + else { + _isValid = false; + } + } +} + +AbstractFilesystemNode *RoninCDFilesystemNode::getChild(const String &n) const { + // FIXME: Pretty lame implementation! We do no error checking to speak + // of, do not check if this is a special node, etc. + assert(_isDirectory); + + String newPath(_path); + if (_path.lastChar() != '/') + newPath += '/'; + newPath += n; + + return new RoninCDFilesystemNode(newPath, true); +} + +bool RoninCDFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const { + assert(_isDirectory); + + //TODO: honor the hidden flag + + DIR *dirp = opendir(_path.c_str()); + struct dirent *dp; + + if (dirp == NULL) + return false; + + // ... loop over dir entries using readdir + while ((dp = readdir(dirp)) != NULL) { + String newPath(_path); + if (newPath.lastChar() != '/') + newPath += '/'; + newPath += dp->d_name; + + RoninCDFilesystemNode entry(newPath, false); + + entry._isDirectory = dp->d_size < 0; + + // Skip files that are invalid for some reason (e.g. because we couldn't + // properly stat them). + if (!entry._isValid) + continue; + + // Honor the chosen mode + if ((mode == FilesystemNode::kListFilesOnly && entry._isDirectory) || + (mode == FilesystemNode::kListDirectoriesOnly && !entry._isDirectory)) + continue; + + if (entry._isDirectory) + entry._path += "/"; + + myList.push_back(new RoninCDFilesystemNode(entry)); + } + closedir(dirp); + + return true; +} + +AbstractFilesystemNode *RoninCDFilesystemNode::getParent() const { + if (_path == "/") + return 0; + + const char *start = _path.c_str(); + const char *end = lastPathComponent(_path); + + return new RoninCDFilesystemNode(String(start, end - start), false); +} + +#endif // defined(__DC__) diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index c70e788275..8d16e59bb7 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -27,6 +27,7 @@ #include #include #include "backends/timer/default/default-timer.h" +#include "ronincd-fs-factory.h" #define NUM_BUFFERS 4 #define SOUND_BUFFER_SHIFT 3 @@ -182,6 +183,8 @@ class OSystem_Dreamcast : public OSystem { // Extra SoftKbd support void mouseToSoftKbd(int x, int y, int &rx, int &ry) const; + // Filesystem + FilesystemFactory *getFilesystemFactory() { return &_fileSystemFactory; } private: @@ -189,6 +192,7 @@ class OSystem_Dreamcast : public OSystem { Audio::Mixer *_mixer; DefaultTimerManager *_timer; SoftKeyboard _softkbd; + RoninCDFilesystemFactory _fileSystemFactory; int _ms_cur_x, _ms_cur_y, _ms_cur_w, _ms_cur_h, _ms_old_x, _ms_old_y; int _ms_hotspot_x, _ms_hotspot_y, _ms_visible, _devpoll; diff --git a/backends/platform/dc/ronincd-fs-factory.cpp b/backends/platform/dc/ronincd-fs-factory.cpp new file mode 100644 index 0000000000..8980436cf0 --- /dev/null +++ b/backends/platform/dc/ronincd-fs-factory.cpp @@ -0,0 +1,40 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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. + * + * $URL$ + * $Id$ + */ + +#if defined(__DC__) +#include "ronincd-fs-factory.h" +#include "dc-fs.cpp" + +AbstractFilesystemNode *RoninCDFilesystemFactory::makeRootFileNode() const { + return new RoninCDFilesystemNode(); +} + +AbstractFilesystemNode *RoninCDFilesystemFactory::makeCurrentDirectoryFileNode() const { + return new RoninCDFilesystemNode(); +} + +AbstractFilesystemNode *RoninCDFilesystemFactory::makeFileNodePath(const String &path) const { + return new RoninCDFilesystemNode(path, true); +} +#endif diff --git a/backends/platform/dc/ronincd-fs-factory.h b/backends/platform/dc/ronincd-fs-factory.h new file mode 100644 index 0000000000..7763b2bb9f --- /dev/null +++ b/backends/platform/dc/ronincd-fs-factory.h @@ -0,0 +1,44 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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. + * + * $URL$ + * $Id$ + */ + +#ifndef RONINCD_FILESYSTEM_FACTORY_H +#define RONINCD_FILESYSTEM_FACTORY_H + +#include "backends/fs/fs-factory.h" + +/** + * Creates RoninCDFilesystemNode objects. + * + * Parts of this class are documented in the base interface class, FilesystemFactory. + */ +class RoninCDFilesystemFactory : public FilesystemFactory { +public: + typedef Common::String String; + + virtual AbstractFilesystemNode *makeRootFileNode() const; + virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const; + virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const; +}; + +#endif /*RONINCD_FILESYSTEM_FACTORY_H*/ -- cgit v1.2.3