refactor and optimize

Adobe Camera Profiles Unlocker Neo/Adobe Camera Profiles Unlocker Neo.csproj

@@ -31,6 +31,7 @@
 	  <PublishTrimmed>true</PublishTrimmed>
 	  <PublishReadyToRun>true</PublishReadyToRun>
 	  <PackageTags>Neo 2.0.0</PackageTags>
+	  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 	<Target Name="RemoveFoldersWithMuiFiles" AfterTargets="Build">
 		<ItemGroup>

Adobe Camera Profiles Unlocker Neo/MainWindow.xaml

@@ -32,7 +32,7 @@
                     <Button x:Name="ResetButton" Content="Reset" Width="100" Click="ResetButton_Click"/>
                 </StackPanel>
 
-                <controls:DataGrid BorderBrush="{StaticResource AccentAAFillColorDisabled}" BorderThickness="1" x:Name="ProfileTable" AutoGenerateColumns="False" IsReadOnly="True" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" Margin="0,20,0,10">
+                <controls:DataGrid BorderBrush="{StaticResource AccentAAFillColorDisabled}" BorderThickness="1" x:Name="ProfileTable" AutoGenerateColumns="False" IsReadOnly="True" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" Margin="0,20,0,10" MaxHeight="500">
                     <controls:DataGrid.Columns>
                         <controls:DataGridTextColumn Header="No." Binding="{Binding No}" Width="70" />
                         <controls:DataGridTextColumn Header="Camera Model" Binding="{Binding ProfileName}" Width="*" />

Engineer/Updater.cs → Engineer/AppUpdater.cs

