Merge branch 'ricky-dev' into main

SugarWorkshop · May 23, 2021 · 0401df3 · 0401df3
2 parents c63e114 + 82d2b17
commit 0401df3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/src/Extensions/IOExtensions.cs b/src/Extensions/IOExtensions.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Linq;
 
 namespace SeewoHelper
@@ -58,6 +59,11 @@ public static void MoveTo(this FileSystemInfo fileSystemInfo, string destName, b
             }
             else if (fileSystemInfo is DirectoryInfo directoryInfo)
             {
+                if (Directory.GetParent(destName).FullName == directoryInfo.FullName)
+                {
+                    throw new InvalidOperationException("目标文件夹的父文件夹为当前文件夹。");
+                }
+
                 directoryInfo.MoveTo(destName, overwrite);
             }
         }

diff --git a/src/Extensions/SystemExtensions.cs b/src/Extensions/SystemExtensions.cs
@@ -16,12 +16,12 @@ public static class SystemExtensions
         /// <param name="terminating">是否终止程序</param>
         public static Exception ShowAndLog(this Exception ex, Logger logger, bool terminating = false)
         {
-            MessageBoxUtilities.ShowWarning($"程序给你抛出了异常，异常消息：\n{ex.Message}\n详细信息请查看日志，并提交 Issue，有能力的话也可以发 Pull Request 哦");
             logger.Add(new Log(ex.ToString(), terminating ? LogLevel.Fatal : LogLevel.Error));
+            MessageBoxUtilities.ShowError($"程序给你抛出了异常，异常消息：\n{ex.Message}\n详细信息请查看日志，并提交 Issue，有能力的话也可以发 Pull Request 哦");
 
             return ex;
         }
 
-        public static string CheckEmpty(this string str) => string.IsNullOrEmpty(str) ? null : str;
+        public static string IsEmptyOrNull(this string str) => string.IsNullOrEmpty(str) ? null : str;
     }
 }
diff --git a/src/Models/Features/FileSorter.cs b/src/Models/Features/FileSorter.cs
@@ -57,7 +57,7 @@ private Task Sort(FileSortingInfo info) => Task.Run(() =>
                 Program.Logger.Info($"匹配到：{string.Join(", ", matchedFileSystemInfos)}");
             }
 
-            var processFileSystemInfos = selectedFileSystemInfos.Distinct(); // 排除重复元素
+            var processFileSystemInfos = selectedFileSystemInfos.Distinct().Where(x => x.FullName != Path.GetFullPath(info.Path)); // 排除重复元素
 
             Program.Logger.Info($"将要处理：{string.Join(", ", processFileSystemInfos)}");
 

diff --git a/src/Models/Logger.cs b/src/Models/Logger.cs
@@ -17,31 +17,31 @@ public class Logger : ObservableCollection<Log>
         public string Path { get; }
 
         /// <summary>
-        /// 添加调试 <see cref="LogLevel"/> 为 <see cref="LogLevel.Debug"/> 的日志
+        /// 添加 <see cref="LogLevel"/> 为 <see cref="LogLevel.Debug"/> 的日志
         /// </summary>
         /// <param name="content">内容</param>
         public void Debug(string content) => Add(new Log(content, LogLevel.Debug));
 
         /// <summary>
-        /// 添加调试 <see cref="LogLevel"/> 为 <see cref="LogLevel.Info"/> 的日志
+        /// 添加 <see cref="LogLevel"/> 为 <see cref="LogLevel.Info"/> 的日志
         /// </summary>
         /// <param name="content">内容</param>
         public void Info(string content) => Add(new Log(content));
 
         /// <summary>
-        /// 添加调试 <see cref="LogLevel"/> 为 <see cref="LogLevel.Warning"/> 的日志
+        /// 添加 <see cref="LogLevel"/> 为 <see cref="LogLevel.Warning"/> 的日志
         /// </summary>
         /// <param name="content">内容</param>
         public void Warning(string content) => Add(new Log(content, LogLevel.Warning));
 
         /// <summary>
-        /// 添加调试 <see cref="LogLevel"/> 为 <see cref="LogLevel.Error"/> 的日志
+        /// 添加 <see cref="LogLevel"/> 为 <see cref="LogLevel.Error"/> 的日志
         /// </summary>
         /// <param name="content">内容</param>
         public void Error(string content) => Add(new Log(content, LogLevel.Error));
 
         /// <summary>
-        /// 添加调试 <see cref="LogLevel"/> 为 <see cref="LogLevel.Fatal"/> 的日志
+        /// 添加 <see cref="LogLevel"/> 为 <see cref="LogLevel.Fatal"/> 的日志
         /// </summary>
         /// <param name="content">内容</param>
         public void Fatal(string content) => Add(new Log(content, LogLevel.Fatal));

diff --git a/src/Models/Service.cs b/src/Models/Service.cs
@@ -34,7 +34,7 @@ public class Service
         /// <summary>
         /// <see cref="ServiceStartMode"/> 对应 <see cref="string"/> 指令词典
         /// </summary>
-        private static readonly Dictionary<ServiceStartMode, string> _serviceStartModeDictionary = new Dictionary<ServiceStartMode, string>()
+        private static readonly Dictionary<ServiceStartMode, string> _serviceStartModeDictionary = new()
         {
             [ServiceStartMode.Boot] = "boot",
             [ServiceStartMode.System] = "system",

diff --git a/src/Utilities/FolderBrowserDialogUtilities.cs b/src/Utilities/FolderBrowserDialogUtilities.cs
@@ -16,7 +16,7 @@ public static string GetFilePath(string description = "")
             var dialog = new FolderBrowserDialog() { Description = description };
             dialog.ShowDialog();
 
-            return dialog.SelectedPath.CheckEmpty();
+            return dialog.SelectedPath.IsEmptyOrNull();
         }
     }
 }