Merge branch 'Flow-Launcher:dev' into calculator-min-fix

Author: dcog989

Flow.Launcher.Core/ExternalPlugins/CommunityPluginSource.cs

@@ -73,6 +73,17 @@ public async Task<List<UserPlugin>> FetchAsync(CancellationToken token)
                     return null;
                 }
             }
+            catch (OperationCanceledException) when (token.IsCancellationRequested)
+            {
+                API.LogInfo(ClassName, $"Fetching from {ManifestFileUrl} was cancelled by caller.");
+                return null;
+            }
+            catch (TaskCanceledException)
+            {
+                // Likely an HttpClient timeout or external cancellation not requested by our token
+                API.LogWarn(ClassName, $"Fetching from {ManifestFileUrl} timed out.");
+                return null;
+            }
             catch (Exception e)
             {
                 if (e is HttpRequestException or WebException or SocketException || e.InnerException is TimeoutException)

Flow.Launcher.Infrastructure/Logger/Log.cs

@@ -34,7 +34,7 @@ static Log()
 
             var fileTarget = new FileTarget
             {
-                FileName = CurrentLogDirectory.Replace(@"\", "/") + "/${shortdate}.txt",
+                FileName = CurrentLogDirectory.Replace(@"\", "/") + "/Flow.Launcher.${date:format=yyyy-MM-dd}.log",
                 Layout = layout
             };
 
@@ -65,26 +65,22 @@ static Log()
 
         public static void SetLogLevel(LOGLEVEL level)
         {
-            switch (level)
+            var rule = LogManager.Configuration.FindRuleByName("file");
+
+            var nlogLevel = level switch
             {
-                case LOGLEVEL.DEBUG:
-                    UseDebugLogLevel();
-                    break;
-                default:
-                    UseInfoLogLevel();
-                    break;
-            }
-            Info(nameof(Logger), $"Using log level: {level}.");
-        }
+                LOGLEVEL.NONE => LogLevel.Off,
+                LOGLEVEL.ERROR => LogLevel.Error,
+                LOGLEVEL.DEBUG => LogLevel.Debug,
+                _ => LogLevel.Info
+            };
 
-        private static void UseDebugLogLevel()
-        {
-            LogManager.Configuration.FindRuleByName("file").SetLoggingLevels(LogLevel.Debug, LogLevel.Fatal);
-        }
+            rule.SetLoggingLevels(nlogLevel, LogLevel.Fatal);
 
-        private static void UseInfoLogLevel()
-        {
-            LogManager.Configuration.FindRuleByName("file").SetLoggingLevels(LogLevel.Info, LogLevel.Fatal);
+            LogManager.ReconfigExistingLoggers();
+
+            // We can't log Info when level is set to Error or None, so we use Debug
+            Debug(nameof(Logger), $"Using log level: {level}.");
         }
 
         private static void LogFaultyFormat(string message)
@@ -169,7 +165,9 @@ public static void Warn(string className, string message, [CallerMemberName] str
 
     public enum LOGLEVEL
     {
-        DEBUG,
-        INFO
+        NONE,
+        ERROR,
+        INFO,
+        DEBUG
     }
 }

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text.Json.Serialization;
 using System.Windows;

Flow.Launcher/Languages/en.xaml

@@ -462,8 +462,10 @@
     <system:String x:Key="userdatapathButton">Open Folder</system:String>
     <system:String x:Key="advanced">Advanced</system:String>
     <system:String x:Key="logLevel">Log Level</system:String>
-    <system:String x:Key="LogLevelDEBUG">Debug</system:String>
+    <system:String x:Key="LogLevelNONE">Silent</system:String>
+    <system:String x:Key="LogLevelERROR">Error</system:String>
     <system:String x:Key="LogLevelINFO">Info</system:String>
+    <system:String x:Key="LogLevelDEBUG">Debug</system:String>
     <system:String x:Key="settingWindowFontTitle">Setting Window Font</system:String>
 
     <!--  Release Notes Window  -->