binConfigs only deletes test files periodically

5fed566a32

v2rayN/ServiceLib/Common/Extension.cs

@@ -118,4 +118,20 @@ public static class Extension
             destination.Add(item);
         }
     }
+
+    /// <summary>
+    /// Replace all cross-platform newline characters with the specified string
+    /// </summary>
+    public static string ReplaceLineBreaks(this string input, string replacement)
+    {
+        if (string.IsNullOrEmpty(input))
+        {
+            return input;
+        }
+
+        // You must replace \r\n first, and then replace the single characters \r and \n.
+        return input.Replace("\r\n", replacement)
+                    .Replace("\r", replacement)
+                    .Replace("\n", replacement);
+    }
 }

v2rayN/ServiceLib/Common/FileUtils.cs

@@ -202,7 +202,7 @@ public static class FileUtils
         }
     }
 
-    public static void DeleteExpiredFiles(string sourceDir, DateTime dtLine)
+    public static void DeleteExpiredFiles(string sourceDir, DateTime dtLine, string? contains = null)
     {
         try
         {
@@ -214,6 +214,10 @@ public static class FileUtils
                 {
                     continue;
                 }
+                if (contains.IsNotEmpty() && !file.Name.Contains(contains))
+                {
+                    continue;
+                }
                 file.Delete();
             }
         }

v2rayN/ServiceLib/Common/Utils.cs

@@ -51,7 +51,7 @@ public class Utils
 
         try
         {
-            str = str.Replace(Environment.NewLine, string.Empty);
+            str = str.ReplaceLineBreaks(string.Empty);
             return new List<string>(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
         }
         catch (Exception ex)
@@ -114,9 +114,7 @@ public class Utils
             }
 
             plainText = plainText.Trim()
-                .Replace(Environment.NewLine, "")
-                .Replace("\n", "")
-                .Replace("\r", "")
+                .ReplaceLineBreaks("")
                 .Replace('_', '/')
                 .Replace('-', '+')
                 .Replace(" ", "");
@@ -321,7 +319,9 @@ public class Utils
             return text;
         }
 
-        return text.Replace("，", ",").Replace(Environment.NewLine, ",");
+        return text.Replace("，", ",")
+                    .Replace(" ", "")
+                    .ReplaceLineBreaks(",");
     }
 
     public static List<string> GetEnumNames<TEnum>() where TEnum : Enum

v2rayN/ServiceLib/Manager/TaskManager.cs

@@ -56,7 +56,7 @@ public class TaskManager
             {
                 //Logging.SaveLog("Execute delete expired files");
 
-                FileUtils.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1));
+                FileUtils.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1), "Test");
                 FileUtils.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
                 FileUtils.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
 

v2rayN/v2rayN.Desktop/Base/WindowBase.cs

@@ -4,6 +4,7 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
 {
     public WindowBase()
     {
+        Initialized += OnWindowInitialized;
         Loaded += OnLoaded;
     }
 
@@ -12,30 +13,33 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
         throw new NotImplementedException();
     }
 
-    protected virtual void OnLoaded(object? sender, RoutedEventArgs e)
+    private void OnWindowInitialized(object? sender, EventArgs e)
     {
         try
         {
             var sizeItem = ConfigHandler.GetWindowSizeItem(AppManager.Instance.Config, GetType().Name);
-            if (sizeItem == null)
+            if (sizeItem is null)
             {
                 return;
             }
 
-            Width = sizeItem.Width;
-            Height = sizeItem.Height;
+            if (sizeItem.Width > 0 && !Width.Equals(sizeItem.Width))
+            {
+                Width = sizeItem.Width;
+            }
 
-            var workingArea = (Screens.ScreenFromWindow(this) ?? Screens.Primary).WorkingArea;
-            var scaling = (Utils.IsMacOS() ? null : VisualRoot?.RenderScaling) ?? 1.0;
-
-            var x = workingArea.X + ((workingArea.Width - (Width * scaling)) / 2);
-            var y = workingArea.Y + ((workingArea.Height - (Height * scaling)) / 2);
-
-            Position = new PixelPoint((int)x, (int)y);
+            if (sizeItem.Height > 0 && !Height.Equals(sizeItem.Height))
+            {
+                Height = sizeItem.Height;
+            }
         }
         catch { }
     }
 
+    protected virtual void OnLoaded(object? sender, RoutedEventArgs e)
+    {
+    }
+
     protected override void OnClosed(EventArgs e)
     {
         base.OnClosed(e);