Merge branch 'nuget_dependency' of https://github.com/Flow-Launcher/Flow.Launcher into nuget_dependency

Author: Jack251970

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -47,7 +47,7 @@ public static class PluginManager
         /// <summary>
         /// Directories that will hold Flow Launcher plugin directory
         /// </summary>
-        private static readonly string[] Directories =
+        public static readonly string[] Directories =
         {
             Constant.PreinstalledDirectory, DataLocation.PluginsDirectory
         };

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -28,22 +27,20 @@ public class Internationalization
         private const string DefaultFile = "en.xaml";
         private const string Extension = ".xaml";
         private readonly Settings _settings;
-        private readonly List<string> _languageDirectories = new();
-        private readonly List<ResourceDictionary> _oldResources = new();
+        private readonly List<string> _languageDirectories = [];
+        private readonly List<ResourceDictionary> _oldResources = [];
         private static string SystemLanguageCode;
 
         public Internationalization(Settings settings)
         {
             _settings = settings;
-            AddFlowLauncherLanguageDirectory();
         }
 
-        private void AddFlowLauncherLanguageDirectory()
-        {
-            var directory = Path.Combine(Constant.ProgramDirectory, Folder);
-            _languageDirectories.Add(directory);
-        }
+        #region Initialization
 
+        /// <summary>
+        /// Initialize the system language code based on the current culture.
+        /// </summary>
         public static void InitSystemLanguageCode()
         {
             var availableLanguages = AvailableLanguages.GetAvailableLanguages();
@@ -72,35 +69,6 @@ public static void InitSystemLanguageCode()
             SystemLanguageCode = DefaultLanguageCode;
         }
 
-        private void AddPluginLanguageDirectories()
-        {
-            foreach (var plugin in PluginManager.GetTranslationPlugins())
-            {
-                var location = Assembly.GetAssembly(plugin.Plugin.GetType()).Location;
-                var dir = Path.GetDirectoryName(location);
-                if (dir != null)
-                {
-                    var pluginThemeDirectory = Path.Combine(dir, Folder);
-                    _languageDirectories.Add(pluginThemeDirectory);
-                }
-                else
-                {
-                    API.LogError(ClassName, $"Can't find plugin path <{location}> for <{plugin.Metadata.Name}>");
-                }
-            }
-
-            LoadDefaultLanguage();
-        }
-
-        private void LoadDefaultLanguage()
-        {
-            // Removes language files loaded before any plugins were loaded.
-            // Prevents the language Flow started in from overwriting English if the user switches back to English
-            RemoveOldLanguageFiles();
-            LoadLanguage(AvailableLanguages.English);
-            _oldResources.Clear();
-        }
-
         /// <summary>
         /// Initialize language. Will change app language and plugin language based on settings.
         /// </summary>
@@ -116,13 +84,64 @@ public async Task InitializeLanguageAsync()
             // Get language by language code and change language
             var language = GetLanguageByLanguageCode(languageCode);
 
+            // Add Flow Launcher language directory
+            AddFlowLauncherLanguageDirectory();
+
             // Add plugin language directories first so that we can load language files from plugins
             AddPluginLanguageDirectories();
 
+            // Load default language resources
+            LoadDefaultLanguage();
+
             // Change language
-            await ChangeLanguageAsync(language);
+            await ChangeLanguageAsync(language, false);
         }
 
