updates: add radiobutton to select All, LTS, Alpha, Beta, Add humanfriendly & custom date string release date support, Skip empty line from unity updates data (#91)

Author: unitycoder

UnityLauncherPro/Converters/ReleaseDateConverter.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace UnityLauncherPro.Converters
+{
+    [ValueConversion(typeof(DateTime), typeof(String))]
+    public class ReleaseDateConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null) return null;
+            DateTime date = (DateTime)value;
+
+            // get first part of string until space character (updates only contain mm/dd/yyyy)
+            string dateStrTrimmed = MainWindow.currentDateFormat;
+            if (dateStrTrimmed.IndexOf(' ') > -1) dateStrTrimmed = dateStrTrimmed.Split(' ')[0];
+
+            return MainWindow.useHumanFriendlyDateFormat ? Tools.GetElapsedTime(date) : date.ToString(dateStrTrimmed);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // not used ?
+            return DateTime.ParseExact((string)value, MainWindow.currentDateFormat, culture);
+        }
+
+    }
+}

UnityLauncherPro/GetUnityUpdates.cs

@@ -52,13 +52,14 @@ public static Updates[] Parse(string items)// object sender, DownloadStringCompl
             if (receivedList == null && receivedList.Length < 1) return null;
             Array.Reverse(receivedList);
             var updates = new List<Updates>();
-            // parse into data
+            // parse into data, TODO remove duplicates
             for (int i = 0, len = receivedList.Length; i < len; i++)
             {
                 var row = receivedList[i].Split(',');
                 var versionTemp = row[6].Trim('"');
+                if (versionTemp.Length < 1) continue;
                 var u = new Updates();
-                u.ReleaseDate = DateTime.ParseExact(row[3], "MM/dd/yyyy", CultureInfo.InvariantCulture); //DateTime ? lastUpdated = Tools.GetLastModifiedTime(csprojFile);
+                u.ReleaseDate = DateTime.ParseExact(row[3], "MM/dd/yyyy", CultureInfo.InvariantCulture);
                 u.Version = versionTemp;
                 updates.Add(u);
             }

UnityLauncherPro/MainWindow.xaml

@@ -10,6 +10,7 @@
         Title="UnityLauncherPro" Height="650" Width="880" WindowStartupLocation="CenterScreen" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="600" MinHeight="650" AllowsTransparency="True" WindowStyle="None" Margin="0" KeyDown="OnWindowKeyDown" Closing="Window_Closing" SizeChanged="Window_SizeChanged" Icon="Images/icon.ico" SourceInitialized="Window_SourceInitialized" MouseDown="Window_MouseDown">
     <Window.Resources>
         <converters:LastModifiedConverter x:Key="lastModifiedConverter"/>
+        <converters:ReleaseDateConverter x:Key="releaseDateConverter"/>
     </Window.Resources>
 
     <!-- UI -->
@@ -338,7 +339,6 @@
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding Text, ElementName=txtSearchBoxUpdates}" Value="">
                                                 <Setter Property="Visibility" Value="Hidden"/>
-
                                             </DataTrigger>
                                             <DataTrigger Binding="{Binding Text, ElementName=txtSearchBoxUpdates}" Value="{x:Null}">
                                                 <Setter Property="Visibility" Value="Hidden"/>
@@ -350,16 +350,28 @@
                         </Button>
                     </Grid>
 
-                    <CheckBox x:Name="chkAlphas" Content="Alpha" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="240,6,0,0" Checked="chkAlphas_Checked" Unchecked="chkAlphas_Checked"/>
-                    <CheckBox x:Name="chkBetas" Content="Beta" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="300,6,0,0" Unchecked="chkAlphas_Checked" Checked="chkAlphas_Checked"/>
+                    <RadioButton x:Name="rdoAll" Content="All" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="240,2,0,0" Checked="rdoAll_Checked" IsChecked="True" GroupName="groupUpdateFilter" />
+                    <RadioButton x:Name="rdoLTS" Content="LTS" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="287,2,0,0" Checked="rdoAll_Checked" GroupName="groupUpdateFilter" />
+                    <RadioButton x:Name="rdoAlphas" Content="Alpha" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="340,2,0,0" Checked="rdoAll_Checked" GroupName="groupUpdateFilter" />
+                    <RadioButton x:Name="rdoBetas" Content="Beta" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="400,2,0,0" Checked="rdoAll_Checked" GroupName="groupUpdateFilter" />
 
                     <Button Style="{StaticResource CustomButton}" ToolTip="Fetch released versions" x:Name="btnRefreshUpdatesList" Content="⟳" Height="22" Width="26" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16"  Margin="0,4,3,0" Padding="1,-2,1,1" BorderBrush="{x:Null}" Click="OnGetUnityUpdatesClick"/>
                     <DataGrid x:Name="dataGridUpdates"  SelectionMode="Single" Margin="4,30,2,42" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="{DynamicResource ThemeGridForeground}" HorizontalGridLinesBrush="{DynamicResource ThemeDatagridLines}" VerticalGridLinesBrush="{DynamicResource ThemeGridVerticalGridLines}" AutoGenerateColumns="False" PreviewKeyDown="DataGridUpdates_PreviewKeyDown" PreviewMouseDoubleClick="DataGridUpdates_PreviewMouseDoubleClick" Sorting="dataGridUpdates_Sorting">
                         <DataGrid.CommandBindings>
                             <CommandBinding Command="ApplicationCommands.Copy" Executed="CopyRowFolderToClipBoard" CanExecute="CanExecute_Copy"/>
                         </DataGrid.CommandBindings>
                         <DataGrid.Columns>
