Refactor downloads path to asyn;, Improve settings safety; Fixes: GeoDB reads bug, CI products version control

Author: hoshiizumiya

.github/workflows/canary.yml

@@ -154,6 +154,7 @@ jobs:
             /p:GenerateAppxPackageOnBuild=true `
             /p:UapAppxPackageBuildMode=SideloadOnly `
             /p:AppxPackageDir=AppPackages\ `
+            /p:AppxPackageVersion=1.0.${{ needs.build.outputs.date }}.${{ github.run_number }}
             /p:AppxPackageSigningEnabled=true `
             /p:PackageCertificateThumbprint="${{ steps.import_cert.outputs.thumbprint }}" `
             /p:PackageCertificateKeyFile= `
@@ -210,10 +211,9 @@ jobs:
   prerelease:
     needs: build
     runs-on: ubuntu-latest
-    if: >
-      github.ref == 'refs/heads/develop' &&
-      (github.event_name == 'push' ||
-      (github.event_name == 'workflow_dispatch' && inputs.publish_prerelease == true))
+    if: |
+      github.ref == 'refs/heads/master' &&
+      github.event_name == 'push'
 
     steps:
       - name: Download build artifact
@@ -234,6 +234,9 @@ jobs:
           generateReleaseNotes: true
           body: |
             Auto-updated canary package.
+            Date: ${{ needs.build.outputs.date }}
             Branch: ${{ github.ref_name }}
             Commit: ${{ github.sha }}
-            Date: ${{ needs.build.outputs.date }}
+
+            Trigger: ${{ github.event_name }}
+            Actor: ${{ github.actor }}

OpenNet/Core/AppSettingsDatabase.cpp

@@ -160,8 +160,14 @@ namespace OpenNet::Core
 	{
 		auto str = GetString(category, key);
 		if (!str) return std::nullopt;
-		try { return std::stoll(*str); }
-		catch (...) { return std::nullopt; }
+		try
+		{
+			return std::stoll(*str);
+		}
+		catch (...)
+		{
+			return std::nullopt;
+		}
 	}
 
 	void AppSettingsDatabase::SetDouble(std::string const& category,
@@ -179,8 +185,14 @@ namespace OpenNet::Core
 	{
 		auto str = GetString(category, key);
 		if (!str) return std::nullopt;
-		try { return std::stod(*str); }
-		catch (...) { return std::nullopt; }
+		try
+		{
+			return std::stod(*str);
+		}
+		catch (...)
+		{
+			return std::nullopt;
+		}
 	}
 
 	void AppSettingsDatabase::SetBool(std::string const& category,
@@ -331,15 +343,15 @@ namespace OpenNet::Core
 		}
 	}
 
-	std::optional<std::wstring_view> AppSettingsDatabase::GetStringW(std::string const& category,
+	std::optional<std::wstring> AppSettingsDatabase::GetStringW(std::string const& category,
 																	 std::string const& key) const
 	{
 		std::lock_guard lk(m_mutex);
 		if (!m_db && !const_cast<AppSettingsDatabase*>(this)->EnsureInitialized()) return std::nullopt;
 
 		const char* sql = "SELECT value FROM settings WHERE category = ? AND key = ?;";
 		sqlite3_stmt* stmt = nullptr;
-		std::optional<std::wstring_view> result;
+		std::optional<std::wstring> result;
 
 		if (sqlite3_prepare_v2(m_db, sql, -1, &stmt, nullptr) == SQLITE_OK)
 		{
@@ -349,7 +361,10 @@ namespace OpenNet::Core
 			if (sqlite3_step(stmt) == SQLITE_ROW)
 			{
 				auto text = reinterpret_cast<const wchar_t*>(sqlite3_column_text16(stmt, 0));
-				if (text) result = std::wstring_view(text);
+				if (text)
+				{
+					result = std::wstring(text);
+				}
 			}
 			sqlite3_finalize(stmt);
 		}

OpenNet/Core/AppSettingsDatabase.h

@@ -107,7 +107,7 @@ namespace OpenNet::Core
         void SetStringW(std::string const& category, std::string const& key, std::wstring_view const& value);
 
         /// Get a wide-string setting
-        std::optional<std::wstring_view> GetStringW(std::string const& category, std::string const& key) const;
+        std::optional<std::wstring> GetStringW(std::string const& category, std::string const& key) const;
 
         // ---------------------------------------------------------------
         //  Category constants for well-known setting groups

OpenNet/Core/Aria2/Aria2Engine.cpp

@@ -68,7 +68,7 @@ std::filesystem::path OpenNet::Core::Aria2::GetDownloadsFolderPath()
 {
 	static std::filesystem::path cached = ([]() -> std::filesystem::path
 	{
-		std::filesystem::path fp(winrt::OpenNet::Core::IO::FileSystem::GetDownloadsPathW());
+		std::filesystem::path fp(winrt::OpenNet::Core::IO::FileSystem::GetDownloadsPathW().GetResults().c_str());
 		std::filesystem::create_directories(fp);
 		return fp;
 	}());