ReviveOverlay: Copy over input manifests at runtime.

This also moves all application data to the non-roaming data folder.
EwoutH · Nov 25, 2018 · ee8621e · ee8621e
1 parent b0d756f
commit ee8621e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/Installer/Revive.nsi b/Installer/Revive.nsi
@@ -93,7 +93,7 @@ install:
   File /r "${BASE_DIR}\*.jpg"
   File /r "${BASE_DIR}\Qt*"
 
-  SetOutPath "$APPDATA\Revive\Input"
+  SetOutPath "$INSTDIR\Input"
 
   ; Application data
   File /r "${SRC_DIR}\Input\*.json"

diff --git a/Revive/InputManager.cpp b/Revive/InputManager.cpp
@@ -52,7 +52,7 @@ InputManager::~InputManager()
 void InputManager::LoadActionManifest()
 {
 	CComHeapPtr<wchar_t> folder;
-	HRESULT hr = SHGetKnownFolderPath(FOLDERID_RoamingAppData, KF_FLAG_DEFAULT, NULL, &folder);
+	HRESULT hr = SHGetKnownFolderPath(FOLDERID_LocalAppData, KF_FLAG_DEFAULT, NULL, &folder);
 
 	if (SUCCEEDED(hr))
 	{

diff --git a/ReviveInjector/main.cpp b/ReviveInjector/main.cpp
@@ -120,7 +120,7 @@ int wmain(int argc, wchar_t *argv[]) {
 	}
 
 	WCHAR LogPath[MAX_PATH];
-	if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, LogPath)))
+	if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, LogPath)))
 	{
 		wcsncat(LogPath, L"\\Revive", MAX_PATH);
 

diff --git a/ReviveOverlay/main.cpp b/ReviveOverlay/main.cpp
@@ -41,16 +41,10 @@ int main(int argc, char *argv[])
 	QApplication a(argc, argv);
 
 	// Open the log file and install our handler.
-	QString logPath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-	logPath.append("/Revive");
+	QString logPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/Revive/";
 	if (QDir().mkpath(logPath)) {
-		g_LogFile = new QFile(logPath + "/ReviveOverlay.txt");
+		g_LogFile = new QFile(logPath + "ReviveOverlay.txt");
 		g_LogFile->open(QIODevice::WriteOnly | QIODevice::Truncate);
-
-		// Remove obsolete log files
-		QDir logDir(logPath);
-		logDir.remove("ReviveOverlay.log");
-		logDir.remove("ReviveInjector.log");
 	}
 	qInstallMessageHandler(myMessageOutput);
 
@@ -70,6 +64,21 @@ int main(int argc, char *argv[])
 		return 0;
 	}
 
+	// Check if we need to copy over input files
+	QString inputPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/Revive/Input/";
+	if (!QDir().exists(inputPath) && QDir().mkpath(inputPath))
+	{
+		QDir inputDir(QCoreApplication::applicationDirPath() + "/Input");
+		if (inputDir.exists())
+		{
+			QStringList names = inputDir.entryList(QStringList("*.json"));
+			QStringList files;
+			for (QString file : names)
+				files.append(inputDir.path() + "/" + file);
+			WindowsServices::CopyFiles(files, inputPath, names);
+		}
+	}
+
 	if (COpenVROverlayController::SharedInstance()->Init())
 	{
 		// If the dashboard was successfully created keep running in the background