X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffilecache.h;h=a913a06ac3e60ed6e62578718478f54b7219bb80;hb=58e6d25e033c76dc91aaac18fdeda92ac23fe0e1;hp=35ae9aa7d5774bfe8f40fa4e47581549ca664a1a;hpb=4bf5065a9cdaf55a6915e647e9b5de5281d6622f;p=oweals%2Fminetest.git diff --git a/src/filecache.h b/src/filecache.h index 35ae9aa7d..a913a06ac 100644 --- a/src/filecache.h +++ b/src/filecache.h @@ -1,19 +1,19 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola -Copyright (C) 2012 Jonathan Neuschäfer +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola +Copyright (C) 2013 Jonathan Neuschäfer 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 +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 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. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser 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. */ @@ -34,46 +34,14 @@ public: m_dir(dir) { } - - /* - Searches the cache for a file with a given name. - If the file is found, lookup copies it into 'os' and - returns true. Otherwise false is returned. - */ - bool loadByName(const std::string &name, std::ostream &os); - - /* - Stores a file in the cache based on its name. - Returns true on success, false otherwise. - */ - bool updateByName(const std::string &name, const std::string &data); - - /* - Loads a file based on a check sum, which may be any kind of - rather unique byte sequence. Returns true, if the file could - be written into os, false otherwise. - A file name is required to give the disk file a name that - has the right file name extension (e.g. ".png"). - */ - bool loadByChecksum(const std::string &name, std::ostream &os, - const std::string &checksum); - - /* - Stores a file in the cache based on its checksum. - Returns true on success, false otherwise. - */ - bool updateByChecksum(const std::string &name, const std::string &data, - const std::string &checksum); - + + bool update(const std::string &name, const std::string &data); + bool load(const std::string &name, std::ostream &os); private: std::string m_dir; - bool loadByPath(const std::string &name, std::ostream &os, - const std::string &path); - bool updateByPath(const std::string &name, const std::string &data, - const std::string &path); - std::string getPathFromChecksum(const std::string &name, - const std::string &checksum); + bool loadByPath(const std::string &path, std::ostream &os); + bool updateByPath(const std::string &path, const std::string &data); }; #endif