files module update

src/files/WorldFiles.cpp

@@ -224,12 +224,12 @@ void WorldFiles::writePlayer(Player* player){
 	dst[offset++] = player->flight * PLAYER_FLAG_FLIGHT |
 					player->noclip * PLAYER_FLAG_NOCLIP;
 
-	write_binary_file(getPlayerFile(), (const char*)dst, sizeof(dst));
+	files::write_binary_file(getPlayerFile(), (const char*)dst, sizeof(dst));
 }
 
 bool WorldFiles::readPlayer(Player* player) {
 	size_t length = 0;
-	ubyte* data = (ubyte*)read_binary_file(getPlayerFile(), length);
+	ubyte* data = (ubyte*)files::read_binary_file(getPlayerFile(), length);
 	if (data == nullptr){
 		std::cerr << "could not to read player.bin (ignored)" << std::endl;
 		return false;

src/files/files.cpp

@@ -5,17 +5,14 @@
 #include <memory>
 #include <stdint.h>
 
-bool write_binary_file_part(std::string filename, const char* data, size_t offset, size_t size){
+using std::ios;
-	std::ofstream output(filename, std::ios::out | std::ios::binary | std::ios::in);
+using std::string;
-	if (!output.is_open())
+using std::unique_ptr;
-		return false;
+using std::ifstream;
-	output.seekp(offset);
+using std::ofstream;
-	output.write(data, size);
-	return true;
-}
 
-bool write_binary_file(std::string filename, const char* data, size_t size) {
+bool files::write_binary_file(string filename, const char* data, size_t size) {
-	std::ofstream output(filename, std::ios::binary);
+	ofstream output(filename, ios::binary);
 	if (!output.is_open())
 		return false;
 	output.write(data, size);
@@ -23,8 +20,8 @@ bool write_binary_file(std::string filename, const char* data, size_t size) {
 	return true;
 }
 
-unsigned int append_binary_file(std::string filename, const char* data, size_t size) {
+unsigned int files::append_binary_file(string filename, const char* data, size_t size) {
-	std::ofstream output(filename, std::ios::binary | std::ios::app);
+	ofstream output(filename, ios::binary | ios::app);
 	if (!output.is_open())
 		return 0;
 	unsigned int position = output.tellp();
@@ -33,8 +30,8 @@ unsigned int append_binary_file(std::string filename, const char* data, size_t s
 	return position;
 }
 
-bool read_binary_file(std::string filename, char* data, size_t size) {
+bool files::read_binary_file(string filename, char* data, size_t size) {
-	std::ifstream output(filename, std::ios::binary);
+	ifstream output(filename, ios::binary);
 	if (!output.is_open())
 		return false;
 	output.read(data, size);
@@ -42,16 +39,31 @@ bool read_binary_file(std::string filename, char* data, size_t size) {
 	return true;
 }
 
-char* read_binary_file(std::string filename, size_t& length) {
+char* files::read_binary_file(string filename, size_t& length) {
-	std::ifstream input(filename, std::ios::binary);
+	ifstream input(filename, ios::binary);
 	if (!input.is_open())
 		return nullptr;
 	input.seekg(0, std::ios_base::end);
 	length = input.tellg();
 	input.seekg(0, std::ios_base::beg);
 
-	std::unique_ptr<char> data {new char[length]};
+	unique_ptr<char> data {new char[length]};
 	input.read(data.get(), length);
 	input.close();
 	return data.release();
 }
+
+std::string files::read_string(string filename) {
+	size_t size;
+	unique_ptr<char> chars (read_binary_file(filename, size));
+	return string(chars.get(), size);
+}
+
+bool files::write_string(string filename, const string content) {
+	ofstream file(filename);
+	if (!file) {
+		return false;
+	}
+	file << content;
+	return true;
+}

src/files/files.h

@@ -4,9 +4,13 @@
 #include <string>
 #include "../typedefs.h"
 
-extern bool write_binary_file(std::string filename, const char* data, size_t size);
+namespace files {
-extern unsigned int append_binary_file(std::string filename, const char* data, size_t size);
+    extern bool write_binary_file(std::string filename, const char* data, size_t size);
-extern bool read_binary_file(std::string filename, char* data, size_t size);
+    extern unsigned int append_binary_file(std::string filename, const char* data, size_t size);
-extern char* read_binary_file(std::string filename, size_t& length);
+    extern bool read_binary_file(std::string filename, char* data, size_t size);
+    extern char* read_binary_file(std::string filename, size_t& length);
+    extern std::string read_string(std::string filename);
+    extern bool write_string(std::string filename, const std::string content);
+}
 
 #endif /* FILES_FILES_H_ */