Only add package to the list if the version matches...

the latest version. This makes it so that we don't have to delete rows from the datagridview afterward, but the actual newest version isn't being shown for packages like AdoptOpenJDK.OpenJDK yet.
DrewNaylor · Oct 5, 2020 · 2fc8273 · 2fc8273
1 parent 76f1b4b
commit 2fc8273
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/guinget/App.config b/guinget/App.config
@@ -50,10 +50,10 @@
         <value>True</value>
       </setting>
       <setting name="DebuggingBypassCacheUpdate" serializeAs="String">
-        <value>False</value>
+        <value>True</value>
       </setting>
       <setting name="OnlyDisplayLatestPackageVersion" serializeAs="String">
-        <value>False</value>
+        <value>True</value>
       </setting>
     </guinget.My.MySettings>
   </userSettings>

diff --git a/guinget/MainWindow.vb b/guinget/MainWindow.vb
@@ -114,8 +114,13 @@ Public Class aaformMainWindow
             'MessageBox.Show(SqliteList.Rows.Item(0).ToString)
             'aaformMainWindow.datagridviewPackageList.DataSource = SqliteList
             For Each PackageRow As DataRow In SqliteList.Rows
-                aaformMainWindow.datagridviewPackageList.Rows.Add("Do nothing", "Unknown", PackageRow.Item(0), PackageRow.Item(1), PackageRow.Item(2), PackageRow.Item(3), "Loading...", "Loading...")
-
+                If My.Settings.OnlyDisplayLatestPackageVersion = True Then
+                    If PackageRow.Item(2).ToString = PackageRow.Item(3).ToString Then
+                        aaformMainWindow.datagridviewPackageList.Rows.Add("Do nothing", "Unknown", PackageRow.Item(0), PackageRow.Item(1), PackageRow.Item(2), PackageRow.Item(3), "Loading...", "Loading...")
+                    End If
+                Else
+                        aaformMainWindow.datagridviewPackageList.Rows.Add("Do nothing", "Unknown", PackageRow.Item(0), PackageRow.Item(1), PackageRow.Item(2), PackageRow.Item(3), "Loading...", "Loading...")
+                End If
                 ' Make the progress bar progress.
                 aaformMainWindow.toolstripprogressbarLoadingPackages.PerformStep()
                 ' Update the statusbar to show the current info.
@@ -188,19 +193,22 @@ Public Class aaformMainWindow
         ' Reset progress bar to 0.
         aaformMainWindow.toolstripprogressbarLoadingPackages.Value = 0
 
-        If My.Settings.OnlyDisplayLatestPackageVersion = True Then
+        'If My.Settings.OnlyDisplayLatestPackageVersion = True Then
 
-            For Each column As DataGridViewColumn In aaformMainWindow.datagridviewPackageList.Columns
-                column.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet
-            Next
+        '    For Each column As DataGridViewColumn In aaformMainWindow.datagridviewPackageList.Columns
+        '        column.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet
+        '    Next
 
-            For Each PackageRow As DataGridViewRow In aaformMainWindow.datagridviewPackageList.Rows
-                If Not PackageRow.Cells.Item(4).Value.ToString = PackageRow.Cells.Item(5).Value.ToString Then
-                    aaformMainWindow.datagridviewPackageList.Rows.Remove(PackageRow)
-                End If
-            Next
+        '    For Each PackageRow As DataGridViewRow In aaformMainWindow.datagridviewPackageList.Rows
+        '        If Not PackageRow.Cells.Item(4).Value.ToString = PackageRow.Cells.Item(5).Value.ToString Then
+        '            'MessageBox.Show(PackageRow.Cells.Item(2).Value.ToString & ":" & vbCrLf &
+        '            '                "Outdated version: " & PackageRow.Cells.Item(4).Value.ToString & vbCrLf &
+        '            '                "Latest version: " & PackageRow.Cells.Item(5).Value.ToString)
+        '            aaformMainWindow.datagridviewPackageList.Rows.Remove(PackageRow)
+        '        End If
+        '    Next
 
-        End If
+        'End If
 
         ' Update the main window again.
         aaformMainWindow.Update()