Merge pull request #2 from XTsat/AppFolder

Use LocalData

Author: XTsat

CompactGUI/Application.xaml.vb

@@ -17,7 +17,7 @@ Imports Coravel.Scheduling.Schedule
 
 Partial Public Class Application
 
-    Public Shared ReadOnly AppVersion As New SemVersion(4, 0, 0, "beta", 7)
+    Public Shared ReadOnly AppVersion As New SemVersion(4, 0, 0, "beta", 8)
 
     Private Shared _host As IHost
 

CompactGUI/Models/CompressableFolders/SteamFolder.vb

@@ -1,6 +1,11 @@
 
+Imports System
 Imports System.IO
 Imports System.Net.Http
+Imports System.Threading.Tasks
+Imports System.Windows.Forms
+Imports System.Reflection
+Imports System.Runtime.InteropServices
 
 Imports CommunityToolkit.Mvvm.ComponentModel
 
@@ -67,17 +72,41 @@ Public Class SteamFolder : Inherits CompressableFolder
 
     End Function
 
+    Public Shared Function GetAppRootPath() As String
+        Try
+            If AppContext.TryGetSwitch("System.AppContext.SingleFile", Nothing) Then
+                Dim pathBuffer As New String(Chr(0), 260)
+                Dim exePath As String = pathBuffer.TrimEnd(Chr(0))
+                Dim appRootPath As String = Path.GetDirectoryName(exePath)
+                Return If(appRootPath.EndsWith("\"), appRootPath.TrimEnd("\"), appRootPath)
+            Else
+                Dim appRootPath As String = AppContext.BaseDirectory
+                Return If(appRootPath.EndsWith("\"), appRootPath.TrimEnd("\"), appRootPath)
+            End If
+        Catch ex As Exception
+            Return Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
+        End Try
+    End Function
+
     Public Shared Async Function GetSteamHeaderAsync(folder As SteamFolder) As Task
 
         If folder.SteamAppID = 0 Then Return
 
         Dim tempImg As BitmapImage = Nothing
 
-        Dim EnvironmentPath = Environment.GetEnvironmentVariable("IridiumIO", EnvironmentVariableTarget.User)
-        Dim imageDir = Path.Combine(EnvironmentPath, "CompactGUI", "SteamCache")
+        Dim appRootPath As String = GetAppRootPath()
+        Dim EnvironmentPath = Path.Combine(appRootPath, "data")
+        Dim imageDir = Path.Combine(EnvironmentPath, "SteamCache")
         Dim imagePath = Path.Combine(imageDir, $"{folder.SteamAppID}.jpg")
 
-        If Not Directory.Exists(imageDir) Then Directory.CreateDirectory(imageDir)
+        Try
+            Directory.CreateDirectory(imageDir)
+        Catch ex As Exception
+            EnvironmentPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "IridiumIO", "CompactGUI")
+            imageDir = Path.Combine(EnvironmentPath, "SteamCache")
+            imagePath = Path.Combine(imageDir, $"{folder.SteamAppID}.jpg")
+            Directory.CreateDirectory(imageDir)
+        End Try
 
         If File.Exists(imagePath) Then
             tempImg = LoadImageFromDisk(imagePath)

CompactGUI/Services/SettingsService.vb

@@ -1,9 +1,8 @@
 Imports System.IO
+Imports System.Reflection
 Imports System.Text.Json
-
 Imports CompactGUI.Core.Settings
 Imports CompactGUI.Logging
-
 Imports Microsoft.Extensions.Logging
 
 Public Class SettingsService : Implements ISettingsService
@@ -15,7 +14,8 @@ Public Class SettingsService : Implements ISettingsService
 
     Public Sub New()
 
-        DataFolder = New IO.DirectoryInfo(IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "IridiumIO", "CompactGUI"))
+        Dim appRootPath As String = SteamFolder.GetAppRootPath()
+        DataFolder = New IO.DirectoryInfo(IO.Path.Combine(appRootPath, "data"))
         SettingsJSONFile = New IO.FileInfo(IO.Path.Combine(DataFolder.FullName, "settings.json"))
 
         SettingsVersion = 1.2

CompactGUI/ViewModels/SettingsViewModel.vb

@@ -1,6 +1,8 @@
 
 Imports System.ComponentModel
+Imports System.Reflection
 Imports System.Xml
+Imports System.IO
 
 Imports CommunityToolkit.Mvvm.ComponentModel
 Imports CommunityToolkit.Mvvm.Input
@@ -40,10 +42,10 @@ Public NotInheritable Class SettingsViewModel : Inherits ObservableObject
 
     Private Shared Async Function SetEnv() As Task
         SettingsLog.SettingEnvironmentVariables(Application.GetService(Of ILogger(Of Settings)))
-        Dim desiredValue = IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "IridiumIO")
+        Dim appRootPath As String = SteamFolder.GetAppRootPath()
+        Dim desiredValue = IO.Path.Combine(appRootPath, "data")
         Dim currentValue = Environment.GetEnvironmentVariable("IridiumIO", EnvironmentVariableTarget.User)
         If currentValue <> desiredValue Then Await Task.Run(Sub() Environment.SetEnvironmentVariable("IridiumIO", desiredValue, EnvironmentVariableTarget.User))
-
     End Function
 
     Private Async Sub SettingsPropertyChanged(sender As Object, e As PropertyChangedEventArgs)