tweaks for ZIP

Author: RensDofferhoff

QMLComponents/utilities/dynamicruntimeinfo.cpp

@@ -43,8 +43,8 @@ DynamicRuntimeInfo::DynamicRuntimeInfo()
 #elif linux
 	_environment = RuntimeEnvironment::LINUX_LOCAL;
 #elif _WIN32
-	parseStaticRuntimeInfoFile(fq(AppDirs::programDir().absoluteFilePath(tq(staticInfoFileName)))); //will set runtime env info
-	parseDynamicRuntimeInfoFile(fq(AppDirs::appData(false) + "/" + tq(dynamicInfoFileName)));
+	parseStaticRuntimeInfoFile(staticRuntimeInfoFilePath()); //will set runtime env info
+	parseDynamicRuntimeInfoFile(dynamicRuntimeInfoFilePath());
 #else
     _environment = RuntimeEnvironment::UNKNOWN;
 #endif
@@ -108,6 +108,23 @@ bool DynamicRuntimeInfo::parseDynamicRuntimeInfoFile(const std::string &path)
 
 }
 
+std::string DynamicRuntimeInfo::staticRuntimeInfoFilePath()
+{
+	return fq(AppDirs::programDir().absoluteFilePath(tq(staticInfoFileName)));
+}
+
+std::string DynamicRuntimeInfo::dynamicRuntimeInfoFilePath()
+{	
+	switch (getRuntimeEnvironment()) {
+	case ZIP:
+		return fq(AppDirs::programDir().absoluteFilePath(tq(dynamicInfoFileName)));
+	case MSIX:
+		return fq(AppDirs::appData(false) + "/" + tq(dynamicInfoFileName));
+	default:
+		return "";
+	}
+}
+
 bool DynamicRuntimeInfo::writeDynamicRuntimeInfoFile()
 {
 	std::string path = fq(AppDirs::appData(false) + "/" + tq(dynamicInfoFileName));

QMLComponents/utilities/dynamicruntimeinfo.h

@@ -57,6 +57,9 @@ class DynamicRuntimeInfo
     bool parseDynamicRuntimeInfoFile(const std::string& path);
 
 private:
+	std::string staticRuntimeInfoFilePath();
+	std::string dynamicRuntimeInfoFilePath();
+
     RuntimeEnvironment _environment;
     MicroArch _arch;