-                            <DataGridTextColumn Binding="{Binding ReleaseDate, StringFormat=\{0:dd/MM/yyyy\}}" ClipboardContentBinding="{x:Null}"  MinWidth="100" Header="Released" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding ReleaseDate, Converter={StaticResource releaseDateConverter}}" ClipboardContentBinding="{x:Null}"  MinWidth="100" Header="Released" IsReadOnly="True">
+                                <DataGridTextColumn.CellStyle>
+                                    <Style TargetType="DataGridCell">
+                                        <Setter Property="ToolTip">
+                                            <Setter.Value>
+                                                <TextBlock Text="{Binding ReleaseDate, StringFormat=\{0:dd/MM/yyyy\}}" />
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </DataGridTextColumn.CellStyle>
+                            </DataGridTextColumn>
                             <DataGridTextColumn Binding="{Binding Version}" ClipboardContentBinding="{x:Null}" Header="Version" IsReadOnly="True" MinWidth="222">
                                 <DataGridTextColumn.CellStyle>
                                     <Style TargetType="{x:Type DataGridCell}">

UnityLauncherPro/MainWindow.xaml.cs

@@ -297,19 +297,42 @@ private bool ProjectFilter(object item)
         private bool UpdatesFilter(object item)
         {
             Updates unity = item as Updates;
+
             bool haveSearchString = string.IsNullOrEmpty(_filterString) == false;
-            bool matchString = unity.Version.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) > -1;
+            bool matchString = haveSearchString && unity.Version.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) > -1;
+
+            bool checkedAlls = (bool)rdoAll.IsChecked;
+            bool checkedLTSs = (bool)rdoLTS.IsChecked;
+            bool checkedAlphas = (bool)rdoAlphas.IsChecked;
+            bool checkedBetas = (bool)rdoBetas.IsChecked;
 
-            bool checkedAlphas = (bool)chkAlphas.IsChecked;
-            bool checkedBetas = (bool)chkBetas.IsChecked;
+            bool matchLTS = false;
+            if (checkedLTSs)
+            {
+                var version = unity.Version.Split('.');
+                var versionInt = int.Parse(version[0]);
+                var versionMinor = int.Parse(version[1]);
+                // https://unity3d.com/unity/qa/lts-releases
+                matchLTS = (versionInt >= 2017 && versionMinor == 4) || (versionInt > 2019 && versionMinor == 3);
+            }
 
             bool matchAlphas = checkedAlphas && unity.Version.IndexOf("a", 0, StringComparison.CurrentCultureIgnoreCase) > -1;
             bool matchBetas = checkedBetas && unity.Version.IndexOf("b", 0, StringComparison.CurrentCultureIgnoreCase) > -1;
 
-            // TODO there must be simpler way : D
-            if (checkedAlphas && checkedBetas) return haveSearchString ? (matchString && (matchAlphas || matchBetas)) : (matchAlphas || matchBetas);
-            if (checkedAlphas) return haveSearchString ? matchString && matchAlphas : matchAlphas;
-            if (checkedBetas) return haveSearchString ? matchString && matchBetas : matchBetas;
+            // match search string and some radiobutton
+            if (haveSearchString)
+            {
+                if (checkedAlls) return matchString;
+                if (checkedLTSs) return matchString && matchLTS;
+                if (checkedAlphas) return matchString && matchAlphas;
+                if (checkedBetas) return matchString && matchBetas;
+            }
+            else // no search text, filter by radiobuttons
+            {
+                if (checkedAlls || matchLTS || matchAlphas || matchBetas) return true;
+            }
+
+            // fallback
             return matchString;
         }
 
@@ -621,9 +644,6 @@ async Task CallGetUnityUpdates()
             if (items == null) return;
             updatesSource = GetUnityUpdates.Parse(items);
             if (updatesSource == null) return;
-
-
-
             dataGridUpdates.ItemsSource = updatesSource;
         }
 
@@ -2816,8 +2836,6 @@ void SortHandlerUpdates(object sender, DataGridSortingEventArgs e)
             //use a ListCollectionView to do the sort.
             ListCollectionView lcv = (ListCollectionView)CollectionViewSource.GetDefaultView(dataGridUpdates.ItemsSource);
 
-            Console.WriteLine("Sorted by " + column.Header + " " + direction);
-
             comparer = new CustomUpdatesSort(direction, column.Header.ToString());
 
             //apply the sort
@@ -3178,8 +3196,9 @@ private void txtMaxProjectCount_TextChanged(object sender, TextChangedEventArgs
             }
         }
 
-        private void chkAlphas_Checked(object sender, RoutedEventArgs e)
+        private void rdoAll_Checked(object sender, RoutedEventArgs e)
         {
+            if (this.IsActive == false) return; // dont run code on window init
             FilterUpdates();
         }
 

UnityLauncherPro/UnityLauncherPro.csproj

@@ -80,6 +80,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Converters\ReleaseDateConverter.cs" />
     <Compile Include="Converters\LastModifiedConverter.cs" />
     <Compile Include="Data\BuildReport.cs" />
     <Compile Include="Data\BuildReportItem.cs" />