Cleaned up Resource and User.

core/resource.cpp

@@ -1,101 +1,5 @@
 #include "resource.h"
 
-#include <vector>
-
-#include "rapidjson/rapidjson.h"
-#include <tinydir/tinydir.h>
-#include <cstdio>
-
-#if DATABASES_ENABLED
-#include "core/database/database.h"
-#include "core/database/database_manager.h"
-#endif
-
-void Resource::changed() {
-	dirty = true;
-}
-
-void Resource::save() {
-#if DATABASES_ENABLED
-	sql_save();
-#else
-	file_save();
-#endif
-}
-void Resource::load() {
-#if DATABASES_ENABLED
-	sql_load();
-#else
-	file_load();
-#endif
-}
-void Resource::migrate() {
-#if DATABASES_ENABLED
-	//todo!
-
-	sql_delete_tables();
-	sql_create_tables();
-
-	//sql_migrate();
-#else
-	file_ensure_directory_exist();
-#endif
-}
-
-#if DATABASES_ENABLED
-void Resource::sql_save() {
-	sql_save(DatabaseManager::get_singleton()->ddb);
-}
-void Resource::sql_load() {
-	sql_load(DatabaseManager::get_singleton()->ddb);
-}
-void Resource::sql_migrate() {
-	sql_migrate(DatabaseManager::get_singleton()->ddb);
-}
-void Resource::sql_create_tables() {
-	sql_create_tables(DatabaseManager::get_singleton()->ddb);
-}
-void Resource::sql_delete_tables() {
-	sql_delete_tables(DatabaseManager::get_singleton()->ddb);
-}
-
-void Resource::sql_save(Database *db) {
-}
-void Resource::sql_load(Database *db) {
-}
-void Resource::sql_migrate(Database *db) {
-}
-void Resource::sql_create_tables(Database *db) {
-}
-void Resource::sql_delete_tables(Database *db) {
-}
-#endif
-
-void Resource::file_save() {
-	/*
-	//todo sanitize name!
-	_file_path =  _resource_name + get_id();
-
-
-	FILE *fp = fopen(_file_path.c_str(), "w");
-
-	char writeBuffer[65536];
-	rapidjson::FileWriteStream os(fp, writeBuffer, sizeof(writeBuffer));
-
-	rapidjson::Writer<rapidjson::FileWriteStream> writer(os);
-	document.Accept(writer);
-
-	fclose(fp);
-	*/
-}
-void Resource::file_load() {
-}
-void Resource::file_ensure_directory_exist() {
-}
-std::string Resource::file_get_base_path() {
-	return "./resources/";
-}
-
 std::string Resource::to_json(rapidjson::Document *into) {
 	return "";
 }
@@ -105,8 +9,6 @@ void Resource::from_json(const std::string &data) {
 Resource::Resource() :
 		Reference() {
 	id = 0;
-	dirty = false;
-	resource_name = get_class();
 }
 
 Resource::~Resource() {

core/resource.h

@@ -1,12 +1,9 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#include <functional>
-#include <map>
 #include <string>
 
 #include "reference.h"
-
 #include "rapidjson/document.h"
 
 #if DATABASES_ENABLED
@@ -18,33 +15,6 @@ class Resource : public Reference {
 
 public:
 	int id;
-	bool dirty;
-	std::string resource_name;
-
-	void changed();
-
-	virtual void save();
-	virtual void load();
-	virtual void migrate();
-
-#if DATABASES_ENABLED
-	virtual void sql_save();
-	virtual void sql_load();
-	virtual void sql_migrate();
-	virtual void sql_create_tables();
-	virtual void sql_delete_tables();
-
-	virtual void sql_save(Database *db);
-	virtual void sql_load(Database *db);
-	virtual void sql_migrate(Database *db);
-	virtual void sql_create_tables(Database *db);
-	virtual void sql_delete_tables(Database *db);
-#endif
-
-	virtual void file_save();
-	virtual void file_load();
-	virtual void file_ensure_directory_exist();
-	virtual std::string file_get_base_path();
 
 	virtual std::string to_json(rapidjson::Document *into = nullptr);
 	virtual void from_json(const std::string &data);

modules/users/user.cpp

@@ -22,79 +22,6 @@
 #include "core/utils.h"
 #include "user_model.h"
 
-void User::file_save() {
-}
-void User::file_load() {
-	FILE *f = fopen(_file_path.c_str(), "r");
-
-	if (!f) {
-		printf("FileBasedUser::load: Error opening file! %s\n", _file_path.c_str());
-		return;
-	}
-
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET); // same as rewind(f);
-
-	std::string fd;
-	fd.resize(fsize);
-
-	fread(&fd[0], 1, fsize, f);
-	fclose(f);
-
-	from_json(fd);
-}
-void User::file_ensure_directory_exist() {
-}
-std::string User::file_get_base_path() {
-	return _path;
-}
-
-void User::file_load_all() {
-	/*
-	tinydir_dir dir;
-	if (tinydir_open(&dir, _path.c_str()) == -1) {
-		return;
-	}
-
-	while (dir.has_next) {
-		tinydir_file file;
-		if (tinydir_readfile(&dir, &file) == -1) {
-			tinydir_next(&dir);
-			continue;
-		}
-
-		if (!file.is_dir) {
-			std::string np = file.path;
-			np = np.substr(_path.size(), np.size() - _path.size());
-
-			User *u = new User();
-			u->load(np);
-
-			UserManager::get_singleton()->add_user(u);
-		}
-
-		tinydir_next(&dir);
-	}
-
-	tinydir_close(&dir);
-	*/
-}
-
-std::string User::file_get_path() {
-	return _path;
-}
-
-void User::file_set_path(const std::string &path) {
-	_path = path;
-
-	if (_path.size() > 0) {
-		if (_path[_path.size() - 1] != '/') {
-			_path += '/';
-		}
-	}
-}
-
 std::string User::to_json(rapidjson::Document *into) {
 	rapidjson::Document *document;
 
@@ -132,6 +59,7 @@ std::string User::to_json(rapidjson::Document *into) {
 
 	return s;
 }
+
 void User::from_json(const std::string &p_data) {
 
 	rapidjson::Document data;
@@ -162,6 +90,3 @@ User::User() :
 
 User::~User() {
 }
-
-std::string User::_path = "./";
-std::string User::_table_name = "users";

modules/users/user.h

@@ -36,12 +36,6 @@ public:
 
 	User();
 	~User();
-
-protected:
-	std::string _file_path;
-
-	static std::string _path;
-	static std::string _table_name;
 };
 
 #endif