Clean Codes

HandyOrg · Apr 4, 2021 · 907a389 · 907a389
1 parent bdf335c
commit 907a389
Show file tree

Hide file tree

Showing 5 changed files with 300 additions and 205 deletions.
diff --git a/src/HandyWinget/Assets/Consts.cs b/src/HandyWinget/Assets/Consts.cs
@@ -3,7 +3,7 @@
 
 namespace HandyWinget.Assets
 {
-    public abstract class Consts
+    public static class Consts
     {
         public static readonly string AppName = "HandyWinGet";
         public static readonly string VersionKey = "VersionCode";

diff --git a/src/HandyWinget/Assets/Helper.cs b/src/HandyWinget/Assets/Helper.cs
@@ -13,7 +13,7 @@
 
 namespace HandyWinget.Assets
 {
-    public abstract class Helper
+    public static class Helper
     {
         public static ISettings Settings = JsonSettings.Load<ISettings>().EnableAutosave();
 
@@ -114,11 +114,14 @@ public static IEnumerable<string> EnumerateManifest(string rootDirectory)
                 }
             }
         }
+
+        #region Find Installed App from Registry
         private static readonly List<string> _keys = new()
         {
             @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",
             @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
         };
+
         private static List<InstalledAppModel> _installedApps = new();
 
         public static List<InstalledAppModel> GetInstalledApps()
@@ -160,6 +163,10 @@ private static void FindInstalledApps(RegistryKey regKey, List<string> keys, Lis
                 }
             }
         }
+
+        #endregion
+
+        #region Uninstall Package
         public static bool UninstallPackage(string packageName)
         {
             var result = FindUninstallString(RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64), packageName);
@@ -207,6 +214,7 @@ private static string MakeUninstallString(string uninstallstring)
 
             return uninstallstring;
         }
+
         private static (bool, string) FindUninstallString(RegistryKey regKey, string packageName)
         {
             foreach (var key in _keys)
@@ -236,6 +244,8 @@ private static (bool, string) FindUninstallString(RegistryKey regKey, string pac
             return (false, string.Empty);
         }
 
+        #endregion
+
         public static string RemoveComment(string url)
         {
             var index = url.IndexOf("#");
@@ -263,6 +273,7 @@ public static void DownloadWithIDM(string link)
                 Growl.ErrorGlobal("Internet Download Manager (IDM) is not installed on your system, please download and install it first");
             }
         }
+
         public static string GetExtension(string url)
         {
             var ext = Path.GetExtension(url);

diff --git a/src/HandyWinget/Views/CreatePackage.xaml.cs b/src/HandyWinget/Views/CreatePackage.xaml.cs
@@ -22,28 +22,31 @@ namespace HandyWinget.Views
     /// </summary>
     public partial class CreatePackage : UserControl, INotifyPropertyChanged
     {
+        #region INotify
         public event PropertyChangedEventHandler PropertyChanged;
         private void RaisePropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        private ObservableCollection<Installer> installers = new ObservableCollection<Installer>();
+        #endregion
 
+        private ObservableCollection<Installer> installers = new ObservableCollection<Installer>();
         public ObservableCollection<Installer> Installers
         {
             get { return installers; }
             set 
             { 
                 installers = value;
-                RaisePropertyChanged();
+                RaisePropertyChanged(nameof(installers));
             }
         }
 
         public CreatePackage()
         {
             InitializeComponent();
             DataContext = this;
+
             if (Helper.IsWingetInstalled())
             {
                 btnValidate.IsEnabled = true;
@@ -89,12 +92,14 @@ public void ClearInputs()
             prgStatus.Value = 0;
             Installers.Clear();
         }
+
         public void GenerateScript()
         {
             try
             {
-                if (!string.IsNullOrEmpty(txtAppName.Text) && !string.IsNullOrEmpty(txtPublisher.Text) && !string.IsNullOrEmpty(txtId.Text) && !string.IsNullOrEmpty(txtVersion.Text)
-                                               && !string.IsNullOrEmpty(txtLicense.Text) && !string.IsNullOrEmpty(txtUrl.Text) && txtUrl.Text.IsUrl())
+                if (!string.IsNullOrEmpty(txtAppName.Text) && !string.IsNullOrEmpty(txtPublisher.Text) &&
+                    !string.IsNullOrEmpty(txtId.Text) && !string.IsNullOrEmpty(txtVersion.Text) && 
+                    !string.IsNullOrEmpty(txtLicense.Text) && !string.IsNullOrEmpty(txtUrl.Text) && txtUrl.Text.IsUrl())
                 {
                     var versionBuilder = new ExportVersionModel
                     {
@@ -154,8 +159,9 @@ public void GenerateScript(GenerateScriptMode mode)
         {
             try
             {
-                if (!string.IsNullOrEmpty(txtAppName.Text) && !string.IsNullOrEmpty(txtPublisher.Text) && !string.IsNullOrEmpty(txtId.Text) && !string.IsNullOrEmpty(txtVersion.Text)
-                                               && !string.IsNullOrEmpty(txtLicense.Text) && !string.IsNullOrEmpty(txtUrl.Text) && txtUrl.Text.IsUrl())
+                if (!string.IsNullOrEmpty(txtAppName.Text) && !string.IsNullOrEmpty(txtPublisher.Text) && 
+                    !string.IsNullOrEmpty(txtId.Text) && !string.IsNullOrEmpty(txtVersion.Text) && 
+                    !string.IsNullOrEmpty(txtLicense.Text) && !string.IsNullOrEmpty(txtUrl.Text) && txtUrl.Text.IsUrl())
                 {
                     var builder = new YamlPackageModel
                     {

diff --git a/src/HandyWinget/Views/General.xaml.cs b/src/HandyWinget/Views/General.xaml.cs
@@ -33,10 +33,10 @@ private void LoadInitialSettings()
             switch (Settings.InstallMode)
             {
                 case InstallMode.Wingetcli:
-                    tgIDM.Visibility = System.Windows.Visibility.Collapsed;
+                    tgIDM.Visibility = Visibility.Collapsed;
                     break;
                 case InstallMode.Internal:
-                    tgIDM.Visibility = System.Windows.Visibility.Visible;
+                    tgIDM.Visibility = Visibility.Visible;
                     break;
             }