Skip to content

Update DB interaction to use new Qx::Sql-based libfp implementation #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oblivioncth merged 1 commit into from
Oct 13, 2025
Merged

Update DB interaction to use new Qx::Sql-based libfp implementation #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ set(CLIFP_QX_COMPONENTS
Io
Network
Widgets
Sql
)

if(CMAKE_SYSTEM_NAME STREQUAL Windows)
Expand All @@ -77,14 +78,14 @@ endif()

include(OB/FetchQx)
ob_fetch_qx(
REF "v0.6.2"
REF "f6d47a2d8b328dec8ba5ad70d9c282aa15d77af6"
COMPONENTS
${CLIFP_QX_COMPONENTS}
)

# Fetch libfp (build and import from source)
include(OB/Fetchlibfp)
ob_fetch_libfp("107a1286d257822f5b3ae44b6b5f3a9adc6b23b0")
ob_fetch_libfp("037153fb5c4b59d5cda97be31e6f06e5bda5a920")

# Fetch QI-QMP (build and import from source)
include(OB/FetchQI-QMP)
Expand Down
18 changes: 9 additions & 9 deletions lib/backend/src/command/c-link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Unit Include
#include "c-link.h"

// Qx Includes
#include <qx/utility/qx-helpers.h>

// libfp Includes
#include <fp/fp-install.h>

Expand Down Expand Up @@ -70,25 +73,22 @@ Qx::Error CLink::perform()
return dbError;
}

if(std::holds_alternative<Fp::Game>(entry_v))
if(entry_v.holdsGame())
{
Fp::Game game = std::get<Fp::Game>(entry_v);
const auto& game = entry_v.getGame();
shortcutName = game.title();
}
else if(std::holds_alternative<Fp::AddApp>(entry_v))
else if(entry_v.holdsAddApp())
{
Fp::AddApp addApp = std::get<Fp::AddApp>(entry_v);
const auto& addApp = entry_v.getAddApp();;

// Get parent info
dbError = database->getEntry(entry_v, addApp.parentId());
if(dbError.isValid())
Fp::Game parent;
if(dbError = database->getGame(parent, addApp.parentGameId()); dbError.isValid())
{
postDirective<DError>(dbError);
return dbError;
}
Q_ASSERT(std::holds_alternative<Fp::Game>(entry_v));

Fp::Game parent = std::get<Fp::Game>(entry_v);
shortcutName = parent.title() + u" ("_s + addApp.name() + u")"_s;
}
else
Expand Down
80 changes: 21 additions & 59 deletions lib/backend/src/command/c-play.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,6 @@ QString CPlayError::deriveSecondary() const { return mSpecific; }
//Public:
CPlay::CPlay(Core& coreRef, const QStringList& commandLine) : TitleCommand(coreRef, commandLine) {}

//-Class Functions---------------------------------------------------------------
//Private:
Fp::AddApp CPlay::buildAdditionalApp(const Fp::Db::QueryBuffer& addAppResult)
{
// Ensure query result is additional app
assert(addAppResult.source == Fp::Db::Table_Add_App::NAME);

/* Form additional app from record
*
* Most of the descriptive fields here are not required for this app, but include them anyway in case it's later
* desired to use them for something like logging.
*/
Fp::AddApp::Builder fpAab;
fpAab.wId(addAppResult.result.value(Fp::Db::Table_Add_App::COL_ID).toString());
fpAab.wAppPath(addAppResult.result.value(Fp::Db::Table_Add_App::COL_APP_PATH).toString());
fpAab.wAutorunBefore(addAppResult.result.value(Fp::Db::Table_Add_App::COL_AUTORUN).toString());
fpAab.wLaunchCommand(addAppResult.result.value(Fp::Db::Table_Add_App::COL_LAUNCH_COMMAND).toString());
fpAab.wName(addAppResult.result.value(Fp::Db::Table_Add_App::COL_NAME).toString().remove(Qx::RegularExpression::LINE_BREAKS));
fpAab.wWaitExit(addAppResult.result.value(Fp::Db::Table_Add_App::COL_WAIT_EXIT).toString());
fpAab.wParentId(addAppResult.result.value(Fp::Db::Table_Add_App::COL_PARENT_ID).toString());

return fpAab.build();
}

