code clean

JusterZhu · JusterZhu · commit fe8b35059fe6 · 2023-03-01T21:45:34.000+08:00
diff --git a/src/c#/GeneralUpdate.Infrastructure/DataServices/Http/HttpService.cs b/src/c#/GeneralUpdate.Infrastructure/DataServices/Http/HttpService.cs
@@ -9,9 +9,9 @@ public sealed class HttpService
         private static object _lock = new object();
         private JsonSerializerOptions _serializerOptions;
 
-        public static HttpService Instance 
+        public static HttpService Instance
         {
-            get 
+            get
             {
                 if (_instance == null)
                 {
@@ -20,8 +20,8 @@ public static HttpService Instance
                         if (_instance == null) _instance = new HttpService();
                     }
                 }
-                return _instance; 
-            } 
+                return _instance;
+            }
         }
 
         /// <summary>
@@ -33,7 +33,7 @@ public static HttpService Instance
         /// <param name="filePath"></param>
         /// <param name="reponseCallback"></param>
         /// <returns></returns>
-        public async Task PostFileRequest<T>(string url, Dictionary<string, string> parameters, string filePath , Action<T> reponseCallback) where T : class
+        public async Task PostFileRequest<T>(string url, Dictionary<string, string> parameters, string filePath, Action<T> reponseCallback) where T : class
         {
             try
             {
@@ -44,7 +44,7 @@ public async Task PostFileRequest<T>(string url, Dictionary<string, string> para
                     using (var client = new HttpClient())
                     {
                         var message = new HttpRequestMessage(HttpMethod.Post, url);
-                        message.Content = MultipartFormDataContentProvider.CreateContent(bytes,Path.GetFileName(filePath), parameters);
+                        message.Content = MultipartFormDataContentProvider.CreateContent(bytes, Path.GetFileName(filePath), parameters);
                         var responseMessage = await client.SendAsync(message);
                         if (responseMessage.IsSuccessStatusCode)
                         {
@@ -62,4 +62,4 @@ public async Task PostFileRequest<T>(string url, Dictionary<string, string> para
             }
         }
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.Infrastructure/DataServices/Http/MultipartFormDataContentProvider.cs b/src/c#/GeneralUpdate.Infrastructure/DataServices/Http/MultipartFormDataContentProvider.cs
@@ -49,4 +49,4 @@ private static List<ByteArrayContent> CreateParamsByteArrayContent(IDictionary<s
             return list;
         }
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.Infrastructure/DataServices/Pick/IFolderPickerService.cs b/src/c#/GeneralUpdate.Infrastructure/DataServices/Pick/IFolderPickerService.cs
@@ -4,4 +4,4 @@ public interface IFolderPickerService
     {
         Task<string> PickFolderTaskAsync();
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.Infrastructure/MVVM/IViewModel.cs b/src/c#/GeneralUpdate.Infrastructure/MVVM/IViewModel.cs
@@ -1,15 +1,9 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeneralUpdate.Infrastructure.MVVM
+﻿namespace GeneralUpdate.Infrastructure.MVVM
 {
     public interface IViewModel
     {
         void Enter();
 
         void Exit();
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.Infrastructure/MVVM/MessageToken.cs b/src/c#/GeneralUpdate.Infrastructure/MVVM/MessageToken.cs
@@ -4,4 +4,4 @@ public class MessageToken
     {
         public const string FilesMessageToken = "FilesMessageToken";
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.Infrastructure/MVVM/ViewModeBase.cs b/src/c#/GeneralUpdate.Infrastructure/MVVM/ViewModeBase.cs
@@ -1,9 +1,4 @@
 ﻿using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GeneralUpdate.Infrastructure.MVVM
 {
@@ -19,4 +14,4 @@ public void Exit()
             throw new NotImplementedException();
         }
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.PacketTool/Models/VersionTmplateModel.cs b/src/c#/GeneralUpdate.PacketTool/Models/VersionTmplateModel.cs
@@ -27,4 +27,4 @@ public class VersionTmplateModel
         /// </summary>
         public string Url { get; set; }
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.PacketTool/Services/MainService.cs b/src/c#/GeneralUpdate.PacketTool/Services/MainService.cs
@@ -4,17 +4,17 @@ namespace GeneralUpdate.PacketTool.Services
 {
     public class MainService
     {
-        public async Task PostUpgradPakcet<T>(string remoteUrl, string filePath, int clientType, string version, string clientAppKey,string md5,Action<T> reponseCallback) where T : class 
+        public async Task PostUpgradPakcet<T>(string remoteUrl, string filePath, int clientType, string version, string clientAppKey, string md5, Action<T> reponseCallback) where T : class
         {
-            if(string.IsNullOrEmpty(remoteUrl)) remoteUrl = "http://127.0.0.1:5001/upload";
+            if (string.IsNullOrEmpty(remoteUrl)) remoteUrl = "http://127.0.0.1:5001/upload";
             var parameters = new Dictionary<string, string>
             {
                 { "clientType", clientType.ToString() },
                 { "version", version },
                 { "clientAppKey", clientAppKey },
                 { "md5", md5 }
             };
-            await HttpService.Instance.PostFileRequest<T>(remoteUrl,parameters, filePath, reponseCallback);
+            await HttpService.Instance.PostFileRequest<T>(remoteUrl, parameters, filePath, reponseCallback);
         }
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.PacketTool/ViewModels/MainViewModel.cs b/src/c#/GeneralUpdate.PacketTool/ViewModels/MainViewModel.cs
@@ -18,7 +18,7 @@ public class MainViewModel : ViewModeBase
         #region Private Members
 
         private string sourcePath, targetPath, patchPath, infoMessage, url, packetName;
-        private List<string> _formats, _encodings,_appTypes;
+        private List<string> _formats, _encodings, _appTypes;
         private string _currentFormat, _currentEncoding, _currnetAppType, _currentVersion, _currentClientAppKey;
         private bool isPublish;
         private AsyncRelayCommand buildCommand;
@@ -28,11 +28,11 @@ public class MainViewModel : ViewModeBase
         private MainService _mainService;
         private const string _jsonTemplateFileName = "version.json";
 
-        #endregion
+        #endregion Private Members
 
         #region Constructors
 
-        public MainViewModel(IFolderPickerService folderPickerService) 
+        public MainViewModel(IFolderPickerService folderPickerService)
         {
             _folderPickerService = folderPickerService;
             _mainService = new MainService();
@@ -42,7 +42,7 @@ public MainViewModel(IFolderPickerService folderPickerService)
             CurrnetAppType = AppTypes.First();
         }
 
-        #endregion
+        #endregion Constructors
 
         #region Public Properties
 
@@ -64,14 +64,14 @@ public AsyncRelayCommand BuildCommand
             get => buildCommand ?? (buildCommand = new AsyncRelayCommand(BuildPacketCallback));
         }
 
-        public AsyncRelayCommand BuildJsonCommand 
+        public AsyncRelayCommand BuildJsonCommand
         {
-            get => buildJsonCommand ?? (buildJsonCommand = new AsyncRelayCommand(BuildJsonCallback)); 
+            get => buildJsonCommand ?? (buildJsonCommand = new AsyncRelayCommand(BuildJsonCallback));
         }
 
         public List<string> AppTypes
         {
-            get 
+            get
             {
                 if (_appTypes == null)
                 {
@@ -100,11 +100,11 @@ public List<string> Formats
             }
         }
 
-        public List<string> Encodings 
+        public List<string> Encodings
         {
-            get 
+            get
             {
-                if (_currentEncoding == null) 
+                if (_currentEncoding == null)
                 {
                     _encodings = new List<string>
                     {
@@ -122,28 +122,29 @@ public List<string> Encodings
             }
         }
 
-        public string CurrentFormat { 
+        public string CurrentFormat
+        {
             get => _currentFormat;
-            set => SetProperty(ref _currentFormat, value); 
+            set => SetProperty(ref _currentFormat, value);
         }
 
         public string CurrentEncoding
         {
-            get => _currentEncoding; 
+            get => _currentEncoding;
             set => SetProperty(ref _currentEncoding, value);
         }
 
-        public string CurrnetAppType 
-        { 
-            get => _currnetAppType; 
-            set => SetProperty(ref _currnetAppType, value); 
+        public string CurrnetAppType
+        {
+            get => _currnetAppType;
+            set => SetProperty(ref _currnetAppType, value);
         }
 
         public string CurrentVersion { get => _currentVersion; set => SetProperty(ref _currentVersion, value); }
 
         public string CurrentClientAppKey { get => _currentClientAppKey; set => SetProperty(ref _currentClientAppKey, value); }
-       
-        #endregion
+
+        #endregion Public Properties
 
         #region Private Methods
 
@@ -164,9 +165,11 @@ private async Task SelectFolderAction(string value)
                 case "Source":
                     SourcePath = pickerResult;
                     break;
+
                 case "Target":
                     TargetPath = pickerResult;
                     break;
+
                 case "Patch":
                     PatchPath = pickerResult;
                     break;
@@ -192,20 +195,20 @@ private async Task BuildPacketCallback()
 
             try
             {
-                await DifferentialCore.Instance.Clean(SourcePath, TargetPath, PatchPath, (sender, args) =>{},
-                    String2OperationType(CurrentFormat),String2Encoding(CurrentEncoding), PacketName);
+                await DifferentialCore.Instance.Clean(SourcePath, TargetPath, PatchPath, (sender, args) => { },
+                    String2OperationType(CurrentFormat), String2Encoding(CurrentEncoding), PacketName);
                 if (IsPublish)
                 {
-                    var packetPath = Path.Combine(TargetPath,$"{PacketName}{CurrentFormat}");
-                    if (!File.Exists(packetPath)) 
+                    var packetPath = Path.Combine(TargetPath, $"{PacketName}{CurrentFormat}");
+                    if (!File.Exists(packetPath))
                     {
                         await Shell.Current.DisplayAlert("Build options", $"The package was not found in the following path {packetPath} !", "cancel");
                         return;
                     }
                     var md5 = FileUtil.GetFileMD5(packetPath);
-                    await _mainService.PostUpgradPakcet<UploadReapDTO>(Url,packetPath, String2AppType(CurrnetAppType), CurrentVersion,CurrentClientAppKey, md5, async (resp) =>
+                    await _mainService.PostUpgradPakcet<UploadReapDTO>(Url, packetPath, String2AppType(CurrnetAppType), CurrentVersion, CurrentClientAppKey, md5, async (resp) =>
                     {
-                        if (resp == null) 
+                        if (resp == null)
                         {
                             await Shell.Current.DisplayAlert("Build options", "Upload failed !", "cancel");
                             return;
@@ -270,7 +273,7 @@ private async Task BuildVersionTemplate<T>(string path, T content) where T : cla
             if (File.Exists(path)) await Shell.Current.DisplayAlert("Build options", "Generated successfully !", "ok");
         }
 
-        private bool ValidationParameters() => (string.IsNullOrEmpty(SourcePath) || string.IsNullOrEmpty(TargetPath) || string.IsNullOrEmpty(PatchPath) || 
+        private bool ValidationParameters() => (string.IsNullOrEmpty(SourcePath) || string.IsNullOrEmpty(TargetPath) || string.IsNullOrEmpty(PatchPath) ||
             string.IsNullOrEmpty(PacketName) || string.IsNullOrEmpty(CurrentFormat) || string.IsNullOrEmpty(CurrentEncoding));
 
         private bool ValidationFolder() => (!Directory.Exists(SourcePath) || !Directory.Exists(TargetPath) || !Directory.Exists(PatchPath));
@@ -283,24 +286,31 @@ private Encoding String2Encoding(string encoding)
                 case "Default":
                     result = Encoding.Default;
                     break;
+
                 case "UTF8":
                     result = Encoding.UTF8;
                     break;
+
                 case "UTF7":
                     result = Encoding.UTF7;
                     break;
+
                 case "Unicode":
                     result = Encoding.Unicode;
                     break;
+
                 case "UTF32":
                     result = Encoding.UTF32;
                     break;
+
                 case "BigEndianUnicode":
                     result = Encoding.BigEndianUnicode;
                     break;
+
                 case "Latin1":
                     result = Encoding.Latin1;
                     break;
+
                 case "ASCII":
                     result = Encoding.ASCII;
                     break;
@@ -316,6 +326,7 @@ private OperationType String2OperationType(string type)
                 case "ZIP":
                     result = Zip.Factory.OperationType.GZip;
                     break;
+
                 case "7Z":
                     result = Zip.Factory.OperationType.G7z;
                     break;
@@ -331,13 +342,14 @@ private int String2AppType(string appType)
                 case "Client":
                     result = 1;
                     break;
+
                 case "UTF8":
                     result = 2;
                     break;
             }
             return result;
         }
 
-        #endregion
+        #endregion Private Methods
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ public sealed class HttpService`
`9`	`9`	`private static object _lock = new object();`
`10`	`10`	`private JsonSerializerOptions _serializerOptions;`
`11`	`11`
`12`		`- public static HttpService Instance`
	`12`	`+ public static HttpService Instance`
`13`	`13`	`{`
`14`		`- get`
	`14`	`+ get`
`15`	`15`	`{`
`16`	`16`	`if (_instance == null)`
`17`	`17`	`{`
`@@ -20,8 +20,8 @@ public static HttpService Instance`
`20`	`20`	`if (_instance == null) _instance = new HttpService();`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`- return _instance;`
`24`		`- }`
	`23`	`+ return _instance;`
	`24`	`+ }`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/// <summary>`
`@@ -33,7 +33,7 @@ public static HttpService Instance`
`33`	`33`	`/// <param name="filePath"></param>`
`34`	`34`	`/// <param name="reponseCallback"></param>`
`35`	`35`	`/// <returns></returns>`
`36`		`- public async Task PostFileRequest<T>(string url, Dictionary<string, string> parameters, string filePath , Action<T> reponseCallback) where T : class`
	`36`	`+ public async Task PostFileRequest<T>(string url, Dictionary<string, string> parameters, string filePath, Action<T> reponseCallback) where T : class`
`37`	`37`	`{`
`38`	`38`	`try`
`39`	`39`	`{`
`@@ -44,7 +44,7 @@ public async Task PostFileRequest<T>(string url, Dictionary<string, string> para`
`44`	`44`	`using (var client = new HttpClient())`
`45`	`45`	`{`
`46`	`46`	`var message = new HttpRequestMessage(HttpMethod.Post, url);`
`47`		`- message.Content = MultipartFormDataContentProvider.CreateContent(bytes,Path.GetFileName(filePath), parameters);`
	`47`	`+ message.Content = MultipartFormDataContentProvider.CreateContent(bytes, Path.GetFileName(filePath), parameters);`
`48`	`48`	`var responseMessage = await client.SendAsync(message);`
`49`	`49`	`if (responseMessage.IsSuccessStatusCode)`
`50`	`50`	`{`
`@@ -62,4 +62,4 @@ public async Task PostFileRequest<T>(string url, Dictionary<string, string> para`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`
`65`		`-}`
	`65`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,4 @@ private static List<ByteArrayContent> CreateParamsByteArrayContent(IDictionary<s`
`49`	`49`	`return list;`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`-}`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ public interface IFolderPickerService`
`4`	`4`	`{`
`5`	`5`	`Task<string> PickFolderTaskAsync();`
`6`	`6`	`}`
`7`		`-}`
	`7`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,9 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
`6`		`-`
`7`		`-namespace GeneralUpdate.Infrastructure.MVVM`
	`1`	`+namespace GeneralUpdate.Infrastructure.MVVM`
`8`	`2`	`{`
`9`	`3`	`public interface IViewModel`
`10`	`4`	`{`
`11`	`5`	`void Enter();`
`12`	`6`
`13`	`7`	`void Exit();`
`14`	`8`	`}`
`15`		`-}`
	`9`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ public class MessageToken`
`4`	`4`	`{`
`5`	`5`	`public const string FilesMessageToken = "FilesMessageToken";`
`6`	`6`	`}`
`7`		`-}`
	`7`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,4 @@`
`1`	`1`	`using CommunityToolkit.Mvvm.ComponentModel;`
`2`		`-using System;`
`3`		`-using System.Collections.Generic;`
`4`		`-using System.Linq;`
`5`		`-using System.Text;`
`6`		`-using System.Threading.Tasks;`
`7`	`2`
`8`	`3`	`namespace GeneralUpdate.Infrastructure.MVVM`
`9`	`4`	`{`
`@@ -19,4 +14,4 @@ public void Exit()`
`19`	`14`	`throw new NotImplementedException();`
`20`	`15`	`}`
`21`	`16`	`}`
`22`		`-}`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,4 @@ public class VersionTmplateModel`
`27`	`27`	`/// </summary>`
`28`	`28`	`public string Url { get; set; }`
`29`	`29`	`}`
`30`		`-}`
	`30`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,17 +4,17 @@ namespace GeneralUpdate.PacketTool.Services`
`4`	`4`	`{`
`5`	`5`	`public class MainService`
`6`	`6`	`{`
`7`		`- public async Task PostUpgradPakcet<T>(string remoteUrl, string filePath, int clientType, string version, string clientAppKey,string md5,Action<T> reponseCallback) where T : class`
	`7`	`+ public async Task PostUpgradPakcet<T>(string remoteUrl, string filePath, int clientType, string version, string clientAppKey, string md5, Action<T> reponseCallback) where T : class`
`8`	`8`	`{`
`9`		`- if(string.IsNullOrEmpty(remoteUrl)) remoteUrl = "http://127.0.0.1:5001/upload";`
	`9`	`+ if (string.IsNullOrEmpty(remoteUrl)) remoteUrl = "http://127.0.0.1:5001/upload";`
`10`	`10`	`var parameters = new Dictionary<string, string>`
`11`	`11`	`{`
`12`	`12`	`{ "clientType", clientType.ToString() },`
`13`	`13`	`{ "version", version },`
`14`	`14`	`{ "clientAppKey", clientAppKey },`
`15`	`15`	`{ "md5", md5 }`
`16`	`16`	`};`
`17`		`- await HttpService.Instance.PostFileRequest<T>(remoteUrl,parameters, filePath, reponseCallback);`
	`17`	`+ await HttpService.Instance.PostFileRequest<T>(remoteUrl, parameters, filePath, reponseCallback);`
`18`	`18`	`}`
`19`	`19`	`}`
`20`		`-}`
	`20`	`+}`