store id in DB

This commit is contained in:
2026-02-16 23:07:22 +01:00
parent 6ff4a66551
commit 6794dada92
10 changed files with 123 additions and 12 deletions

View File

@@ -33,6 +33,7 @@ add_library(shared STATIC
shared/src/values/Similarity.cpp shared/src/values/Similarity.cpp
shared/src/TcpSocket.cpp shared/src/TcpSocket.cpp
shared/src/sql.cpp shared/src/sql.cpp
shared/src/values/DnaDB.cpp
) )
add_executable(app add_executable(app

View File

@@ -1,6 +1,7 @@
#include <array> #include <array>
#include "canvas/Canvas.hpp" #include "canvas/Canvas.hpp"
#include "DnaStore.hpp" #include "DnaStore.hpp"
class App class App
{ {

View File

@@ -2,6 +2,8 @@
namespace DnaStore namespace DnaStore
{ {
void init();
void deinit();
void load(DnaManagerData *data); void load(DnaManagerData *data);
void saveData(DnaManagerData *data); void saveData(DnaManagerData *data);
void saveVec(DnaManagerData *data); void saveVec(DnaManagerData *data);

View File

@@ -64,7 +64,7 @@ void App::init(int screenWidth, int screenHeight)
this->screenWidth = screenWidth; this->screenWidth = screenWidth;
this->screenHeight = screenHeight; this->screenHeight = screenHeight;
this->canvas.init(screenWidth); this->canvas.init(screenWidth);
DnaStore::init();
// int s = MeasureText("GEN 9999: 999/999", 20); // int s = MeasureText("GEN 9999: 999/999", 20);
// TraceLog(LOG_INFO, "%d", s); // TraceLog(LOG_INFO, "%d", s);
@@ -239,4 +239,5 @@ void App::deinit()
UnloadRenderTexture(canvasTexure[i]); UnloadRenderTexture(canvasTexure[i]);
} }
canvas.deinit(); canvas.deinit();
DnaStore::deinit();
} }

View File

@@ -9,6 +9,7 @@
#include "sys.hpp" #include "sys.hpp"
#include "DnaStore.hpp" #include "DnaStore.hpp"
#include "TcpSocket.hpp" #include "TcpSocket.hpp"
#include "values/DnaDB.hpp"
#include <raylib.h> #include <raylib.h>
@@ -17,19 +18,30 @@
#define VECTOR_FILE_NAME "VECTOR.bin" #define VECTOR_FILE_NAME "VECTOR.bin"
#define GEN_FILE_PATTRN "gen/%04d.bin" #define GEN_FILE_PATTRN "gen/%04d.bin"
#define HOST_NAME "localhost" #define HOST_NAME "localhost"
#define DB_NAME "data.db"
DnaDB dnaDB;
void DnaStore::init(){
const char* filename = sys::transformFilePath(DB_NAME);
dnaDB.init(filename);
}
void DnaStore::deinit(){
dnaDB.deinit();
}
void DnaStore::load(DnaManagerData *data) void DnaStore::load(DnaManagerData *data)
{ {
const char *dir = sys::transformFilePath("gen"); const char *dir = sys::transformFilePath("gen");
std::filesystem::create_directory(dir); std::filesystem::create_directory(dir);
if (sys::fileExists(ID_FILE_NAME))
{ std::vector<int64_t> ids = dnaDB.getUserIds();
sys::loadDataFromFile(ID_FILE_NAME, &data->id, sizeof(int64_t)); if(!ids.empty()){
} data->id = ids[0];
else }else{
{
data->id = time(nullptr); data->id = time(nullptr);
sys::saveDataToFile(ID_FILE_NAME, &data->id, sizeof(int64_t)); dnaDB.insertUser(data->id, 0);
} }
if (sys::fileExists(DATA_FILE_NAME)) if (sys::fileExists(DATA_FILE_NAME))

View File

@@ -33,7 +33,7 @@ constexpr char DB_NAME[] = "data.db";
struct sqlite3; struct sqlite3;
struct sqlite3_stmt; struct sqlite3_stmt;
#define SQLITE_ROW 100 /* sqlite3_step() has another row ready */ #define SQLITE_ROW 100 /* sqlite3_step() has another row ready */
#define SQL_DONE 101 #define SQL_DONE 101
#define SQL_NULL 5 #define SQL_NULL 5
#define SQLITE_OK 0 #define SQLITE_OK 0
@@ -44,6 +44,7 @@ namespace sql
void init(); void init();
void shutdown(); void shutdown();
int open(const char *filename, sqlite3 **ppDb); int open(const char *filename, sqlite3 **ppDb);
int exec(sqlite3 *db, const char *sql, int (*callback)(void *, int, char **, char **), void *first_arg, char **errmsg);
int prepare_v2(sqlite3 *db, const char *zSql, int nByte, sqlite3_stmt **pStmt, const char **pzTail); int prepare_v2(sqlite3 *db, const char *zSql, int nByte, sqlite3_stmt **pStmt, const char **pzTail);
int bind_int64(sqlite3_stmt *pStmt, int column, int64_t value); int bind_int64(sqlite3_stmt *pStmt, int column, int64_t value);
int step(sqlite3_stmt *pStmt); int step(sqlite3_stmt *pStmt);

View File

@@ -0,0 +1,20 @@
#include <cinttypes>
#include <vector>
struct sqlite3;
class DnaDB
{
sqlite3 *db;
public:
void init(const char *db_name = "data.db");
void deinit();
std::vector<int64_t> getUserIds();
int insertUser(int64_t id, int64_t max_gen);
int updateUser(int64_t id, int64_t max_gen);
void getGenerations();
void getLikesForGeneration();
void getVectorForGeneration();
};

View File

@@ -7,9 +7,9 @@
enum Liked enum Liked
{ {
tbd, tbd = 0,
yes, yes = 1,
no no = 2,
}; };
struct UiUnit struct UiUnit

View File

@@ -78,6 +78,10 @@ namespace sql
{ {
return sqlite3_open(filename, ppDb); return sqlite3_open(filename, ppDb);
} }
int exec(sqlite3 *db, const char *sql, int (*callback)(void *, int, char **, char **), void *first, char **errmsg)
{
return sqlite3_exec(db, sql, callback, first, errmsg);
}
int prepare_v2(sqlite3 *db, const char *zSql, int nByte, sqlite3_stmt **pStmt, const char **pzTail) int prepare_v2(sqlite3 *db, const char *zSql, int nByte, sqlite3_stmt **pStmt, const char **pzTail)
{ {
return sqlite3_prepare_v2(db, zSql, nByte, pStmt, pzTail); return sqlite3_prepare_v2(db, zSql, nByte, pStmt, pzTail);

View File

@@ -0,0 +1,69 @@
#include "values/DnaDB.hpp"
#include <sql.hpp>
void DnaDB::init(const char * db_name)
{
sql::init();
int res = sql::open(db_name, &db);
constexpr char create_user_table[] = "CREATE TABLE IF NOT EXISTS user_table ( ID INTEGER PRIMARY KEY, USER_ID INTEGER, MAX_GENERATION INTEGER);";
res = sql::exec(db, create_user_table, nullptr, nullptr, nullptr);
}
void DnaDB::deinit()
{
sql::close(db);
sql::shutdown();
}
std::vector<int64_t> DnaDB::getUserIds()
{
constexpr char sql[] = "SELECT USER_ID FROM user_table;";
sqlite3_stmt *stmt;
sql::prepare_v2(db, sql, -1, &stmt, nullptr);
std::vector<int64_t> ids;
while (sql::step(stmt) != SQL_DONE)
{
int64_t id = sql::column_int64(stmt, 0);
ids.push_back(id);
}
sql::finalize(stmt);
return ids;
}
int DnaDB::insertUser(int64_t id, int64_t max_gen){
constexpr char sql[] = "INSERT INTO user_table (USER_ID, MAX_GENERATION) VALUES (?,?);";
sqlite3_stmt *stmt;
sql::prepare_v2(db, sql, -1, &stmt, nullptr);
sql::bind_int64(stmt, 1, id);
sql::bind_int64(stmt, 2, max_gen);
int ret = sql::step(stmt);
sql::finalize(stmt);
return ret;
}
int DnaDB::updateUser(int64_t id, int64_t max_gen){
constexpr char sql[] = "UPDATE user_table SET MAX_GENERATION = ? WHERE USER_ID = ?;";
sqlite3_stmt *stmt;
sql::prepare_v2(db, sql, -1, &stmt, nullptr);
sql::bind_int64(stmt, 1, max_gen);
sql::bind_int64(stmt, 2, id);
int ret = sql::step(stmt);
sql::finalize(stmt);
return ret;
}
void DnaDB::getGenerations()
{
}
void DnaDB::getLikesForGeneration()
{
}
void DnaDB::getVectorForGeneration()
{
}