From b6ecfdcf638b13b63bb4ebb901a56fd32309cb31 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 20 Jul 2025 09:58:30 +0800
Subject: [PATCH] Remove project reference in Sys plugin to
 Flow.Launcher.Infrastructure

---
 Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 12 ++++++++++
 Flow.Launcher/PublicAPIInstance.cs            |  4 ++++
 .../Flow.Launcher.Plugin.Sys.csproj           |  1 -
 Plugins/Flow.Launcher.Plugin.Sys/Main.cs      | 22 +++++++++----------
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index cfa813d3f..0238bdc1d 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -613,5 +613,17 @@ namespace Flow.Launcher.Plugin
         /// Invoked when the actual theme of the application has changed. Currently, the plugin will continue to be subscribed even if it is turned off.
         /// </summary>
         event ActualApplicationThemeChangedEventHandler ActualApplicationThemeChanged;
+
+        /// <summary>
+        /// Get the data directory of Flow Launcher.
+        /// </summary>
+        /// <returns></returns>
+        string GetDataDirectory();
+
+        /// <summary>
+        /// Get the log directory of Flow Launcher.
+        /// </summary>
+        /// <returns></returns>
+        string GetLogDirectory();
     }
 }
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index d865a087b..e0ed105cf 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -599,6 +599,10 @@ namespace Flow.Launcher
             remove => _mainVM.ActualApplicationThemeChanged -= value;
         }
 
+        public string GetDataDirectory() => DataLocation.DataDirectory();
+
+        public string GetLogDirectory() => DataLocation.VersionLogDirectory;
+
         #endregion
 
         #region Private Methods
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj b/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
index 999003fd8..1e2deb558 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
@@ -37,7 +37,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
     <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index 0b45b1524..77278a054 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -5,8 +5,6 @@ using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows;
-using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.Security;
@@ -52,6 +50,8 @@ namespace Flow.Launcher.Plugin.Sys
         private const SHUTDOWN_REASON REASON = SHUTDOWN_REASON.SHTDN_REASON_MAJOR_OTHER |
             SHUTDOWN_REASON.SHTDN_REASON_FLAG_PLANNED;
 
+        private const string Documentation = "https://flowlauncher.com/docs/#/usage-tips";
+
         private PluginInitContext _context;
         private Settings _settings;
         private ThemeSelector _themeSelector;
@@ -445,11 +445,11 @@ namespace Flow.Launcher.Plugin.Sys
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xf12b"),
                     Title = "Open Log Location",
                     IcoPath = "Images\\app.png",
-                    CopyText = DataLocation.VersionLogDirectory,
-                    AutoCompleteText = DataLocation.VersionLogDirectory,
+                    CopyText = _context.API.GetLogDirectory(),
+                    AutoCompleteText = _context.API.GetLogDirectory(),
                     Action = c =>
                     {
-                        _context.API.OpenDirectory(DataLocation.VersionLogDirectory);
+                        _context.API.OpenDirectory(_context.API.GetLogDirectory());
                         return true;
                     }
                 },
@@ -458,11 +458,11 @@ namespace Flow.Launcher.Plugin.Sys
                     Title = "Flow Launcher Tips",
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe897"),
                     IcoPath = "Images\\app.png",
-                    CopyText = Constant.Documentation,
-                    AutoCompleteText = Constant.Documentation,
+                    CopyText = Documentation,
+                    AutoCompleteText = Documentation,
                     Action = c =>
                     {
-                        _context.API.OpenUrl(Constant.Documentation);
+                        _context.API.OpenUrl(Documentation);
                         return true;
                     }
                 },
@@ -471,11 +471,11 @@ namespace Flow.Launcher.Plugin.Sys
                     Title = "Flow Launcher UserData Folder",
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xf12b"),
                     IcoPath = "Images\\app.png",
-                    CopyText = DataLocation.DataDirectory(),
-                    AutoCompleteText = DataLocation.DataDirectory(),
+                    CopyText = _context.API.GetDataDirectory(),
+                    AutoCompleteText = _context.API.GetDataDirectory(),
                     Action = c =>
                     {
-                        _context.API.OpenDirectory(DataLocation.DataDirectory());
+                        _context.API.OpenDirectory(_context.API.GetDataDirectory());
                         return true;
                     }
                 },