Skip to content

Commit 85fad63

Browse files
unitycoderunitycoder
committed
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)
1 parent 9244b37 commit 85fad63

File tree

5 files changed

+81
-19
lines changed

5 files changed

+81
-19
lines changed

‎UnityLauncherPro/Converters/ReleaseDateConverter.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using System;
2+
using System.Globalization;
3+
using System.Windows.Data;
4+
5+
namespace UnityLauncherPro.Converters
6+
{
7+
[ValueConversion(typeof(DateTime), typeof(String))]
8+
public class ReleaseDateConverter : IValueConverter
9+
{
10+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
11+
{
12+
if (value == null) return null;
13+
DateTime date = (DateTime)value;
14+
15+
// get first part of string until space character (updates only contain mm/dd/yyyy)
16+
string dateStrTrimmed = MainWindow.currentDateFormat;
17+
if (dateStrTrimmed.IndexOf(' ') > -1) dateStrTrimmed = dateStrTrimmed.Split(' ')[0];
18+
19+
return MainWindow.useHumanFriendlyDateFormat ? Tools.GetElapsedTime(date) : date.ToString(dateStrTrimmed);
20+
}
21+
22+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
23+
{
24+
// not used ?
25+
return DateTime.ParseExact((string)value, MainWindow.currentDateFormat, culture);
26+
}
27+
28+
}
29+
}

‎UnityLauncherPro/GetUnityUpdates.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,14 @@ public static Updates[] Parse(string items)// object sender, DownloadStringCompl
5252
if (receivedList == null && receivedList.Length < 1) return null;
5353
Array.Reverse(receivedList);
5454
var updates = new List<Updates>();
55-
// parse into data
55+
// parse into data, TODO remove duplicates
5656
for (int i = 0, len = receivedList.Length; i < len; i++)
5757
{
5858
var row = receivedList[i].Split(',');
5959
var versionTemp = row[6].Trim('"');
60+
if (versionTemp.Length < 1) continue;
6061
var u = new Updates();
61-
u.ReleaseDate = DateTime.ParseExact(row[3], "MM/dd/yyyy", CultureInfo.InvariantCulture); //DateTime ? lastUpdated = Tools.GetLastModifiedTime(csprojFile);
62+
u.ReleaseDate = DateTime.ParseExact(row[3], "MM/dd/yyyy", CultureInfo.InvariantCulture);
6263
u.Version = versionTemp;
6364
updates.Add(u);
6465
}

‎UnityLauncherPro/MainWindow.xaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
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">
1111
<Window.Resources>
1212
<converters:LastModifiedConverter x:Key="lastModifiedConverter"/>
13+
<converters:ReleaseDateConverter x:Key="releaseDateConverter"/>
1314
</Window.Resources>
1415

1516
<!-- UI -->
@@ -338,7 +339,6 @@
338339
<Style.Triggers>
339340
<DataTrigger Binding="{Binding Text, ElementName=txtSearchBoxUpdates}" Value="">
340341
<Setter Property="Visibility" Value="Hidden"/>
341-
342342
</DataTrigger>
343343
<DataTrigger Binding="{Binding Text, ElementName=txtSearchBoxUpdates}" Value="{x:Null}">
344344
<Setter Property="Visibility" Value="Hidden"/>
@@ -350,16 +350,28 @@
350350
</Button>
351351
</Grid>
352352

353-
<CheckBox x:Name="chkAlphas" Content="Alpha" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="240,6,0,0" Checked="chkAlphas_Checked" Unchecked="chkAlphas_Checked"/>
354-
<CheckBox x:Name="chkBetas" Content="Beta" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="300,6,0,0" Unchecked="chkAlphas_Checked" Checked="chkAlphas_Checked"/>
353+
<RadioButton x:Name="rdoAll" Content="All" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="240,2,0,0" Checked="rdoAll_Checked" IsChecked="True" GroupName="groupUpdateFilter" />
354+
<RadioButton x:Name="rdoLTS" Content="LTS" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="287,2,0,0" Checked="rdoAll_Checked" GroupName="groupUpdateFilter" />
355+
<RadioButton x:Name="rdoAlphas" Content="Alpha" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="340,2,0,0" Checked="rdoAll_Checked" GroupName="groupUpdateFilter" />
356+
<RadioButton x:Name="rdoBetas" Content="Beta" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="400,2,0,0" Checked="rdoAll_Checked" GroupName="groupUpdateFilter" />
355357

356358
<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"/>
357359
<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">
358360
<DataGrid.CommandBindings>
359361
<CommandBinding Command="ApplicationCommands.Copy" Executed="CopyRowFolderToClipBoard" CanExecute="CanExecute_Copy"/>
360362
</DataGrid.CommandBindings>
361363
<DataGrid.Columns>
362-
<DataGridTextColumn Binding="{Binding ReleaseDate, StringFormat=\{0:dd/MM/yyyy\}}" ClipboardContentBinding="{x:Null}" MinWidth="100" Header="Released" IsReadOnly="True"/>
364+
<DataGridTextColumn Binding="{Binding ReleaseDate, Converter={StaticResource releaseDateConverter}}" ClipboardContentBinding="{x:Null}" MinWidth="100" Header="Released" IsReadOnly="True">
365+
<DataGridTextColumn.CellStyle>
366+
<Style TargetType="DataGridCell">
367+
<Setter Property="ToolTip">
368+
<Setter.Value>
369+
<TextBlock Text="{Binding ReleaseDate, StringFormat=\{0:dd/MM/yyyy\}}" />
370+
</Setter.Value>
371+
</Setter>
372+
</Style>
373+
</DataGridTextColumn.CellStyle>
374+
</DataGridTextColumn>
363375
<DataGridTextColumn Binding="{Binding Version}" ClipboardContentBinding="{x:Null}" Header="Version" IsReadOnly="True" MinWidth="222">
364376
<DataGridTextColumn.CellStyle>
365377
<Style TargetType="{x:Type DataGridCell}">