//-Instance Functions-------------------------------------------------------------
//Private:
void CPlay::addExtraExecParameters(TExec* execTask, Task::Stage taskStage)
Expand Down Expand Up @@ -192,33 +168,23 @@ Qx::Error CPlay::handleEntry(const Fp::Game& game)
}

// Get game's additional apps
Fp::Db::EntryFilter addAppFilter{.type = Fp::Db::EntryType::AddApp, .parent = game.id()};

Fp::DbError addAppSearchError;
Fp::Db::QueryBuffer addAppSearchResult;

addAppSearchError = db->queryEntrys(addAppSearchResult, addAppFilter);
if(addAppSearchError.isValid())
Fp::Db::AddAppFilter aaf{.parent = game.id()};
QList<Fp::AddApp> addAppSearchResult;
if(auto err = db->searchAddApps(addAppSearchResult, aaf); err.isValid())
{
postDirective<DError>(addAppSearchError);
return addAppSearchError;
postDirective<DError>(err);
return err;
}

// Enqueue auto-run before apps
for(int i = 0; i < addAppSearchResult.size; i++)
for(const auto& aa : std::as_const(addAppSearchResult))
{
// Go to next record
addAppSearchResult.result.next();

// Build
Fp::AddApp addApp = buildAdditionalApp(addAppSearchResult);

// Enqueue if auto-run before
if(addApp.isAutorunBefore())
if(aa.isAutorunBefore())
{
logEvent(LOG_EVENT_FOUND_AUTORUN.arg(addApp.name()));
logEvent(LOG_EVENT_FOUND_AUTORUN.arg(aa.name()));

if(sError = enqueueAdditionalApp(addApp, game, Task::Stage::Auxiliary); sError.isValid())
if(sError = enqueueAdditionalApp(aa, game, Task::Stage::Auxiliary); sError.isValid())
return sError;
}
}
Expand All @@ -237,24 +203,21 @@ Qx::Error CPlay::handleEntry(const Fp::Game& game)
Qx::Error CPlay::handleEntry(const Fp::AddApp& addApp)
{
logEvent(LOG_EVENT_ID_MATCH_ADDAPP.arg(addApp.name(),
addApp.parentId().toString(QUuid::WithoutBraces)));
addApp.parentGameId().toString(QUuid::WithoutBraces)));

Qx::Error sError;
Fp::Db* db = mCore.fpInstall().database();

// Get parent info
QUuid parentId = addApp.parentId();
Fp::Entry parentEntry;
QUuid parentId = addApp.parentGameId();
Fp::Game parentGame;
Fp::GameData parentGameData;

if(Fp::DbError gdErr = db->getEntry(parentEntry, parentId); gdErr.isValid())
if(Fp::DbError gdErr = db->getGame(parentGame, parentId); gdErr.isValid())
{
postDirective<DError>(gdErr);
return gdErr;
}
Q_ASSERT(std::holds_alternative<Fp::Game>(parentEntry));
parentGame = std::get<Fp::Game>(parentEntry);

if(Fp::DbError gdErr = db->getGameData(parentGameData, parentId); gdErr.isValid())
{
Expand All @@ -269,8 +232,7 @@ Qx::Error CPlay::handleEntry(const Fp::AddApp& addApp)
QString serverOverride = getServerOverride(parentGameData);

// Enqueue services if needed
bool needsServices = addApp.appPath() != Fp::Db::Table_Add_App::ENTRY_MESSAGE && addApp.appPath() != Fp::Db::Table_Add_App::ENTRY_EXTRAS;
if(needsServices && (sError = mCore.enqueueStartupTasks(serverOverride)).isValid())
if(addApp.isPlayable() && (sError = mCore.enqueueStartupTasks(serverOverride)).isValid())
return sError;

// Handle datapack tasks
Expand All @@ -288,24 +250,24 @@ Qx::Error CPlay::handleEntry(const Fp::AddApp& addApp)
return sError;

// Enqueue service shutdown if needed
if(needsServices)
if(addApp.isPlayable())
mCore.enqueueShutdownTasks();

return Qx::Error();
}