@@ -2,7 +2,7 @@
 
 namespace Engineer
 {
-    public static class Updater
+    public static class AppUpdater
     {
         public static async Task<Release?> GetGithubLatestReleaseInfo()
         {

Engineer/FileUpdater.cs → Engineer/ContentModifier.cs

@@ -1,21 +1,22 @@
 namespace Engineer
 {
-    public static class FileUpdater
+    public static class ContentModifier
     {
-        public static void ModifyXMPContent(string xmlPath, string brand, string outputCameraModel)
+        private static readonly string AuthorCredit = "© 2024 Phan Xuan Quang / Github: @phanxuanquang";
+        public static void ModifyXmp(string xmlPath, string outputCameraModel)
         {
             var lines = File.ReadAllLines(xmlPath);
 
             Parallel.For(0, lines.Length, i =>
             {
                 if (lines[i].Contains("crs:Copyright="))
                 {
-                    lines[i] = "crs:Copyright=\"© 2024 Phan Xuan Quang / Github: @phanxuanquang\"";
+                    lines[i] = $"crs:Copyright=\"{AuthorCredit}\"";
                 }
 
                 if (lines[i].Contains("crs:CameraModelRestriction="))
                 {
-                    lines[i] = $"crs:CameraModelRestriction=\"{outputCameraModel}\"";
+                    lines[i] = $"crs:CameraModelRestriction=\"{outputCameraModel.Trim()}\"";
                 }
 
                 if (lines[i].Contains("crs:CameraProfile="))
@@ -27,20 +28,20 @@ public static void ModifyXMPContent(string xmlPath, string brand, string outputC
             File.WriteAllLines(xmlPath, lines);
         }
 
-        public static void ModifyXMLContent(string xmlPath, string brand, string outputCameraModel)
+        public static void ModifyXml(string xmlPath, string cameraModel, string outputCameraModel)
         {
             var lines = File.ReadAllLines(xmlPath);
 
             Parallel.For(0, lines.Length, i =>
             {
                 if (lines[i].Contains("<ProfileName>"))
                 {
-                    lines[i] = lines[i].Replace("Camera", $"{brand}:");
+                    lines[i] = lines[i].Replace("Camera", $"{cameraModel.Trim()}:");
                 }
 
                 if (lines[i].Contains("Copyright"))
                 {
-                    lines[i] = lines[i].Replace(lines[i], "<Copyright>© 2024 Phan Xuan Quang / Github: @phanxuanquang</Copyright>");
+                    lines[i] = lines[i].Replace(lines[i], $"<Copyright>{AuthorCredit}</Copyright>");
                 }
 
                 if (lines[i].Contains("<ProfileCalibrationSignature>"))
@@ -50,7 +51,7 @@ public static void ModifyXMLContent(string xmlPath, string brand, string outputC
 
                 if (lines[i].Contains("<UniqueCameraModelRestriction>"))
                 {
-                    lines[i] = lines[i].Replace(lines[i], $"<UniqueCameraModelRestriction>{outputCameraModel}</UniqueCameraModelRestriction>");
+                    lines[i] = lines[i].Replace(lines[i], $"<UniqueCameraModelRestriction>{outputCameraModel.Trim()}</UniqueCameraModelRestriction>");
                 }
             });
 

Engineer/DcpHelper.cs

@@ -4,14 +4,18 @@ namespace Engineer
 {
     public static class DcpHelper
     {
+        private static readonly string DcpToolPath = @"Assets\dcpTool.exe";
+
         public static string AsXML(string dcpPath)
         {
             var xmlPath = $"{AppDomain.CurrentDomain.BaseDirectory}\\{Path.GetFileName(dcpPath).Replace(".dcp", ".xml")}";
 
-            var exeInfor = new ProcessStartInfo();
-            exeInfor.FileName = @"Assets\dcpTool.exe";
-            exeInfor.CreateNoWindow = true;
-            exeInfor.Arguments = $"-d \"{dcpPath}\" \"{xmlPath}\"";
+            var exeInfor = new ProcessStartInfo
+            {
+                FileName = DcpToolPath,
+                CreateNoWindow = true,
+                Arguments = $"-d \"{dcpPath}\" \"{xmlPath}\""
+            };
 
             var executer = Process.Start(exeInfor);
             executer.WaitForExit();
@@ -21,10 +25,12 @@ public static string AsXML(string dcpPath)
 
         public static void AsDCP(string xmlPath, string dcpPath)
         {
-            var exeInfor = new ProcessStartInfo();
-            exeInfor.FileName = @"Assets\dcpTool.exe";
-            exeInfor.Arguments = $"-c \"{xmlPath}\" \"{dcpPath}.dcp\"";
-            exeInfor.CreateNoWindow = true;
+            var exeInfor = new ProcessStartInfo
+            {
+                FileName = DcpToolPath,
+                Arguments = $"-c \"{xmlPath}\" \"{dcpPath}.dcp\"",
+                CreateNoWindow = true
+            };
 
             var executer = Process.Start(exeInfor);
             executer.WaitForExit();

Engineer/DirectoryHelper.cs

@@ -4,17 +4,29 @@ namespace Engineer
 {
     public static class DirectoryHelper
     {
-        public static List<string> GetProfileFiles(string folderPath)
+        public static async Task<List<string>> GetProfiles(string folderPath)
         {
-            var dcpFiles = Directory.GetFiles(folderPath, "*.dcp").ToList();
-            var xmpFiles = Directory.GetFiles(folderPath, "*.xmp").ToList();
-            return dcpFiles.Concat(xmpFiles).ToList();
+            var profiles = new ConcurrentBag<string>();
+
+            await Task.WhenAll(
+                Task.Run(() => Parallel.ForEach(Directory.EnumerateFiles(folderPath, "*.dcp"), file =>
+                {
+                    profiles.Add(file);
+                })),
+                Task.Run(() => Parallel.ForEach(Directory.EnumerateFiles(folderPath, "*.xmp"), file =>
+                {
+                    profiles.Add(file);
+                }))
+            );
+
+            return new List<string>(profiles);
         }
+
         public static async Task<List<string>> GetFolders(string path, bool getDirectChildrenOnly = true)
         {
             if (!Directory.EnumerateFileSystemEntries(path).GetEnumerator().MoveNext())
             {
-                return new List<string>();
+                return [];
             }
 
             if (getDirectChildrenOnly)
@@ -33,15 +45,29 @@ public static async Task<List<string>> GetFolders(string path, bool getDirectChi
                 {
                     var subfolders = await Task.Run(() => Directory.GetDirectories(currentPath));
 
-                    await Parallel.ForEachAsync(subfolders, async (folder, cancellationToken) =>
+                    await Parallel.ForEachAsync(subfolders, (folder, cancellationToken) =>
                     {
                         folders.Add(folder);
                         stack.Push(folder);
+                        return new ValueTask();
                     });
                 }
             }
 
             return new List<string>(folders);
         }
+
+        public static bool IsDirectoryExist(string path)
+        {
+            return Directory.Exists(path);
+        }
+
+        public static void CreateDirectoryIfNotExist(string path)
+        {
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
+        }
     }
 }

Engineer/CameraProfile.cs → Engineer/Models/CameraProfile.cs

@@ -1,4 +1,4 @@
-namespace Engineer
+namespace Engineer.Models
 {
     public class CameraProfile
     {

Engineer/Models/DirectoryConstant.cs

@@ -0,0 +1,11 @@
+namespace Engineer.Models
+{
+    public class DirectoryConstant
+    {
+        public const string CameraRawRootDir = @"C:\ProgramData\Adobe\CameraRaw";
+        public const string AdobeStandardProfilesDir = @"C:\ProgramData\Adobe\CameraRaw\CameraProfiles\Adobe Standard";
+        public const string VariantProfileFoldersDir = @"C:\ProgramData\Adobe\CameraRaw\CameraProfiles\Camera";
+        public const string VariantProfileFoldersDirAlt = @"C:\ProgramData\Adobe\CameraRaw\Settings\Adobe\Profiles\Camera";
+        public const string CameraRaw3rdPartyProfilesDir = @"C:\ProgramData\Adobe\CameraRaw\CameraProfiles";
+    }
+}

Engineer/GeneralHelper.cs → Engineer/WindowsHelper.cs

@@ -3,12 +3,12 @@
 
 namespace Engineer
 {
-    public static class GeneralHelper
+    public static class WindowsHelper
     {
         public static bool IsUserAdmin()
         {
             WindowsIdentity identity = WindowsIdentity.GetCurrent();
-            WindowsPrincipal principal = new WindowsPrincipal(identity);
+            WindowsPrincipal principal = new(identity);
             return principal.IsInRole(WindowsBuiltInRole.Administrator);
         }