Packed resources

base/base_file_utilities.cpp

@@ -37,11 +37,15 @@ QString FileNameFromUserString(QString name) {
 	return Platform::FileNameFromUserString(std::move(name));
 }
 
-void RegisterBundledResources(const QString &name) {
-	const auto location = Platform::BundledResourcesPath();
-	if (!QResource::registerResource(location + '/' + name)) {
-		Unexpected("Packed resources not found.");
+void RegisterResourceArchive(const QString &name) {
+#ifdef DESKTOP_APP_USE_PACKED_RESOURCES
+	for (const QString &location : Platform::PackedResourcesPaths()) {
+		if (QResource::registerResource(location + '/' + name)) {
+			return;  // found
+		}
 	}
+	Unexpected("Packed resources not found.");
+#endif  // DESKTOP_APP_USE_PACKED_RESOURCES
 }
 
 } // namespace base

base/base_file_utilities.h

@@ -10,6 +10,6 @@ namespace base {
 
 [[nodiscard]] QString FileNameFromUserString(QString name);
 
-void RegisterBundledResources(const QString &name);
+void RegisterResourceArchive(const QString &name);
 
 } // namespace base

base/platform/base_platform_file_utilities.h

@@ -18,7 +18,7 @@ bool DeleteDirectory(QString path);
 void RemoveQuarantine(const QString &path);
 
 [[nodiscard]] QString CurrentExecutablePath(int argc, char *argv[]);
-[[nodiscard]] QString BundledResourcesPath();
+[[nodiscard]] QStringList PackedResourcesPaths();
 
 bool RenameWithOverwrite(const QString &from, const QString &to);
 void FlushFileData(QFile &file);

base/platform/linux/base_file_utilities_linux.cpp

@@ -9,6 +9,7 @@
 #include "base/platform/base_platform_file_utilities.h"
 #include "base/platform/linux/base_linux_wayland_integration.h"
 #include "base/algorithm.h"
+#include "base/integration.h"
 
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include "base/platform/linux/base_linux_app_launch_context.h"
@@ -190,8 +191,12 @@ QString CurrentExecutablePath(int argc, char *argv[]) {
 void RemoveQuarantine(const QString &path) {
 }
 
-QString BundledResourcesPath() {
-	Unexpected("BundledResourcesPath not implemented.");
+QStringList PackedResourcesPaths() {
+	return QStringList{
+#ifdef _DEBUG
+		Integration::Instance().executableDir(),
+#endif
+	} + QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
 }
 
 // From http://stackoverflow.com/questions/2256945/removing-a-non-empty-directory-programmatically-in-c-or-c

base/platform/mac/base_file_utilities_mac.mm

@@ -37,7 +37,7 @@ void RemoveQuarantine(const QString &path) {
 	removexattr(local.data(), kQuarantineAttribute, 0);
 }
 
-QString BundledResourcesPath() {
+QStringList PackedResourcesPaths() {
 	@autoreleasepool {
 
 	NSString *path = @"";
@@ -47,7 +47,7 @@ QString BundledResourcesPath() {
 			Unexpected("Could not get bundled path!");
 		}
 		path = [path stringByAppendingString:@"/Contents/Resources"];
-		return QFile::decodeName([path fileSystemRepresentation]);
+		return { QFile::decodeName([path fileSystemRepresentation]) };
 	}
 	@catch (NSException *exception) {
 		Unexpected("Exception in resource registering.");

base/platform/win/base_file_utilities_win.cpp

@@ -8,6 +8,7 @@
 
 #include "base/platform/win/base_windows_safe_library.h"
 #include "base/algorithm.h"
+#include "base/integration.h"
 
 #include <QtCore/QString>
 #include <QtCore/QDir>
@@ -142,8 +143,9 @@ bool DeleteDirectory(QString path) {
 void RemoveQuarantine(const QString &path) {
 }
 
-QString BundledResourcesPath() {
-	Unexpected("BundledResourcesPath not implemented.");
+QStringList PackedResourcesPaths() {
+	// Is verification of loaded resources really needed?
+	return { Integration::Instance().executableDir() };
 }
 
 QString CurrentExecutablePath(int argc, char *argv[]) {