Skip to content

Commit 4a20786

Browse files
Update hardware window number to be consistent
1 parent 96dfb61 commit 4a20786

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

MSURandomizer/MSURandomizer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
9-
<Version>3.0.0-rc.5</Version>
9+
<Version>3.0.0</Version>
1010
<ApplicationIcon>MSURandomizerIcon.ico</ApplicationIcon>
1111
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1212
<PackageId>MattEqualsCoder.MSURandomizer.Avalonia</PackageId>

MSURandomizer/Services/MsuListService.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ public void FilterMSUs(MsuType msuType, MsuFilter msuFilter)
8989
}
9090

9191
var filteredMsus = Model.MsuViewModels
92-
.Where(x => x.Msu.MatchesFilter(msuFilter, msuType, compatibleMsuNames) &&
93-
(x.Msu.NumUniqueTracks > x.Msu.MsuType?.RequiredTrackNumbers.Count / 5 || x.Msu.NumUniqueTracks > 10))
92+
.Where(x => x.Msu.MatchesFilter(msuFilter, msuType, compatibleMsuNames) && x.Msu.HasSufficientTracks)
9493
.OrderBy(x => x.MsuName)
9594
.ToList();
9695
Model.FilteredMsus = filteredMsus;

MSURandomizerLibrary/Configs/Msu.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@ public bool MatchesFilter(MsuFilter filter, MsuType type, List<string>? compatib
212212
}
213213
}
214214

215+
[JsonIgnore]
216+
public bool HasSufficientTracks => NumUniqueTracks > MsuType?.RequiredTrackNumbers.Count / 5 || NumUniqueTracks > 10;
217+
215218
private bool MatchesFilterType(MsuFilter filter, MsuType type)
216219
{
217220
return filter == MsuFilter.All ||

MSURandomizerLibrary/MSURandomizerLibrary.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
1515
<IncludeSymbols>False</IncludeSymbols>
1616
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
17-
<Version>3.0.0-rc.5</Version>
17+
<Version>3.0.0</Version>
1818
<PackageId>MattEqualsCoder.MSURandomizer.Library</PackageId>
1919
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2020
<TargetFramework>net8.0</TargetFramework>

MSURandomizerLibrary/Services/MsuHardwareService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ await Task.Delay(TimeSpan.FromSeconds(0.25), cts.Token)
4141
.ContinueWith(tsk => tsk.Exception == default, CancellationToken.None);
4242
}
4343

44+
response = response?.Where(x => x.HasSufficientTracks).ToList();
4445
_hardwareMsuList = response?.ToDictionary(x => x.Path, x => x) ?? [];
4546

4647
if (response?.Count > 0)

0 commit comments

Comments
 (0)