core: migrate appdata folder on dotnet 8 for OSX

Jackett · May 18, 2024 · 25609af · 25609af
1 parent 47ab9c5
commit 25609af
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/Jackett.Common/Models/Config/RuntimeSettings.cs b/src/Jackett.Common/Models/Config/RuntimeSettings.cs
@@ -35,13 +35,13 @@ public string DataFolder
                     return CustomDataFolder;
                 }
 
-                if (System.Environment.OSVersion.Platform == PlatformID.Unix)
+                if (Environment.OSVersion.Platform == PlatformID.Unix)
                 {
-                    return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData, Environment.SpecialFolderOption.Create), "Jackett");
+                    return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData, Environment.SpecialFolderOption.DoNotVerify), "Jackett");
                 }
                 else
                 {
-                    return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Jackett");
+                    return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData, Environment.SpecialFolderOption.DoNotVerify), "Jackett");
                 }
             }
         }

diff --git a/src/Jackett.Common/Services/ConfigurationService.cs b/src/Jackett.Common/Services/ConfigurationService.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
 using System.Security.AccessControl;
 using System.Security.Principal;
 using Jackett.Common.Models.Config;
@@ -11,7 +13,6 @@
 
 namespace Jackett.Common.Services
 {
-
     public class ConfigurationService : IConfigurationService
     {
         private readonly ISerializeService serializeService;
@@ -34,10 +35,22 @@ public void CreateOrMigrateSettings()
         {
             try
             {
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
+                    var userAppDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile, Environment.SpecialFolderOption.DoNotVerify), ".config", "Jackett");
+                    var appDataFolder = GetAppDataFolder();
+
+                    // Check of existing json configuration files due to LogManager creating log.txt early in Program.cs
+                    if (Directory.Exists(userAppDataFolder) && (!Directory.Exists(appDataFolder) || !Directory.EnumerateFiles(appDataFolder, "*.json", SearchOption.AllDirectories).Any()))
+                    {
+                        PerformMigration(userAppDataFolder);
+                    }
+                }
+
                 if (!Directory.Exists(GetAppDataFolder()))
                 {
                     var dir = Directory.CreateDirectory(GetAppDataFolder());
-                    if (System.Environment.OSVersion.Platform != PlatformID.Unix)
+                    if (Environment.OSVersion.Platform != PlatformID.Unix)
                     {
                         var access = dir.GetAccessControl();
                         var directorySecurity = new DirectorySecurity(GetAppDataFolder(), AccessControlSections.All);
@@ -112,7 +125,7 @@ public void PerformMigration(string oldDirectory)
                 if (!Directory.Exists(destFolder))
                 {
                     var dir = Directory.CreateDirectory(destFolder);
-                    if (System.Environment.OSVersion.Platform != PlatformID.Unix)
+                    if (Environment.OSVersion.Platform != PlatformID.Unix)
                     {
                         var directorySecurity = new DirectorySecurity(destFolder, AccessControlSections.All);
                         directorySecurity.AddAccessRule(new FileSystemAccessRule(new SecurityIdentifier(WellKnownSidType.WorldSid, null), FileSystemRights.FullControl, InheritanceFlags.ObjectInherit | InheritanceFlags.ContainerInherit, PropagationFlags.None, AccessControlType.Allow));
@@ -123,7 +136,7 @@ public void PerformMigration(string oldDirectory)
                 {
                     File.Copy(file, destPath);
                     // The old files were created when running as admin so make sure they are editable by normal users / services.
-                    if (System.Environment.OSVersion.Platform != PlatformID.Unix)
+                    if (Environment.OSVersion.Platform != PlatformID.Unix)
                     {
                         var fileInfo = new FileInfo(destFolder);
                         var fileSecurity = new FileSecurity(destPath, AccessControlSections.All);
@@ -200,7 +213,7 @@ public List<string> GetCardigannDefinitionsFolders()
         {
             var dirs = new List<string>();
 
-            if (System.Environment.OSVersion.Platform == PlatformID.Unix)
+            if (Environment.OSVersion.Platform == PlatformID.Unix)
             {
                 dirs.Add(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "cardigann/definitions/"));
                 dirs.Add("/etc/xdg/cardigan/definitions/");