projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make getters of the Settings class const
[oweals/minetest.git]
/
src
/
filecache.cpp
diff --git
a/src/filecache.cpp
b/src/filecache.cpp
index 5ba8ef5cce6404debba6bfa6e93a397c76bfd3a2..33677cc8379a2984312b613f9ec9edeb03da237d 100644
(file)
--- a/
src/filecache.cpp
+++ b/
src/filecache.cpp
@@
-1,32
+1,32
@@
/*
/*
-Minetest
-c55
-Copyright (C) 201
0
celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 201
2
Jonathan Neuschäfer <j.neuschaefer@gmx.net>
+Minetest
+Copyright (C) 201
3
celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 201
3
Jonathan Neuschäfer <j.neuschaefer@gmx.net>
This program is free software; you can redistribute it and/or modify
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
(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.
*/
#include "filecache.h"
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "filecache.h"
+
#include "clientserver.h"
#include "log.h"
#include "filesys.h"
#include "clientserver.h"
#include "log.h"
#include "filesys.h"
-#include "utility.h"
-#include "hex.h"
-
#include <string>
#include <iostream>
#include <string>
#include <iostream>
+#include <fstream>
+#include <stdlib.h>
bool FileCache::loadByPath(const std::string &path, std::ostream &os)
{
bool FileCache::loadByPath(const std::string &path, std::ostream &os)
{
@@
-34,7
+34,7
@@
bool FileCache::loadByPath(const std::string &path, std::ostream &os)
if(!fis.good()){
verbosestream<<"FileCache: File not found in cache: "
if(!fis.good()){
verbosestream<<"FileCache: File not found in cache: "
- <<path<<std::endl;
+
<<path<<std::endl;
return false;
}
return false;
}
@@
-53,7
+53,7
@@
bool FileCache::loadByPath(const std::string &path, std::ostream &os)
}
if(bad){
errorstream<<"FileCache: Failed to read file from cache: \""
}
if(bad){
errorstream<<"FileCache: Failed to read file from cache: \""
- <<path<<"\""<<std::endl;
+
<<path<<"\""<<std::endl;
}
return !bad;
}
return !bad;
@@
-67,7
+67,7
@@
bool FileCache::updateByPath(const std::string &path, const std::string &data)
if(!file.good())
{
errorstream<<"FileCache: Can't write to file at "
if(!file.good())
{
errorstream<<"FileCache: Can't write to file at "
- <<path<<std::endl;
+
<<path<<std::endl;
return false;
}
return false;
}
@@
-77,34
+77,13
@@
bool FileCache::updateByPath(const std::string &path, const std::string &data)
return !file.fail();
}
return !file.fail();
}
-bool FileCache::loadByName(const std::string &name, std::ostream &os)
-{
- std::string path = m_dir + DIR_DELIM + name;
- return loadByPath(path, os);
-}
-
-
-bool FileCache::updateByName(const std::string &name, const std::string &data)
+bool FileCache::update(const std::string &name, const std::string &data)
{
std::string path = m_dir + DIR_DELIM + name;
return updateByPath(path, data);
}
{
std::string path = m_dir + DIR_DELIM + name;
return updateByPath(path, data);
}
-
-std::string FileCache::getPathFromChecksum(const std::string &checksum)
+bool FileCache::load(const std::string &name, std::ostream &os)
{
{
- std::string checksum_hex = hex_encode(checksum.c_str(), checksum.length());
- return m_dir + DIR_DELIM + checksum_hex;
-}
-
-bool FileCache::loadByChecksum(const std::string &checksum, std::ostream &os)
-{
- std::string path = getPathFromChecksum(checksum);
+ std::string path = m_dir + DIR_DELIM + name;
return loadByPath(path, os);
}
return loadByPath(path, os);
}
-
-bool FileCache::updateByChecksum(const std::string &checksum,
- const std::string &data)
-{
- std::string path = getPathFromChecksum(checksum);
- return updateByPath(path, data);
-}