+        private void AddFlowLauncherLanguageDirectory()
+        {
+            // Check if Flow Launcher language directory exists
+            var directory = Path.Combine(Constant.ProgramDirectory, Folder);
+            if (!Directory.Exists(directory))
+            {
+                API.LogError(ClassName, $"Flow Launcher language directory can't be found <{directory}>");
+                return;
+            }
+
+            _languageDirectories.Add(directory);
+        }
+
+        private void AddPluginLanguageDirectories()
+        {
+            foreach (var pluginsDir in PluginManager.Directories)
+            {
+                if (!Directory.Exists(pluginsDir)) continue;
+
+                // Enumerate all top directories in the plugin directory
+                foreach (var dir in Directory.GetDirectories(pluginsDir))
+                {
+                    // Check if the directory contains a language folder
+                    var pluginLanguageDir = Path.Combine(dir, Folder);
+                    if (!Directory.Exists(pluginLanguageDir)) continue;
+
+                    // Check if the language directory contains default language file since it will be checked later
+                    _languageDirectories.Add(pluginLanguageDir);
+                }
+            }
+        }
+
+        private void LoadDefaultLanguage()
+        {
+            // Removes language files loaded before any plugins were loaded.
+            // Prevents the language Flow started in from overwriting English if the user switches back to English
+            RemoveOldLanguageFiles();
+            LoadLanguage(AvailableLanguages.English);
+            _oldResources.Clear();
+        }
+
+        #endregion
+
+        #region Change Language
+
         /// <summary>
         /// Change language during runtime. Will change app language and plugin language & save settings.
         /// </summary>
@@ -151,8 +170,8 @@ public void ChangeLanguage(string languageCode)
 
         private static Language GetLanguageByLanguageCode(string languageCode)
         {
-            var lowercase = languageCode.ToLower();
-            var language = AvailableLanguages.GetAvailableLanguages().FirstOrDefault(o => o.LanguageCode.ToLower() == lowercase);
+            var language = AvailableLanguages.GetAvailableLanguages().
+                FirstOrDefault(o => o.LanguageCode.Equals(languageCode, StringComparison.OrdinalIgnoreCase));
             if (language == null)
             {
                 API.LogError(ClassName, $"Language code can't be found <{languageCode}>");
@@ -164,7 +183,7 @@ private static Language GetLanguageByLanguageCode(string languageCode)
             }
         }
 
-        private async Task ChangeLanguageAsync(Language language)
+        private async Task ChangeLanguageAsync(Language language, bool updateMetadata = true)
         {
             // Remove old language files and load language
             RemoveOldLanguageFiles();
@@ -176,8 +195,11 @@ private async Task ChangeLanguageAsync(Language language)
             // Change culture info
             ChangeCultureInfo(language.LanguageCode);
 
-            // Raise event for plugins after culture is set
-            await Task.Run(UpdatePluginMetadataTranslations);
+            if (updateMetadata)
+            {
+                // Raise event for plugins after culture is set
+                await Task.Run(UpdatePluginMetadataTranslations);
+            }
         }
 
         public static void ChangeCultureInfo(string languageCode)
@@ -200,6 +222,10 @@ public static void ChangeCultureInfo(string languageCode)
             thread.CurrentUICulture = currentCulture;
         }
 
+        #endregion
+
+        #region Prompt Pinyin
+
         public bool PromptShouldUsePinyin(string languageCodeToSet)
         {
             var languageToSet = GetLanguageByLanguageCode(languageCodeToSet);
@@ -212,14 +238,18 @@ public bool PromptShouldUsePinyin(string languageCodeToSet)
 
             // No other languages should show the following text so just make it hard-coded
             // "Do you want to search with pinyin?"
-            string text = languageToSet == AvailableLanguages.Chinese ? "是否启用拼音搜索？" : "是否啓用拼音搜索？" ;
+            string text = languageToSet == AvailableLanguages.Chinese ? "是否启用拼音搜索？" : "是否啓用拼音搜索？";
 
             if (API.ShowMsgBox(text, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
                 return false;
 
             return true;
         }
 
+        #endregion
+
+        #region Language Resources Management
+
         private void RemoveOldLanguageFiles()
         {
             var dicts = Application.Current.Resources.MergedDictionaries;
@@ -255,13 +285,51 @@ private void LoadLanguage(Language language)
             }
         }
 
+        private static string LanguageFile(string folder, string language)
+        {
+            if (Directory.Exists(folder))
+            {
+                var path = Path.Combine(folder, language);
+                if (File.Exists(path))
+                {
+                    return path;
+                }
+                else
+                {
+                    API.LogError(ClassName, $"Language path can't be found <{path}>");
+                    var english = Path.Combine(folder, DefaultFile);
+                    if (File.Exists(english))
+                    {
+                        return english;
+                    }
+                    else
+                    {
+                        API.LogError(ClassName, $"Default English Language path can't be found <{path}>");
+                        return string.Empty;
+                    }
+                }
+            }
+            else
+            {
+                return string.Empty;
+            }
+        }
+
+        #endregion
+
+        #region Available Languages
+
         public List<Language> LoadAvailableLanguages()
         {
             var list = AvailableLanguages.GetAvailableLanguages();
             list.Insert(0, new Language(Constant.SystemLanguageCode, AvailableLanguages.GetSystemTranslation(SystemLanguageCode)));
             return list;
         }
 
+        #endregion
+
+        #region Get Translations
+
         public static string GetTranslation(string key)
         {
             var translation = Application.Current.TryFindResource(key);
@@ -276,7 +344,11 @@ public static string GetTranslation(string key)
             }
         }
 