‎UnityLauncherPro/MainWindow.xaml.cs

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -297,19 +297,42 @@ private bool ProjectFilter(object item)
297297
private bool UpdatesFilter(object item)
298298
{
299299
Updates unity = item as Updates;
300+
300301
bool haveSearchString = string.IsNullOrEmpty(_filterString) == false;
301-
bool matchString = unity.Version.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) > -1;
302+
bool matchString = haveSearchString && unity.Version.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) > -1;
303+
304+
bool checkedAlls = (bool)rdoAll.IsChecked;
305+
bool checkedLTSs = (bool)rdoLTS.IsChecked;
306+
bool checkedAlphas = (bool)rdoAlphas.IsChecked;
307+
bool checkedBetas = (bool)rdoBetas.IsChecked;
302308

303-
bool checkedAlphas = (bool)chkAlphas.IsChecked;
304-
bool checkedBetas = (bool)chkBetas.IsChecked;
309+
bool matchLTS = false;
310+
if (checkedLTSs)
311+
{
312+
var version = unity.Version.Split('.');
313+
var versionInt = int.Parse(version[0]);
314+
var versionMinor = int.Parse(version[1]);
315+
// https://unity3d.com/unity/qa/lts-releases
316+
matchLTS = (versionInt >= 2017 && versionMinor == 4) || (versionInt > 2019 && versionMinor == 3);
317+
}
305318

306319
bool matchAlphas = checkedAlphas && unity.Version.IndexOf("a", 0, StringComparison.CurrentCultureIgnoreCase) > -1;
307320
bool matchBetas = checkedBetas && unity.Version.IndexOf("b", 0, StringComparison.CurrentCultureIgnoreCase) > -1;
308321

309-
// TODO there must be simpler way : D
310-
if (checkedAlphas && checkedBetas) return haveSearchString ? (matchString && (matchAlphas || matchBetas)) : (matchAlphas || matchBetas);
311-
if (checkedAlphas) return haveSearchString ? matchString && matchAlphas : matchAlphas;
312-
if (checkedBetas) return haveSearchString ? matchString && matchBetas : matchBetas;
322+
// match search string and some radiobutton
323+
if (haveSearchString)
324+
{
325+
if (checkedAlls) return matchString;
326+
if (checkedLTSs) return matchString && matchLTS;
327+
if (checkedAlphas) return matchString && matchAlphas;
328+
if (checkedBetas) return matchString && matchBetas;
329+
}
330+
else // no search text, filter by radiobuttons
331+
{
332+
if (checkedAlls || matchLTS || matchAlphas || matchBetas) return true;
333+
}
334+
335+
// fallback
313336
return matchString;
314337
}
315338

@@ -621,9 +644,6 @@ async Task CallGetUnityUpdates()
621644
if (items == null) return;
622645
updatesSource = GetUnityUpdates.Parse(items);
623646
if (updatesSource == null) return;
624-
625-
626-
627647
dataGridUpdates.ItemsSource = updatesSource;
628648
}
629649

@@ -2816,8 +2836,6 @@ void SortHandlerUpdates(object sender, DataGridSortingEventArgs e)
28162836
//use a ListCollectionView to do the sort.
28172837
ListCollectionView lcv = (ListCollectionView)CollectionViewSource.GetDefaultView(dataGridUpdates.ItemsSource);
28182838

2819-
Console.WriteLine("Sorted by " + column.Header + " " + direction);
2820-
28212839
comparer = new CustomUpdatesSort(direction, column.Header.ToString());
28222840

28232841
//apply the sort
@@ -3178,8 +3196,9 @@ private void txtMaxProjectCount_TextChanged(object sender, TextChangedEventArgs
31783196
}
31793197
}
31803198

3181-
private void chkAlphas_Checked(object sender, RoutedEventArgs e)
3199+
private void rdoAll_Checked(object sender, RoutedEventArgs e)
31823200
{
3201+
if (this.IsActive == false) return; // dont run code on window init
31833202
FilterUpdates();
31843203
}
31853204

‎UnityLauncherPro/UnityLauncherPro.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<Generator>MSBuild:Compile</Generator>
8181
<SubType>Designer</SubType>
8282
</ApplicationDefinition>
83+
<Compile Include="Converters\ReleaseDateConverter.cs" />
8384
<Compile Include="Converters\LastModifiedConverter.cs" />
8485
<Compile Include="Data\BuildReport.cs" />
8586
<Compile Include="Data\BuildReportItem.cs" />

0 commit comments

Comments
 (0)