juk3n/fluffy · 770783e

⑂ 770783e

refactored

juk3n committed 2024-07-03T18:30:07+02:00 Browse files

770783e parent: b2c785e

modified app/include/database.hpp +16 -13 Viewed

@@ -8,19 +8,26 @@
8	8	class Database
9	9	{
10	10	private:
	11	+ sqlite3 *database;
	12	+
11	13	std::string database_initialization_command =
12	14	"CREATE TABLE games("
13	15	"GAME_ID INTEGER PRIMARY KEY AUTOINCREMENT, "
14	16	"GAME_NAME TEXT NOT NULL, "
15	17	"GAME_PATH TEXT NOT NULL);";
16		-public:
17		- sqlite3 *database;
18	18	std::string select_all_games_command = "SELECT * FROM games;";
19	19
	20	+ auto initializeDatabase() -> void {
	21	+ executeSqlCommand(database_initialization_command);
	22	+ //printMessage("Database Initialized");
	23	+ }
	24	+
	25	+public:
	26	+ bool successfullyCreated{ true };
	27	+
20	28	Database(std::filesystem::path databasePath) {
21		- database = loadDatabase(databasePath);
	29	+ loadDatabase(databasePath);
22	30	}
23		- Database() = default;
24	31
25	32	~Database() {
26	33	sqlite3_close(database);
@@ -34,15 +41,13 @@ public:
34	41	if (exit != SQLITE_OK) {
35	42	//printMessage("Error with command: " + command + " " + messageError);
36	43	sqlite3_free(messageError);
	44	+ successfullyCreated = false;
37	45	}
38	46	}
39	47
40		- auto initializeDatabase() -> void {
41		- executeSqlCommand(database_initialization_command);
42		- //printMessage("Database Initialized");
43		- }
44	48
45		- auto loadDatabase(std::filesystem::path databasePath) -> sqlite3* {
	49	+
	50	+ auto loadDatabase(std::filesystem::path databasePath) -> void {
46	51	bool newCreation = not std::filesystem::exists(databasePath.string());
47	52
48	53	int exit = 0;
@@ -51,7 +56,7 @@ public:
51	56	if (exit) {
52	57	std::cerr << "Error opening database" << sqlite3_errmsg(database)
53	58	<< std::endl;
54		- return nullptr;
	59	+ successfullyCreated = false;
55	60	}
56	61
57	62	//printMessage("Opened database successfully!");
@@ -59,10 +64,9 @@ public:
59	64	if (newCreation) {
60	65	initializeDatabase();
61	66	}
62		- return database;
63	67	}
64	68
65		- auto gettingData() -> std::vector<Game> {
	69	+ auto getGames() -> std::vector<Game> {
66	70	sqlite3_stmt *stmt;
67	71	int exit = 0;
68	72	exit = sqlite3_prepare_v2(database, select_all_games_command.c_str(), -1, &stmt, nullptr);
@@ -85,6 +89,5 @@ public:
85	89	}
86	90	sqlite3_finalize(stmt);
87	91	return games;
88		-
89	92	}
90	93	};

  class Database
  {
  private:
++    sqlite3 *database;
++
      std::string database_initialization_command =
          "CREATE TABLE games("
          "GAME_ID INTEGER PRIMARY KEY AUTOINCREMENT, "
          "GAME_NAME TEXT NOT NULL, "
          "GAME_PATH TEXT NOT NULL);";
--public:
--    sqlite3 *database;
      std::string select_all_games_command = "SELECT * FROM games;";
++    auto initializeDatabase() -> void {
++        executeSqlCommand(database_initialization_command);
++        //printMessage("Database Initialized");
++    }
++
++public:
++    bool successfullyCreated{ true };
++
      Database(std::filesystem::path databasePath) {
--        database = loadDatabase(databasePath);
++        loadDatabase(databasePath);
      }
--    Database() = default;
      ~Database() {
          sqlite3_close(database);
          if (exit != SQLITE_OK) {
              //printMessage("Error with command: " + command + " " + messageError);
              sqlite3_free(messageError);
++            successfullyCreated = false;
          }
      }
--    auto initializeDatabase() -> void {
--        executeSqlCommand(database_initialization_command);
--        //printMessage("Database Initialized");
--    }
--    auto loadDatabase(std::filesystem::path databasePath) -> sqlite3* {
++
++    auto loadDatabase(std::filesystem::path databasePath) -> void {
          bool newCreation = not std::filesystem::exists(databasePath.string());
          int exit = 0;
          if (exit) {
              std::cerr << "Error opening database" << sqlite3_errmsg(database)
                      << std::endl;
--            return nullptr;
++            successfullyCreated = false;
          }
          //printMessage("Opened database successfully!");
          if (newCreation) {
              initializeDatabase();
          }
--        return database;
      }
--    auto gettingData() -> std::vector<Game> {
++    auto getGames() -> std::vector<Game> {
          sqlite3_stmt *stmt;
          int exit = 0;
          exit = sqlite3_prepare_v2(database, select_all_games_command.c_str(), -1, &stmt, nullptr);
          }
          sqlite3_finalize(stmt);
          return games;
--
      }
  };

modified app/src/main.cpp +2 -3 Viewed

@@ -157,10 +157,9 @@ auto main(int argc, char const *argv[]) -> int {
157	157	auto databasePath{ std::filesystem::path(getExecutablePath().parent_path().string() + "/data.db")};
158	158	Database database{databasePath};
159	159
160		- if (!database.database) return EXIT_FAILURE;
161		-
162		- games = database.gettingData();
	160	+ if (!database.successfullyCreated) return EXIT_FAILURE;
163	161
	162	+ games = database.getGames();
164	163
165	164	if (argc > 1) {
166	165	handleCommand(argc, argv, database);

    auto databasePath{ std::filesystem::path(getExecutablePath().parent_path().string() + "/data.db")};
    Database database{databasePath};
--  if (!database.database) return EXIT_FAILURE;
++  if (!database.successfullyCreated) return EXIT_FAILURE;
--
--  games = database.gettingData();
++  games = database.getGames();
    if (argc > 1) {
      handleCommand(argc, argv, database);