From 8c5b572fda27f429803ee8182936343ee6425d34 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Fri, 11 Aug 2023 21:17:27 -0400 Subject: [PATCH 1/6] Note that FP needs to be ran at least once --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ad87e06..59d5004 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,8 @@ It is recommended to place CLIFp in the root directory of Flashpoint (next to it **In most cases you should use the 'static' builds of CLIFp on Windows or Linux.** ### General +**Before using CLIFp, be sure to have ran Flashpoint through its regular launcher at least once** + **NOTE: Do not run CLIFp as an administrator/root as some titles may not work correctly or run at all** CLIFp uses the following syntax scheme: From 2e3f23e8e7db1ff25333a072bd2484c0a4518a6c Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sat, 9 Sep 2023 13:30:52 -0400 Subject: [PATCH 2/6] Fix FP install search log message --- app/src/kernel/driver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/kernel/driver.h b/app/src/kernel/driver.h index ec7c39c..423ecb8 100644 --- a/app/src/kernel/driver.h +++ b/app/src/kernel/driver.h @@ -70,8 +70,8 @@ class Driver : public QObject // Logging static inline const QString LOG_EVENT_FLASHPOINT_SEARCH = u"Searching for Flashpoint root..."_s; - static inline const QString LOG_EVENT_FLASHPOINT_ROOT_CHECK = uR"(Checking if u"%1"_s is flashpoint root)"_s; - static inline const QString LOG_EVENT_FLASHPOINT_LINK = uR"(Linked to Flashpoint install at: u"%1"_s)"_s; + static inline const QString LOG_EVENT_FLASHPOINT_ROOT_CHECK = uR"(Checking if "%1" is flashpoint root)"_s; + static inline const QString LOG_EVENT_FLASHPOINT_LINK = uR"(Linked to Flashpoint install at: "%1")"_s; static inline const QString LOG_EVENT_TASK_COUNT = u"%1 task(s) to perform"_s; static inline const QString LOG_EVENT_QUEUE_START = u"Processing Task queue"_s; static inline const QString LOG_EVENT_TASK_START = u"Handling task %1 [%2] (%3)"_s; From 201ef9a9cf6d646ead6de751125dd2473dbb17d1 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sat, 9 Sep 2023 13:53:23 -0400 Subject: [PATCH 3/6] Fix wrong error message when FP launcher is running --- app/src/kernel/driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/kernel/driver.cpp b/app/src/kernel/driver.cpp index 81a2616..c851d40 100644 --- a/app/src/kernel/driver.cpp +++ b/app/src/kernel/driver.cpp @@ -231,7 +231,7 @@ void Driver::drive() // Ensure Flashpoint Launcher isn't running if(Qx::processIsRunning(Fp::Install::LAUNCHER_NAME)) { - DriverError err(DriverError::AlreadyOpen, ERR_LAUNCHER_RUNNING_TIP); + DriverError err(DriverError::LauncherRunning, ERR_LAUNCHER_RUNNING_TIP); mCore->postError(NAME, err); mErrorStatus = err; finish(); From f17ed413b553a6d3a5c24f2d90ed737ace5353ff Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sat, 9 Sep 2023 13:36:53 -0400 Subject: [PATCH 4/6] Update deps, allows use of un-updated FP12 Handles missing JSON key (onDemandImagesCompressed) from a fresh download of FP12 since that value was added later. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bde959..96be32b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,14 +72,14 @@ endif() include(OB/FetchQx) ob_fetch_qx( - REF "v0.5.1" + REF "v0.5.3" COMPONENTS ${CLIFP_QX_COMPONENTS} ) # Fetch libfp (build and import from source) include(OB/Fetchlibfp) -ob_fetch_libfp("v0.4") +ob_fetch_libfp("v0.4.2.2") # Fetch QI-QMP (build and import from source) include(OB/FetchQI-QMP) From 75211cab2c8d1dbdc1158150642b8fb3de3bfe9d Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sat, 9 Sep 2023 14:05:29 -0400 Subject: [PATCH 5/6] Note that FP Infinity should be fully updated before use --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59d5004..c619c93 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ It is recommended to place CLIFp in the root directory of Flashpoint (next to it **In most cases you should use the 'static' builds of CLIFp on Windows or Linux.** ### General -**Before using CLIFp, be sure to have ran Flashpoint through its regular launcher at least once** +**Before using CLIFp, be sure to have ran Flashpoint through its regular launcher at least once. If using Infinity, it's also best to make sure your install is fully updated as well.** **NOTE: Do not run CLIFp as an administrator/root as some titles may not work correctly or run at all** From da52568b77aab9023b07cbd634a7766c11b267f0 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sat, 9 Sep 2023 14:08:44 -0400 Subject: [PATCH 6/6] Bump --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96be32b..daef5f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24.0...3.26.0) # Project # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS project(CLIFp - VERSION 0.9.5 + VERSION 0.9.6 LANGUAGES CXX DESCRIPTION "Command-line Interface for Flashpoint Archive" )