-        private void UpdatePluginMetadataTranslations()
+        #endregion
+
+        #region Update Metadata
+
+        public static void UpdatePluginMetadataTranslations()
         {
             // Update plugin metadata name & description
             foreach (var p in PluginManager.GetTranslationPlugins())
@@ -295,34 +367,6 @@ private void UpdatePluginMetadataTranslations()
             }
         }
 
-        private static string LanguageFile(string folder, string language)
-        {
-            if (Directory.Exists(folder))
-            {
-                var path = Path.Combine(folder, language);
-                if (File.Exists(path))
-                {
-                    return path;
-                }
-                else
-                {
-                    API.LogError(ClassName, $"Language path can't be found <{path}>");
-                    var english = Path.Combine(folder, DefaultFile);
-                    if (File.Exists(english))
-                    {
-                        return english;
-                    }
-                    else
-                    {
-                        API.LogError(ClassName, $"Default English Language path can't be found <{path}>");
-                        return string.Empty;
-                    }
-                }
-            }
-            else
-            {
-                return string.Empty;
-            }
-        }
+        #endregion
     }
 }

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -613,5 +613,17 @@ public interface IPublicAPI
         /// 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 user data directory of Flow Launcher.
+        /// </summary>
+        /// <returns></returns>
+        string GetDataDirectory();
+
+        /// <summary>
+        /// Get the log directory of Flow Launcher.
+        /// </summary>
+        /// <returns></returns>
+        string GetLogDirectory();
     }
 }

Flow.Launcher/App.xaml.cs

@@ -192,6 +192,9 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
                 // Enable Win32 dark mode if the system is in dark mode before creating all windows
                 Win32Helper.EnableWin32DarkMode(_settings.ColorScheme);
 
+                // Initialize language before portable clean up since it needs translations
+                await Ioc.Default.GetRequiredService<Internationalization>().InitializeLanguageAsync();
+
                 Ioc.Default.GetRequiredService<Portable>().PreStartCleanUpAfterPortabilityUpdate();
 
                 API.LogInfo(ClassName, "Begin Flow Launcher startup ----------------------------------------------------");
@@ -217,8 +220,8 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
 
                 await PluginManager.InitializePluginsAsync();
 
-                // Change language after all plugins are initialized because we need to update plugin title based on their api
-                await Ioc.Default.GetRequiredService<Internationalization>().InitializeLanguageAsync();
+                // Update plugin titles after plugins are initialized with their api instances
+                Internationalization.UpdatePluginMetadataTranslations();
 
                 await imageLoadertask;
 

Flow.Launcher/PublicAPIInstance.cs

@@ -599,6 +599,10 @@ public event ActualApplicationThemeChangedEventHandler ActualApplicationThemeCha
             remove => _mainVM.ActualApplicationThemeChanged -= value;
         }
 
+        public string GetDataDirectory() => DataLocation.DataDirectory();
+
+        public string GetLogDirectory() => DataLocation.VersionLogDirectory;
+
         #endregion
 
         #region Private Methods