From 0f1ff357b2c24e16ac96ea4650de6deeb9609485 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 5 May 2017 17:51:30 +0300 Subject: Rename virtfs into fs. --- src/CMakeLists.txt | 8 +- src/Makefile.am | 4 +- src/client.cpp | 2 +- src/configuration.cpp | 2 +- src/dirs.cpp | 2 +- src/dyetool/client.cpp | 2 +- src/dyetool/dyemain.cpp | 2 +- src/fs/files.cpp | 2 +- src/fs/files_unittest.cc | 2 +- src/fs/paths.cpp | 2 +- src/fs/virtfs/fs.cpp | 654 +++++++++++++++++++++ src/fs/virtfs/fs.h | 107 ++++ src/fs/virtfs/rwops.cpp | 2 +- src/fs/virtfs/tools.cpp | 2 +- src/fs/virtfs/virtfs.cpp | 654 --------------------- src/fs/virtfs/virtfs.h | 107 ---- src/fs/virtfs/virtfs1_unittest.cc | 2 +- src/fs/virtfs/virtfs_unittest.cc | 2 +- src/fs/virtfs/virtfsziprwops.cpp | 2 +- src/game.cpp | 2 +- src/gui/theme.cpp | 2 +- src/gui/widgets/browserbox_unittest.cc | 2 +- src/gui/windowmanager_unittest.cc | 2 +- src/gui/windows/minimap.cpp | 2 +- src/gui/windows/updaterwindow.cpp | 2 +- src/integrity_unittest.cc | 2 +- src/maingui.cpp | 2 +- src/resources/dye/dye_unittest.cc | 2 +- src/resources/dye/dyepalette_unittest.cc | 2 +- src/resources/map/maplayer_unittest.cc | 2 +- src/resources/map/speciallayer_unittest.cc | 2 +- src/resources/mapreader.cpp | 2 +- .../resourcemanager/resourcemanager_unittest.cc | 2 +- src/resources/sprite/animatedsprite_unittest.cc | 2 +- src/resources/wallpaper.cpp | 2 +- src/soundmanager.cpp | 2 +- src/utils/chatutils_unittest.cc | 2 +- src/utils/gettexthelper.cpp | 2 +- src/utils/stringutils_unittest.cc | 2 +- src/utils/translation/poparser.cpp | 2 +- src/utils/translation/poparser_unittest.cc | 2 +- src/utils/translation/translationmanager.cpp | 2 +- src/utils/xml/libxml.cpp | 2 +- src/utils/xml/pugixml.cpp | 2 +- src/utils/xml/pugixmlwriter.cpp | 2 +- src/utils/xml/tinyxml2.cpp | 2 +- src/utils/xml_unittest.cc | 2 +- src/utils/xmlutils_unittest.cc | 2 +- 48 files changed, 809 insertions(+), 809 deletions(-) create mode 100644 src/fs/virtfs/fs.cpp create mode 100644 src/fs/virtfs/fs.h delete mode 100644 src/fs/virtfs/virtfs.cpp delete mode 100644 src/fs/virtfs/virtfs.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 331b10c7a..584ede582 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -897,8 +897,8 @@ SET(SRCS fs/virtfs/tools.h fs/virtfs/virtlist.cpp fs/virtfs/virtlist.h - fs/virtfs/virtfs.cpp - fs/virtfs/virtfs.h + fs/virtfs/fs.cpp + fs/virtfs/fs.h fs/virtfs/rwopstypes.h fs/virtfs/direntry.cpp fs/virtfs/direntry.h @@ -1806,8 +1806,8 @@ SET(DYE_CMD_SRCS fs/virtfs/tools.h fs/virtfs/virtlist.cpp fs/virtfs/virtlist.h - fs/virtfs/virtfs.cpp - fs/virtfs/virtfs.h + fs/virtfs/fs.cpp + fs/virtfs/fs.h fs/virtfs/rwopstypes.h fs/virtfs/direntry.cpp fs/virtfs/direntry.h diff --git a/src/Makefile.am b/src/Makefile.am index 94414f868..dd4234b83 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -848,8 +848,8 @@ BASE_SRC += events/actionevent.h \ fs/virtfs/rwopstypes.h \ fs/virtfs/direntry.cpp \ fs/virtfs/direntry.h \ - fs/virtfs/virtfs.cpp \ - fs/virtfs/virtfs.h \ + fs/virtfs/fs.cpp \ + fs/virtfs/fs.h \ fs/virtfs/virtfsdir.cpp \ fs/virtfs/virtfsdir.h \ fs/virtfs/virtfsdirrwops.cpp \ diff --git a/src/client.cpp b/src/client.cpp index a47d68098..a59490ba3 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -42,7 +42,7 @@ #include "enums/being/attributesstrings.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/tools.h" #include "gui/dialogsmanager.h" diff --git a/src/configuration.cpp b/src/configuration.cpp index da2d2265e..3b6c6b021 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -27,7 +27,7 @@ #include "fs/files.h" #include "fs/paths.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "listeners/configlistener.h" diff --git a/src/dirs.cpp b/src/dirs.cpp index 31af61165..26374ed0f 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -31,7 +31,7 @@ #include "fs/mkdir.h" #include "fs/paths.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/base64.h" #if defined(__native_client__) || (defined(ANDROID) && defined(USE_SDL2)) diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index 9c33b2edd..b7ac6ac4b 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -30,7 +30,7 @@ #include "settings.h" #include "soundmanager.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/tools.h" #include "gui/dialogsmanager.h" diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp index fd64088f7..9a5b35be6 100644 --- a/src/dyetool/dyemain.cpp +++ b/src/dyetool/dyemain.cpp @@ -24,7 +24,7 @@ #include "maingui.h" #include "sdlshared.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "resources/imagewriter.h" diff --git a/src/fs/files.cpp b/src/fs/files.cpp index e805a5f1a..f0d15a328 100644 --- a/src/fs/files.cpp +++ b/src/fs/files.cpp @@ -24,7 +24,7 @@ #if defined(ANDROID) || defined(__native_client__) #include "fs/paths.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/tools.h" #include "fs/virtfs/virtlist.h" #endif // defined(ANDROID) || defined(__native_client__) diff --git a/src/fs/files_unittest.cc b/src/fs/files_unittest.cc index be3cf9256..05953f04f 100644 --- a/src/fs/files_unittest.cc +++ b/src/fs/files_unittest.cc @@ -23,7 +23,7 @@ #include "catch.hpp" #include "logger.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/tools.h" #include "utils/delete2.h" diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp index 4c7d66ce5..418e2fcf7 100644 --- a/src/fs/paths.cpp +++ b/src/fs/paths.cpp @@ -26,7 +26,7 @@ #include "fs/paths.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/checkutils.h" #include "utils/stringutils.h" diff --git a/src/fs/virtfs/fs.cpp b/src/fs/virtfs/fs.cpp new file mode 100644 index 000000000..e96ad23b4 --- /dev/null +++ b/src/fs/virtfs/fs.cpp @@ -0,0 +1,654 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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 + * 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, see . + */ + +#include "fs/virtfs/fs.h" + +#include "fs/files.h" +#include "fs/paths.h" + +#include "fs/virtfs/direntry.h" +#include "fs/virtfs/file.h" +#include "fs/virtfs/virtfsdir.h" +#include "fs/virtfs/fsfuncs.h" +#include "fs/virtfs/virtfszip.h" +#include "fs/virtfs/virtlist.h" +#include "fs/virtfs/virtzipentry.h" +#include "fs/virtfs/zipreader.h" + +#include "utils/checkutils.h" +#include "utils/stringutils.h" + +#include "debug.h" + +const char *dirSeparator = nullptr; + +#ifdef UNITTESTS +#define reportNonTests logger->log +#else // UNITTESTS +#define reportNonTests reportAlways +#endif // UNITTESTS + +namespace VirtFs +{ + namespace + { + std::vector mEntries; + } // namespace + + void init(const std::string &restrict name) + { + updateDirSeparator(); + VirtFsDir::init(name); + VirtFsZip::init(); + } + + void updateDirSeparator() + { +#ifdef WIN32 + dirSeparator = "\\"; +#else // WIN32 + dirSeparator = "/"; +#endif // WIN32 + } + + const char *getDirSeparator() + { + return dirSeparator; + } + + const char *getBaseDir() + { + return VirtFsDir::getBaseDir(); + } + + const char *getUserDir() + { + return VirtFsDir::getUserDir(); + } + + std::vector &getEntries() + { + return mEntries; + } + + FsEntry *searchEntryByRootInternal(const std::string &restrict root) + { + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + if ((*it)->root == root) + return *it; + } + return nullptr; + } + + FsEntry *searchEntryInternal(const std::string &restrict root, + const FsEntryTypeT type) + { + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + const FsEntry *const entry = *it; + if (entry->root == root && + entry->type == type) + { + return *it; + } + } + return nullptr; + } + + bool exists(std::string name) + { + prepareFsPath(name); + if (checkPath(name) == false) + { + reportAlways("VirtFsDir::exists invalid path: %s", + name.c_str()); + return false; + } + + std::string rootDir = name; + if (findLast(rootDir, std::string(dirSeparator)) == false) + rootDir += dirSeparator; + + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + if (entry->funcs->exists(entry, name, rootDir) == true) + return true; + } + return false; + } + + VirtList *enumerateFiles(std::string dirName) + { + VirtList *const list = new VirtList; + prepareFsPath(dirName); + if (checkPath(dirName) == false) + { + reportAlways("VirtFs::enumerateFiles invalid path: %s", + dirName.c_str()); + return list; + } + + std::string rootDir = dirName; + if (findLast(rootDir, std::string(dirSeparator)) == false) + rootDir += dirSeparator; + StringVect &names = list->names; + + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + entry->funcs->enumerate(entry, rootDir, names); + } + + return list; + } + + void getFiles(std::string dirName, + StringVect &list) + { + prepareFsPath(dirName); + if (checkPath(dirName) == false) + { + reportAlways("VirtFs::enumerateFiles invalid path: %s", + dirName.c_str()); + return; + } + + std::string rootDir = dirName; + if (findLast(rootDir, std::string(dirSeparator)) == false) + rootDir += dirSeparator; + + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + entry->funcs->getFiles(entry, rootDir, list); + } + } + + void getFilesWithDir(std::string dirName, + StringVect &list) + { + prepareFsPath(dirName); + if (checkPath(dirName) == false) + { + reportAlways("VirtFs::enumerateFiles invalid path: %s", + dirName.c_str()); + return; + } + + std::string rootDir = dirName; + if (findLast(rootDir, std::string(dirSeparator)) == false) + rootDir += dirSeparator; + + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + entry->funcs->getFilesWithDir(entry, rootDir, list); + } + } + + + void getDirs(std::string dirName, + StringVect &list) + { + prepareFsPath(dirName); + if (checkPath(dirName) == false) + { + reportAlways("VirtFs::enumerateFiles invalid path: %s", + dirName.c_str()); + return; + } + + std::string rootDir = dirName; + if (findLast(rootDir, std::string(dirSeparator)) == false) + rootDir += dirSeparator; + + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + entry->funcs->getDirs(entry, rootDir, list); + } + } + + bool isDirectory(std::string name) + { + prepareFsPath(name); + if (checkPath(name) == false) + { + reportAlways("VirtFs::isDirectory invalid path: %s", + name.c_str()); + return false; + } + std::string dirName = name; + if (findLast(dirName, std::string(dirSeparator)) == false) + dirName += dirSeparator; + + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + bool isDirFlag(false); + if (entry->funcs->isDirectory(entry, dirName, isDirFlag) == true) + { + return isDirFlag; + } + } + return false; + } + + bool isSymbolicLink(const std::string &restrict name) + { + return VirtFsDir::isSymbolicLink(name); + } + + void freeList(VirtList *restrict const handle) + { + delete handle; + } + + File *openRead(std::string filename) + { + prepareFsPath(filename); + if (checkPath(filename) == false) + { + reportAlways("VirtFs::openRead invalid path: %s", + filename.c_str()); + return nullptr; + } + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + File *const file = entry->funcs->openRead(entry, filename); + if (file != nullptr) + return file; + } + return nullptr; + } + + File *openWrite(std::string filename) + { + prepareFsPath(filename); + if (checkPath(filename) == false) + { + reportAlways("VirtFs::openWrite invalid path: %s", + filename.c_str()); + return nullptr; + } + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + File *const file = entry->funcs->openWrite(entry, filename); + if (file != nullptr) + return file; + } + return nullptr; + } + + File *openAppend(std::string filename) + { + prepareFsPath(filename); + if (checkPath(filename) == false) + { + reportAlways("VirtFs::openAppend invalid path: %s", + filename.c_str()); + return nullptr; + } + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + File *const file = entry->funcs->openAppend(entry, filename); + if (file != nullptr) + return file; + } + return nullptr; + } + + bool setWriteDir(const std::string &restrict newDir) + { + return VirtFsDir::setWriteDir(newDir); + } + + void addEntry(FsEntry *const entry, + const Append append) + { + if (append == Append_true) + mEntries.push_back(entry); + else + mEntries.insert(mEntries.begin(), entry); + } + + bool mountDirInternal(const std::string &restrict newDir, + const Append append) + { + if (newDir.find(".zip") != std::string::npos) + { + reportAlways("Called VirtFsDir::addToSearchPath with zip archive"); + return false; + } + std::string rootDir = newDir; + if (findLast(rootDir, std::string(dirSeparator)) == false) + rootDir += dirSeparator; + const FsEntry *const entry = searchEntryByRootInternal(rootDir); + if (entry != nullptr) + { + reportAlways("VirtFs::addToSearchPath already exists: %s", + newDir.c_str()); + return false; + } + logger->log("Add virtual directory: " + newDir); + addEntry(new DirEntry(newDir, rootDir, VirtFsDir::getFuncs()), + append); + return true; + } + + bool mountDir(std::string newDir, + const Append append) + { + prepareFsPath(newDir); + if (Files::existsLocal(newDir) == false) + { + reportNonTests("VirtFs::addToSearchPath directory not exists: %s", + newDir.c_str()); + return false; + } + return mountDirInternal(newDir, append); + } + + bool mountDirSilent(std::string newDir, + const Append append) + { + prepareFsPath(newDir); + if (Files::existsLocal(newDir) == false) + { + logger->log("VirtFs::addToSearchPath directory not exists: %s", + newDir.c_str()); + return false; + } + return mountDirInternal(newDir, append); + } + +#ifdef UNITTESTS + bool mountDirSilent2(std::string newDir, + const Append append) + { + prepareFsPath(newDir); + if (Files::existsLocal(newDir) == false) + { + logger->log("VirtFs::addToSearchPath directory not exists: %s", + newDir.c_str()); + } + return mountDirInternal(newDir, append); + } +#endif // UNITTESTS + + bool unmountDirInternal(std::string oldDir) + { + if (findLast(oldDir, std::string(dirSeparator)) == false) + oldDir += dirSeparator; + FOR_EACH (std::vector::iterator, it, mEntries) + { + FsEntry *const entry = *it; + if (entry->root == oldDir && + entry->type == FsEntryType::Dir) + { + DirEntry *const dirEntry = static_cast( + entry); + logger->log("Remove virtual directory: " + oldDir); + mEntries.erase(it); + delete dirEntry; + return true; + } + } + return false; + } + + bool unmountDir(std::string oldDir) + { + prepareFsPath(oldDir); + if (oldDir.find(".zip") != std::string::npos) + { + reportAlways("Called removeFromSearchPath with zip archive"); + return false; + } + if (unmountDirInternal(oldDir) == false) + { + reportAlways("VirtFs::unmountDir not exists: %s", + oldDir.c_str()); + return false; + } + return true; + } + + bool unmountDirSilent(std::string oldDir) + { + prepareFsPath(oldDir); + if (oldDir.find(".zip") != std::string::npos) + { + reportAlways("Called removeFromSearchPath with zip archive"); + return false; + } + if (unmountDirInternal(oldDir) == false) + { + logger->log("VirtFs::unmountDir not exists: %s", + oldDir.c_str()); + return false; + } + return true; + } + + bool mountZip(std::string newDir, + const Append append) + { + prepareFsPath(newDir); + if (Files::existsLocal(newDir) == false) + { + reportNonTests("VirtFsZip::addToSearchPath file not exists: %s", + newDir.c_str()); + return false; + } + if (findLast(newDir, ".zip") == false) + { + reportAlways("Called VirtFs::addToSearchPath without " + "zip archive"); + return false; + } + if (searchEntryByRootInternal(newDir) != nullptr) + { + reportAlways("VirtFsZip::addToSearchPath already exists: %s", + newDir.c_str()); + return false; + } + VirtZipEntry *const entry = new VirtZipEntry(newDir, + VirtFsZip::getFuncs()); + if (ZipReader::readArchiveInfo(entry) == false) + { + delete entry; + return false; + } + + logger->log("Add virtual zip: " + newDir); + addEntry(entry, append); + return true; + } + + bool unmountZip(std::string oldDir) + { + prepareFsPath(oldDir); + if (findLast(oldDir, ".zip") == false) + { + reportAlways("Called removeFromSearchPath without zip archive"); + return false; + } + FOR_EACH (std::vector::iterator, it, mEntries) + { + FsEntry *const entry = *it; + if (entry->root == oldDir && + entry->type == FsEntryType::Zip) + { + VirtZipEntry *const zipEntry = static_cast( + entry); + logger->log("Remove virtual zip: " + oldDir); + mEntries.erase(it); + delete zipEntry; + return true; + } + } + + reportAlways("VirtFs::unmountZip not exists: %s", + oldDir.c_str()); + return false; + } + + std::string getRealDir(std::string fileName) + { + prepareFsPath(fileName); + if (checkPath(fileName) == false) + { + reportAlways("VirtFsDir::getRealDir invalid path: %s", + fileName.c_str()); + return std::string(); + } + + std::string rootDir = fileName; + if (findLast(rootDir, std::string(dirSeparator)) == false) + rootDir += dirSeparator; + + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + std::string realDir; + if (entry->funcs->getRealDir(entry, + fileName, + rootDir, + realDir) == true) + { + return realDir; + } + } + return std::string(); + } + + bool mkdir(const std::string &restrict dirname) + { + return VirtFsDir::mkdir(dirname); + } + + bool remove(const std::string &restrict filename) + { + return VirtFsDir::remove(filename); + } + + bool deinit() + { + VirtFsDir::deinit(); + VirtFsZip::deinit(); + FOR_EACH (std::vector::iterator, it, mEntries) + { + FsEntry *const entry = *it; + if (entry->type == FsEntryType::Dir) + delete static_cast(entry); + else if (entry->type == FsEntryType::Zip) + delete static_cast(entry); + else + delete entry; + } + mEntries.clear(); + return true; + } + + void permitLinks(const bool val) + { + VirtFsDir::permitLinks(val); + } + + int close(File *restrict const file) + { + if (file == nullptr) + return 0; + return file->funcs->close(file); + } + + int64_t read(File *restrict const file, + void *restrict const buffer, + const uint32_t objSize, + const uint32_t objCount) + { + return file->funcs->read(file, + buffer, + objSize, + objCount); + } + + int64_t write(File *restrict const file, + const void *restrict const buffer, + const uint32_t objSize, + const uint32_t objCount) + { + return file->funcs->write(file, + buffer, + objSize, + objCount); + } + + int64_t fileLength(File *restrict const file) + { + return file->funcs->fileLength(file); + } + + int64_t tell(File *restrict const file) + { + return file->funcs->tell(file); + } + + int seek(File *restrict const file, + const uint64_t pos) + { + return file->funcs->seek(file, + pos); + } + + int eof(File *restrict const file) + { + return file->funcs->eof(file); + } + + const char *loadFile(std::string filename, + int &restrict fileSize) + { + prepareFsPath(filename); + if (checkPath(filename) == false) + { + reportAlways("VirtFs::loadFile invalid path: %s", + filename.c_str()); + return nullptr; + } + FOR_EACH (std::vector::const_iterator, it, mEntries) + { + FsEntry *const entry = *it; + const char *const buf = entry->funcs->loadFile(entry, + filename, + fileSize); + if (buf != nullptr) + return buf; + } + return nullptr; + } + +} // namespace VirtFs diff --git a/src/fs/virtfs/fs.h b/src/fs/virtfs/fs.h new file mode 100644 index 000000000..8b5df99ef --- /dev/null +++ b/src/fs/virtfs/fs.h @@ -0,0 +1,107 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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 + * 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, see . + */ + +#ifndef FS_VIRTFS_H +#define FS_VIRTFS_H + +#include "enums/fs/fsentrytype.h" + +#include "enums/simpletypes/append.h" + +#include "utils/stringvector.h" + +#include "localconsts.h" + +namespace VirtFs +{ + struct File; + struct FsEntry; + struct VirtList; + + void init(const std::string &restrict name); + void updateDirSeparator(); + const char *getDirSeparator(); + const char *getBaseDir(); + const char *getUserDir(); + bool exists(std::string name); + VirtList *enumerateFiles(std::string dir) RETURNS_NONNULL; + bool isDirectory(std::string name); + bool isSymbolicLink(const std::string &restrict name); + void freeList(VirtList *restrict const handle); + File *openRead(std::string filename); + File *openWrite(std::string filename); + File *openAppend(std::string filename); + bool setWriteDir(const std::string &restrict newDir); + bool mountDir(std::string newDir, + const Append append); + bool mountDirSilent(std::string newDir, + const Append append); + bool unmountDir(std::string oldDir); + bool unmountDirSilent(std::string oldDir); + bool mountZip(std::string newDir, + const Append append); + bool unmountZip(std::string oldDir); + std::string getRealDir(std::string filename); + bool mkdir(const std::string &restrict dirName); + bool remove(const std::string &restrict filename); + bool deinit(); + void permitLinks(const bool val); + int64_t read(File *restrict const handle, + void *restrict const buffer, + const uint32_t objSize, + const uint32_t objCount); + int64_t write(File *restrict const file, + const void *restrict const buffer, + const uint32_t objSize, + const uint32_t objCount); + int close(File *restrict const file); + int64_t fileLength(File *restrict const file); + int64_t tell(File *restrict const file); + int seek(File *restrict const file, + const uint64_t pos); + int eof(File *restrict const file); + + bool mountDirInternal(const std::string &restrict newDir, + const Append append); + bool unmountDirInternal(std::string oldDir); + std::vector &getEntries(); + FsEntry *searchEntryByRootInternal(const std::string &restrict + root); + FsEntry *searchEntryInternal(const std::string &restrict root, + const FsEntryTypeT type); + void addEntry(FsEntry *const entry, + const Append append); +#ifdef UNITTESTS + bool mountDirSilent2(std::string newDir, + const Append append); +#endif // UNITTESTS + const char *loadFile(std::string filename, + int &restrict fileSize); + void getFiles(std::string dirName, + StringVect &list); + void getFilesWithDir(std::string dirName, + StringVect &list); + void getDirs(std::string dirName, + StringVect &list); +} // namespace VirtFs + +extern const char *dirSeparator; + +#endif // FS_VIRTFS_H diff --git a/src/fs/virtfs/rwops.cpp b/src/fs/virtfs/rwops.cpp index 854c5510d..3a18d53c2 100644 --- a/src/fs/virtfs/rwops.cpp +++ b/src/fs/virtfs/rwops.cpp @@ -47,7 +47,7 @@ #include "logger.h" #include "fs/virtfs/file.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/fsfuncs.h" #include "utils/fuzzer.h" diff --git a/src/fs/virtfs/tools.cpp b/src/fs/virtfs/tools.cpp index 6573e6141..ea897e861 100644 --- a/src/fs/virtfs/tools.cpp +++ b/src/fs/virtfs/tools.cpp @@ -24,7 +24,7 @@ #include "fs/paths.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/virtlist.h" #include "utils/stringutils.h" diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp deleted file mode 100644 index 58dec670e..000000000 --- a/src/fs/virtfs/virtfs.cpp +++ /dev/null @@ -1,654 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * 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 - * 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, see . - */ - -#include "fs/virtfs/virtfs.h" - -#include "fs/files.h" -#include "fs/paths.h" - -#include "fs/virtfs/direntry.h" -#include "fs/virtfs/file.h" -#include "fs/virtfs/virtfsdir.h" -#include "fs/virtfs/fsfuncs.h" -#include "fs/virtfs/virtfszip.h" -#include "fs/virtfs/virtlist.h" -#include "fs/virtfs/virtzipentry.h" -#include "fs/virtfs/zipreader.h" - -#include "utils/checkutils.h" -#include "utils/stringutils.h" - -#include "debug.h" - -const char *dirSeparator = nullptr; - -#ifdef UNITTESTS -#define reportNonTests logger->log -#else // UNITTESTS -#define reportNonTests reportAlways -#endif // UNITTESTS - -namespace VirtFs -{ - namespace - { - std::vector mEntries; - } // namespace - - void init(const std::string &restrict name) - { - updateDirSeparator(); - VirtFsDir::init(name); - VirtFsZip::init(); - } - - void updateDirSeparator() - { -#ifdef WIN32 - dirSeparator = "\\"; -#else // WIN32 - dirSeparator = "/"; -#endif // WIN32 - } - - const char *getDirSeparator() - { - return dirSeparator; - } - - const char *getBaseDir() - { - return VirtFsDir::getBaseDir(); - } - - const char *getUserDir() - { - return VirtFsDir::getUserDir(); - } - - std::vector &getEntries() - { - return mEntries; - } - - FsEntry *searchEntryByRootInternal(const std::string &restrict root) - { - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - if ((*it)->root == root) - return *it; - } - return nullptr; - } - - FsEntry *searchEntryInternal(const std::string &restrict root, - const FsEntryTypeT type) - { - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - const FsEntry *const entry = *it; - if (entry->root == root && - entry->type == type) - { - return *it; - } - } - return nullptr; - } - - bool exists(std::string name) - { - prepareFsPath(name); - if (checkPath(name) == false) - { - reportAlways("VirtFsDir::exists invalid path: %s", - name.c_str()); - return false; - } - - std::string rootDir = name; - if (findLast(rootDir, std::string(dirSeparator)) == false) - rootDir += dirSeparator; - - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - if (entry->funcs->exists(entry, name, rootDir) == true) - return true; - } - return false; - } - - VirtList *enumerateFiles(std::string dirName) - { - VirtList *const list = new VirtList; - prepareFsPath(dirName); - if (checkPath(dirName) == false) - { - reportAlways("VirtFs::enumerateFiles invalid path: %s", - dirName.c_str()); - return list; - } - - std::string rootDir = dirName; - if (findLast(rootDir, std::string(dirSeparator)) == false) - rootDir += dirSeparator; - StringVect &names = list->names; - - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - entry->funcs->enumerate(entry, rootDir, names); - } - - return list; - } - - void getFiles(std::string dirName, - StringVect &list) - { - prepareFsPath(dirName); - if (checkPath(dirName) == false) - { - reportAlways("VirtFs::enumerateFiles invalid path: %s", - dirName.c_str()); - return; - } - - std::string rootDir = dirName; - if (findLast(rootDir, std::string(dirSeparator)) == false) - rootDir += dirSeparator; - - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - entry->funcs->getFiles(entry, rootDir, list); - } - } - - void getFilesWithDir(std::string dirName, - StringVect &list) - { - prepareFsPath(dirName); - if (checkPath(dirName) == false) - { - reportAlways("VirtFs::enumerateFiles invalid path: %s", - dirName.c_str()); - return; - } - - std::string rootDir = dirName; - if (findLast(rootDir, std::string(dirSeparator)) == false) - rootDir += dirSeparator; - - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - entry->funcs->getFilesWithDir(entry, rootDir, list); - } - } - - - void getDirs(std::string dirName, - StringVect &list) - { - prepareFsPath(dirName); - if (checkPath(dirName) == false) - { - reportAlways("VirtFs::enumerateFiles invalid path: %s", - dirName.c_str()); - return; - } - - std::string rootDir = dirName; - if (findLast(rootDir, std::string(dirSeparator)) == false) - rootDir += dirSeparator; - - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - entry->funcs->getDirs(entry, rootDir, list); - } - } - - bool isDirectory(std::string name) - { - prepareFsPath(name); - if (checkPath(name) == false) - { - reportAlways("VirtFs::isDirectory invalid path: %s", - name.c_str()); - return false; - } - std::string dirName = name; - if (findLast(dirName, std::string(dirSeparator)) == false) - dirName += dirSeparator; - - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - bool isDirFlag(false); - if (entry->funcs->isDirectory(entry, dirName, isDirFlag) == true) - { - return isDirFlag; - } - } - return false; - } - - bool isSymbolicLink(const std::string &restrict name) - { - return VirtFsDir::isSymbolicLink(name); - } - - void freeList(VirtList *restrict const handle) - { - delete handle; - } - - File *openRead(std::string filename) - { - prepareFsPath(filename); - if (checkPath(filename) == false) - { - reportAlways("VirtFs::openRead invalid path: %s", - filename.c_str()); - return nullptr; - } - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - File *const file = entry->funcs->openRead(entry, filename); - if (file != nullptr) - return file; - } - return nullptr; - } - - File *openWrite(std::string filename) - { - prepareFsPath(filename); - if (checkPath(filename) == false) - { - reportAlways("VirtFs::openWrite invalid path: %s", - filename.c_str()); - return nullptr; - } - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - File *const file = entry->funcs->openWrite(entry, filename); - if (file != nullptr) - return file; - } - return nullptr; - } - - File *openAppend(std::string filename) - { - prepareFsPath(filename); - if (checkPath(filename) == false) - { - reportAlways("VirtFs::openAppend invalid path: %s", - filename.c_str()); - return nullptr; - } - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - File *const file = entry->funcs->openAppend(entry, filename); - if (file != nullptr) - return file; - } - return nullptr; - } - - bool setWriteDir(const std::string &restrict newDir) - { - return VirtFsDir::setWriteDir(newDir); - } - - void addEntry(FsEntry *const entry, - const Append append) - { - if (append == Append_true) - mEntries.push_back(entry); - else - mEntries.insert(mEntries.begin(), entry); - } - - bool mountDirInternal(const std::string &restrict newDir, - const Append append) - { - if (newDir.find(".zip") != std::string::npos) - { - reportAlways("Called VirtFsDir::addToSearchPath with zip archive"); - return false; - } - std::string rootDir = newDir; - if (findLast(rootDir, std::string(dirSeparator)) == false) - rootDir += dirSeparator; - const FsEntry *const entry = searchEntryByRootInternal(rootDir); - if (entry != nullptr) - { - reportAlways("VirtFs::addToSearchPath already exists: %s", - newDir.c_str()); - return false; - } - logger->log("Add virtual directory: " + newDir); - addEntry(new DirEntry(newDir, rootDir, VirtFsDir::getFuncs()), - append); - return true; - } - - bool mountDir(std::string newDir, - const Append append) - { - prepareFsPath(newDir); - if (Files::existsLocal(newDir) == false) - { - reportNonTests("VirtFs::addToSearchPath directory not exists: %s", - newDir.c_str()); - return false; - } - return mountDirInternal(newDir, append); - } - - bool mountDirSilent(std::string newDir, - const Append append) - { - prepareFsPath(newDir); - if (Files::existsLocal(newDir) == false) - { - logger->log("VirtFs::addToSearchPath directory not exists: %s", - newDir.c_str()); - return false; - } - return mountDirInternal(newDir, append); - } - -#ifdef UNITTESTS - bool mountDirSilent2(std::string newDir, - const Append append) - { - prepareFsPath(newDir); - if (Files::existsLocal(newDir) == false) - { - logger->log("VirtFs::addToSearchPath directory not exists: %s", - newDir.c_str()); - } - return mountDirInternal(newDir, append); - } -#endif // UNITTESTS - - bool unmountDirInternal(std::string oldDir) - { - if (findLast(oldDir, std::string(dirSeparator)) == false) - oldDir += dirSeparator; - FOR_EACH (std::vector::iterator, it, mEntries) - { - FsEntry *const entry = *it; - if (entry->root == oldDir && - entry->type == FsEntryType::Dir) - { - DirEntry *const dirEntry = static_cast( - entry); - logger->log("Remove virtual directory: " + oldDir); - mEntries.erase(it); - delete dirEntry; - return true; - } - } - return false; - } - - bool unmountDir(std::string oldDir) - { - prepareFsPath(oldDir); - if (oldDir.find(".zip") != std::string::npos) - { - reportAlways("Called removeFromSearchPath with zip archive"); - return false; - } - if (unmountDirInternal(oldDir) == false) - { - reportAlways("VirtFs::unmountDir not exists: %s", - oldDir.c_str()); - return false; - } - return true; - } - - bool unmountDirSilent(std::string oldDir) - { - prepareFsPath(oldDir); - if (oldDir.find(".zip") != std::string::npos) - { - reportAlways("Called removeFromSearchPath with zip archive"); - return false; - } - if (unmountDirInternal(oldDir) == false) - { - logger->log("VirtFs::unmountDir not exists: %s", - oldDir.c_str()); - return false; - } - return true; - } - - bool mountZip(std::string newDir, - const Append append) - { - prepareFsPath(newDir); - if (Files::existsLocal(newDir) == false) - { - reportNonTests("VirtFsZip::addToSearchPath file not exists: %s", - newDir.c_str()); - return false; - } - if (findLast(newDir, ".zip") == false) - { - reportAlways("Called VirtFs::addToSearchPath without " - "zip archive"); - return false; - } - if (searchEntryByRootInternal(newDir) != nullptr) - { - reportAlways("VirtFsZip::addToSearchPath already exists: %s", - newDir.c_str()); - return false; - } - VirtZipEntry *const entry = new VirtZipEntry(newDir, - VirtFsZip::getFuncs()); - if (ZipReader::readArchiveInfo(entry) == false) - { - delete entry; - return false; - } - - logger->log("Add virtual zip: " + newDir); - addEntry(entry, append); - return true; - } - - bool unmountZip(std::string oldDir) - { - prepareFsPath(oldDir); - if (findLast(oldDir, ".zip") == false) - { - reportAlways("Called removeFromSearchPath without zip archive"); - return false; - } - FOR_EACH (std::vector::iterator, it, mEntries) - { - FsEntry *const entry = *it; - if (entry->root == oldDir && - entry->type == FsEntryType::Zip) - { - VirtZipEntry *const zipEntry = static_cast( - entry); - logger->log("Remove virtual zip: " + oldDir); - mEntries.erase(it); - delete zipEntry; - return true; - } - } - - reportAlways("VirtFs::unmountZip not exists: %s", - oldDir.c_str()); - return false; - } - - std::string getRealDir(std::string fileName) - { - prepareFsPath(fileName); - if (checkPath(fileName) == false) - { - reportAlways("VirtFsDir::getRealDir invalid path: %s", - fileName.c_str()); - return std::string(); - } - - std::string rootDir = fileName; - if (findLast(rootDir, std::string(dirSeparator)) == false) - rootDir += dirSeparator; - - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - std::string realDir; - if (entry->funcs->getRealDir(entry, - fileName, - rootDir, - realDir) == true) - { - return realDir; - } - } - return std::string(); - } - - bool mkdir(const std::string &restrict dirname) - { - return VirtFsDir::mkdir(dirname); - } - - bool remove(const std::string &restrict filename) - { - return VirtFsDir::remove(filename); - } - - bool deinit() - { - VirtFsDir::deinit(); - VirtFsZip::deinit(); - FOR_EACH (std::vector::iterator, it, mEntries) - { - FsEntry *const entry = *it; - if (entry->type == FsEntryType::Dir) - delete static_cast(entry); - else if (entry->type == FsEntryType::Zip) - delete static_cast(entry); - else - delete entry; - } - mEntries.clear(); - return true; - } - - void permitLinks(const bool val) - { - VirtFsDir::permitLinks(val); - } - - int close(File *restrict const file) - { - if (file == nullptr) - return 0; - return file->funcs->close(file); - } - - int64_t read(File *restrict const file, - void *restrict const buffer, - const uint32_t objSize, - const uint32_t objCount) - { - return file->funcs->read(file, - buffer, - objSize, - objCount); - } - - int64_t write(File *restrict const file, - const void *restrict const buffer, - const uint32_t objSize, - const uint32_t objCount) - { - return file->funcs->write(file, - buffer, - objSize, - objCount); - } - - int64_t fileLength(File *restrict const file) - { - return file->funcs->fileLength(file); - } - - int64_t tell(File *restrict const file) - { - return file->funcs->tell(file); - } - - int seek(File *restrict const file, - const uint64_t pos) - { - return file->funcs->seek(file, - pos); - } - - int eof(File *restrict const file) - { - return file->funcs->eof(file); - } - - const char *loadFile(std::string filename, - int &restrict fileSize) - { - prepareFsPath(filename); - if (checkPath(filename) == false) - { - reportAlways("VirtFs::loadFile invalid path: %s", - filename.c_str()); - return nullptr; - } - FOR_EACH (std::vector::const_iterator, it, mEntries) - { - FsEntry *const entry = *it; - const char *const buf = entry->funcs->loadFile(entry, - filename, - fileSize); - if (buf != nullptr) - return buf; - } - return nullptr; - } - -} // namespace VirtFs diff --git a/src/fs/virtfs/virtfs.h b/src/fs/virtfs/virtfs.h deleted file mode 100644 index 8b5df99ef..000000000 --- a/src/fs/virtfs/virtfs.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * 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 - * 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, see . - */ - -#ifndef FS_VIRTFS_H -#define FS_VIRTFS_H - -#include "enums/fs/fsentrytype.h" - -#include "enums/simpletypes/append.h" - -#include "utils/stringvector.h" - -#include "localconsts.h" - -namespace VirtFs -{ - struct File; - struct FsEntry; - struct VirtList; - - void init(const std::string &restrict name); - void updateDirSeparator(); - const char *getDirSeparator(); - const char *getBaseDir(); - const char *getUserDir(); - bool exists(std::string name); - VirtList *enumerateFiles(std::string dir) RETURNS_NONNULL; - bool isDirectory(std::string name); - bool isSymbolicLink(const std::string &restrict name); - void freeList(VirtList *restrict const handle); - File *openRead(std::string filename); - File *openWrite(std::string filename); - File *openAppend(std::string filename); - bool setWriteDir(const std::string &restrict newDir); - bool mountDir(std::string newDir, - const Append append); - bool mountDirSilent(std::string newDir, - const Append append); - bool unmountDir(std::string oldDir); - bool unmountDirSilent(std::string oldDir); - bool mountZip(std::string newDir, - const Append append); - bool unmountZip(std::string oldDir); - std::string getRealDir(std::string filename); - bool mkdir(const std::string &restrict dirName); - bool remove(const std::string &restrict filename); - bool deinit(); - void permitLinks(const bool val); - int64_t read(File *restrict const handle, - void *restrict const buffer, - const uint32_t objSize, - const uint32_t objCount); - int64_t write(File *restrict const file, - const void *restrict const buffer, - const uint32_t objSize, - const uint32_t objCount); - int close(File *restrict const file); - int64_t fileLength(File *restrict const file); - int64_t tell(File *restrict const file); - int seek(File *restrict const file, - const uint64_t pos); - int eof(File *restrict const file); - - bool mountDirInternal(const std::string &restrict newDir, - const Append append); - bool unmountDirInternal(std::string oldDir); - std::vector &getEntries(); - FsEntry *searchEntryByRootInternal(const std::string &restrict - root); - FsEntry *searchEntryInternal(const std::string &restrict root, - const FsEntryTypeT type); - void addEntry(FsEntry *const entry, - const Append append); -#ifdef UNITTESTS - bool mountDirSilent2(std::string newDir, - const Append append); -#endif // UNITTESTS - const char *loadFile(std::string filename, - int &restrict fileSize); - void getFiles(std::string dirName, - StringVect &list); - void getFilesWithDir(std::string dirName, - StringVect &list); - void getDirs(std::string dirName, - StringVect &list); -} // namespace VirtFs - -extern const char *dirSeparator; - -#endif // FS_VIRTFS_H diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc index b4bdcbb09..b1084d605 100644 --- a/src/fs/virtfs/virtfs1_unittest.cc +++ b/src/fs/virtfs/virtfs1_unittest.cc @@ -23,7 +23,7 @@ #include "fs/files.h" #include "fs/virtfs/direntry.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/rwops.h" #include "fs/virtfs/virtlist.h" diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/fs/virtfs/virtfs_unittest.cc index 2734e9ab2..3c0b65679 100644 --- a/src/fs/virtfs/virtfs_unittest.cc +++ b/src/fs/virtfs/virtfs_unittest.cc @@ -23,7 +23,7 @@ #include "fs/files.h" #include "fs/paths.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/virtlist.h" #include "utils/checkutils.h" diff --git a/src/fs/virtfs/virtfsziprwops.cpp b/src/fs/virtfs/virtfsziprwops.cpp index 5d21d70b0..d0c386bab 100644 --- a/src/fs/virtfs/virtfsziprwops.cpp +++ b/src/fs/virtfs/virtfsziprwops.cpp @@ -23,7 +23,7 @@ #include "logger.h" #include "fs/virtfs/file.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include diff --git a/src/game.cpp b/src/game.cpp index e3e293151..ed04a905d 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -43,7 +43,7 @@ #include "fs/mkdir.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/dialogsmanager.h" #include "gui/gui.h" diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index db1d1ee39..42ac00d23 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -29,7 +29,7 @@ #include "const/gui/theme.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/virtlist.h" #include "gui/skin.h" diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc index e86aa6b0e..bed2ec2bd 100644 --- a/src/gui/widgets/browserbox_unittest.cc +++ b/src/gui/widgets/browserbox_unittest.cc @@ -27,7 +27,7 @@ #include "being/actorsprite.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index b19844ac9..dd80b7d5d 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -32,7 +32,7 @@ #include "const/resources/currency.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" #include "gui/mailmessage.h" diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 5d4d867bf..9b12ee1fd 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -31,7 +31,7 @@ #include "enums/resources/map/blockmask.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/popupmanager.h" #include "gui/viewport.h" diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 823a92c3d..a88aba197 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -33,7 +33,7 @@ #include "fs/mkdir.h" #include "fs/paths.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/button.h" diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc index 955c0457f..9b5c31455 100644 --- a/src/integrity_unittest.cc +++ b/src/integrity_unittest.cc @@ -27,7 +27,7 @@ #include "fs/files.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/rwops.h" #include "gui/gui.h" diff --git a/src/maingui.cpp b/src/maingui.cpp index 301b088a0..4eb7c8624 100644 --- a/src/maingui.cpp +++ b/src/maingui.cpp @@ -26,7 +26,7 @@ #include "commandline.h" #include "settings.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/delete2.h" #ifdef ANDROID diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc index f31097cbe..b21b03016 100644 --- a/src/resources/dye/dye_unittest.cc +++ b/src/resources/dye/dye_unittest.cc @@ -26,7 +26,7 @@ #include "being/actorsprite.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index 280a74ead..338e7c23d 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -28,7 +28,7 @@ #include "being/actorsprite.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" #include "gui/theme.h" diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc index 817985114..1d9b515f7 100644 --- a/src/resources/map/maplayer_unittest.cc +++ b/src/resources/map/maplayer_unittest.cc @@ -26,7 +26,7 @@ #include "enums/resources/map/blockmask.h" #include "enums/resources/map/mapitemtype.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/theme.h" diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc index d43daaac8..57dc3b98b 100644 --- a/src/resources/map/speciallayer_unittest.cc +++ b/src/resources/map/speciallayer_unittest.cc @@ -28,7 +28,7 @@ #include "enums/resources/map/mapitemtype.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index bd298ac90..cd5a1feb7 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -33,7 +33,7 @@ #include "enums/resources/map/collisiontype.h" #include "enums/resources/map/mapitemtype.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "resources/map/map.h" #include "resources/map/mapheights.h" diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc index 24b8a214f..2595beb76 100644 --- a/src/resources/resourcemanager/resourcemanager_unittest.cc +++ b/src/resources/resourcemanager/resourcemanager_unittest.cc @@ -26,7 +26,7 @@ #include "being/actorsprite.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index f48b10b4b..4f8053b57 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -31,7 +31,7 @@ #include "being/actorsprite.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" #include "gui/theme.h" diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index bf04d6ce5..a405298e8 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -24,7 +24,7 @@ #include "configuration.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "fs/virtfs/virtlist.h" #include "resources/wallpaperdata.h" diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index 7d085fff4..4b7cca8f1 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -28,7 +28,7 @@ #include "being/localplayer.h" #endif // DYECMD -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "resources/sdlmusic.h" #include "resources/soundeffect.h" diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc index d613665dc..d07578992 100644 --- a/src/utils/chatutils_unittest.cc +++ b/src/utils/chatutils_unittest.cc @@ -30,7 +30,7 @@ #include "being/localplayer.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" #include "gui/theme.h" diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp index 1dbe01226..f7f02ba32 100644 --- a/src/utils/gettexthelper.cpp +++ b/src/utils/gettexthelper.cpp @@ -28,7 +28,7 @@ #include "client.h" #include "logger.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include diff --git a/src/utils/stringutils_unittest.cc b/src/utils/stringutils_unittest.cc index 7a303e2ac..9a99972b3 100644 --- a/src/utils/stringutils_unittest.cc +++ b/src/utils/stringutils_unittest.cc @@ -24,7 +24,7 @@ #include "const/utils/utf8.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/delete2.h" #include "utils/dtor.h" diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp index af436b7de..8244fd627 100644 --- a/src/utils/translation/poparser.cpp +++ b/src/utils/translation/poparser.cpp @@ -20,7 +20,7 @@ #include "utils/translation/poparser.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/stringutils.h" diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc index 7ba006f82..d4cf806dc 100644 --- a/src/utils/translation/poparser_unittest.cc +++ b/src/utils/translation/poparser_unittest.cc @@ -27,7 +27,7 @@ #include "being/actorsprite.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" #include "gui/theme.h" diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index 808ad5f2f..67527b06a 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -20,7 +20,7 @@ #include "utils/translation/translationmanager.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/delete2.h" #include "utils/stringutils.h" diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp index f7319f7ee..32e0cc556 100644 --- a/src/utils/xml/libxml.cpp +++ b/src/utils/xml/libxml.cpp @@ -24,7 +24,7 @@ #include "utils/xml/libxml.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp index 09bdd75aa..0c9e2bee9 100644 --- a/src/utils/xml/pugixml.cpp +++ b/src/utils/xml/pugixml.cpp @@ -24,7 +24,7 @@ #include "utils/xml/pugixml.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/checkutils.h" #include "utils/delete2.h" diff --git a/src/utils/xml/pugixmlwriter.cpp b/src/utils/xml/pugixmlwriter.cpp index 29e79cc76..b8c6aafec 100644 --- a/src/utils/xml/pugixmlwriter.cpp +++ b/src/utils/xml/pugixmlwriter.cpp @@ -24,7 +24,7 @@ #include "logger.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/delete2.h" #include "utils/fuzzer.h" diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp index 214d08f42..60e9070d9 100644 --- a/src/utils/xml/tinyxml2.cpp +++ b/src/utils/xml/tinyxml2.cpp @@ -24,7 +24,7 @@ #include "utils/xml/tinyxml2.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc index 27bb18cd3..41297339c 100644 --- a/src/utils/xml_unittest.cc +++ b/src/utils/xml_unittest.cc @@ -27,7 +27,7 @@ #include "being/actorsprite.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" #include "gui/theme.h" diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc index 4752eaa53..3d9983d7e 100644 --- a/src/utils/xmlutils_unittest.cc +++ b/src/utils/xmlutils_unittest.cc @@ -26,7 +26,7 @@ #include "being/actorsprite.h" -#include "fs/virtfs/virtfs.h" +#include "fs/virtfs/fs.h" #include "gui/gui.h" -- cgit v1.2.3-70-g09d2