Qx::Error CPlay::enqueueAdditionalApp(const Fp::AddApp& addApp, const Fp::Game& parent, Task::Stage taskStage)
{
if(addApp.appPath() == Fp::Db::Table_Add_App::ENTRY_MESSAGE)
if(addApp.isMessage())
{
TMessage* messageTask = new TMessage(mCore);
messageTask->setStage(taskStage);
messageTask->setText(addApp.launchCommand());
messageTask->setBlocking(addApp.isWaitExit());
messageTask->setBlocking(addApp.isWaitForExit());

mCore.enqueueSingleTask(messageTask);
}
else if(addApp.appPath() == Fp::Db::Table_Add_App::ENTRY_EXTRAS)
else if(addApp.isExtra())
{
TExtra* extraTask = new TExtra(mCore);
extraTask->setStage(taskStage);
Expand Down Expand Up @@ -351,7 +313,7 @@ Qx::Error CPlay::enqueueGame(const Fp::Game& game, const Fp::GameData& gameData,

TExec* CPlay::createStdGameExecTask(const Fp::Game& game, const Fp::GameData& gameData, Task::Stage taskStage)
{
QString gamePath = mCore.resolveFullAppPath(!gameData.isNull() ? gameData.appPath() : game.appPath(),
QString gamePath = mCore.resolveFullAppPath(!gameData.isNull() ? gameData.applicationPath() : game.applicationPath(),
game.platformName());
QFileInfo gamePathInfo(gamePath);
QString param = !gameData.isNull() ? gameData.launchCommand() : game.launchCommand();
Expand All @@ -370,7 +332,7 @@ TExec* CPlay::createStdGameExecTask(const Fp::Game& game, const Fp::GameData& ga

TExec* CPlay::createStdAddAppExecTask(const Fp::AddApp& addApp, const Fp::Game& parent, Task::Stage taskStage)
{
QString addAppPath = mCore.resolveFullAppPath(addApp.appPath(), parent.platformName());
QString addAppPath = mCore.resolveFullAppPath(addApp.applicationPath(), parent.platformName());
QFileInfo addAppPathInfo(addAppPath);
QString param = addApp.launchCommand();

Expand All @@ -381,7 +343,7 @@ TExec* CPlay::createStdAddAppExecTask(const Fp::AddApp& addApp, const Fp::Game&
addAppTask->setDirectory(addAppPathInfo.absoluteDir());
addAppTask->setParameters(param);
addAppTask->setEnvironment(mCore.childTitleProcessEnvironment());
addAppTask->setProcessType(addApp.isWaitExit() || taskStage == Task::Stage::Primary ? TExec::ProcessType::Blocking : TExec::ProcessType::Deferred);
addAppTask->setProcessType(addApp.isWaitForExit() || taskStage == Task::Stage::Primary ? TExec::ProcessType::Blocking : TExec::ProcessType::Deferred);

return addAppTask;
}
Expand Down Expand Up @@ -475,7 +437,7 @@ Qx::Error CPlay::perform()
}

// Handle entry
return std::visit([this](auto arg) { return this->handleEntry(arg); }, entry);
return entry.visit([this](auto arg) { return this->handleEntry(arg); });
}

//Public:
Expand Down
5 changes: 0 additions & 5 deletions lib/backend/src/command/c-play.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,6 @@ class CPlay : public TitleCommand
public:
CPlay(Core& coreRef, const QStringList& commandLine);

//-Class Functions------------------------------------------------------------------------------------------------------
private:
// Helper
static Fp::AddApp buildAdditionalApp(const Fp::Db::QueryBuffer& addAppResult);

//-Instance Functions------------------------------------------------------------------------------------------------------
private:
void addExtraExecParameters(TExec* execTask, Task::Stage taskStage);
Expand Down
Loading