paulmataruso/qbtmud
1
0
Fork 0
mirror of https://github.com/lantean-code/qbtmud.git synced 2025-10-23 04:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to MudBlazor 7 and display fixes

Browse Source
This commit is contained in:
ahjephson
2024-07-02 19:17:44 +01:00
parent b3a6bf8d36
commit d2d0f41d7f
4 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Lantean.QBTMudBlade/Components/GeneralTab.razor
View File

@@ -30,7 +30,7 @@
<MudField Label="Upload Speed">@DisplayHelpers.Speed(Properties?.UploadSpeed) @DisplayHelpers.Speed(Properties?.UploadSpeedAverage, "(", " avg.)")</MudField>
</MudItem>
<MudItem xs="4">
<MudField Label="Peers">@DisplayHelpers.Size(Properties?.Peers) @DisplayHelpers.EmptyIfNull(Properties?.Peers, "(", " total)")</MudField>
<MudField Label="Peers">@DisplayHelpers.EmptyIfNull(Properties?.Peers) @DisplayHelpers.EmptyIfNull(Properties?.Peers, "(", " total)")</MudField>
</MudItem>
<MudItem xs="4">

2
Lantean.QBTMudBlade/Lantean.QBTMudBlade.csproj
View File

@@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="MudBlazor" Version="7.0.0-rc.2" />
<PackageReference Include="MudBlazor" Version="7.0.0" />
<PackageReference Include="MudBlazor.ThemeManager" Version="1.1.0" />
</ItemGroup>

2
Lantean.QBTMudBlade/Pages/TorrentList.razor.cs
View File

@@ -151,7 +151,7 @@ namespace Lantean.QBTMudBlade.Pages
CreateColumnDefinition("Ratio Limit", t => t.RatioLimit, t => t.Ratio.ToString("0.00"), enabled: false),
CreateColumnDefinition("Last Seen Complete", t => t.SeenComplete, t => DisplayHelpers.DateTime(t.SeenComplete), enabled: false),
CreateColumnDefinition("Last Activity", t => t.LastActivity, t => DisplayHelpers.DateTime(t.LastActivity), enabled: false),
CreateColumnDefinition("Availability", t => t.Availability, enabled: false),
CreateColumnDefinition("Availability", t => t.Availability, t => t.Availability.ToString("0.##"), enabled: false),
//CreateColumnDefinition("Reannounce In", t => t.Reannounce, enabled: false),
];

84
Lantean.QBTMudBlade/Services/DataManager.cs
View File

@@ -175,24 +175,6 @@ namespace Lantean.QBTMudBlade.Services
}
}
if (mainData.Torrents is not null)
{
foreach (var (hash, torrent) in mainData.Torrents)
{
if (!torrentList.Torrents.TryGetValue(hash, out var existingTorrent))
{
var newTorrent = CreateTorrent(hash, torrent);
torrentList.Torrents.Add(hash, newTorrent);
AddTorrentToStates(torrentList, hash);
}
else
{
UpdateTorrentStates(torrentList, hash);
UpdateTorrent(existingTorrent, torrent);
}
}
}
if (mainData.Categories is not null)
{
foreach (var (name, category) in mainData.Categories)
@@ -232,6 +214,24 @@ namespace Lantean.QBTMudBlade.Services
}
}
if (mainData.Torrents is not null)
{
foreach (var (hash, torrent) in mainData.Torrents)
{
if (!torrentList.Torrents.TryGetValue(hash, out var existingTorrent))
{
var newTorrent = CreateTorrent(hash, torrent);
torrentList.Torrents.Add(hash, newTorrent);
AddTorrentToStates(torrentList, hash);
}
else
{
UpdateTorrentStates(torrentList, hash);
UpdateTorrent(existingTorrent, torrent);
}
}
}
if (mainData.ServerState is not null)
{
UpdateServerState(torrentList.ServerState, mainData.ServerState);
@@ -276,21 +276,25 @@ namespace Lantean.QBTMudBlade.Services
torrentList.TagState[FilterHelper.TAG_UNTAGGED].AddIfTrueOrRemove(hash, FilterHelper.FilterTag(torrent, FilterHelper.TAG_UNTAGGED));
foreach (var tag in torrentList.Tags)
{
if (!torrentList.TagState.ContainsKey(tag))
if (!torrentList.TagState.TryGetValue(tag, out HashSet<string>? value))
{
torrentList.TagState.Add(tag, []);
value = [];
torrentList.TagState.Add(tag, value);
}
torrentList.TagState[tag].AddIfTrueOrRemove(hash, FilterHelper.FilterTag(torrent, tag));
value.AddIfTrueOrRemove(hash, FilterHelper.FilterTag(torrent, tag));
}
torrentList.CategoriesState[FilterHelper.CATEGORY_UNCATEGORIZED].AddIfTrueOrRemove(hash, FilterHelper.FilterCategory(torrent, FilterHelper.CATEGORY_UNCATEGORIZED, torrentList.ServerState.UseSubcategories));
foreach (var category in torrentList.Categories.Keys)
{
if (!torrentList.CategoriesState.ContainsKey(category))
if (!torrentList.CategoriesState.TryGetValue(category, out HashSet<string>? value))
{
torrentList.CategoriesState.Add(category, []);
value = [];
torrentList.CategoriesState.Add(category, value);
}
torrentList.CategoriesState[category].AddIfTrueOrRemove(hash, FilterHelper.FilterCategory(torrent, category, torrentList.ServerState.UseSubcategories));
value.AddIfTrueOrRemove(hash, FilterHelper.FilterCategory(torrent, category, torrentList.ServerState.UseSubcategories));
}
foreach (var status in _statuses)
@@ -301,11 +305,13 @@ namespace Lantean.QBTMudBlade.Services
torrentList.TrackersState[FilterHelper.TRACKER_TRACKERLESS].AddIfTrueOrRemove(hash, FilterHelper.FilterTracker(torrent, FilterHelper.TRACKER_TRACKERLESS));
foreach (var tracker in torrentList.Trackers.Keys)
{
if (!torrentList.TrackersState.ContainsKey(tracker))
if (!torrentList.TrackersState.TryGetValue(tracker, out HashSet<string>? value))
{
torrentList.TrackersState.Add(tracker, []);
value = [];
torrentList.TrackersState.Add(tracker, value);
}
torrentList.TrackersState[tracker].AddIfTrueOrRemove(hash, FilterHelper.FilterTracker(torrent, tracker));
value.AddIfTrueOrRemove(hash, FilterHelper.FilterTracker(torrent, tracker));
}
}
@@ -317,26 +323,42 @@ namespace Lantean.QBTMudBlade.Services
torrentList.TagState[FilterHelper.TAG_UNTAGGED].RemoveIfTrue(hash, FilterHelper.FilterTag(torrent, FilterHelper.TAG_UNTAGGED));
foreach (var tag in torrentList.Tags)
{
torrentList.TagState[tag].RemoveIfTrue(hash, FilterHelper.FilterTag(torrent, tag));
if (!torrentList.TagState.TryGetValue(tag, out var tagState))
{
continue;
}
tagState.RemoveIfTrue(hash, FilterHelper.FilterTag(torrent, tag));
}
torrentList.CategoriesState[FilterHelper.CATEGORY_ALL].Remove(hash);
torrentList.CategoriesState[FilterHelper.CATEGORY_UNCATEGORIZED].RemoveIfTrue(hash, FilterHelper.FilterCategory(torrent, FilterHelper.CATEGORY_UNCATEGORIZED, torrentList.ServerState.UseSubcategories));
foreach (var category in torrentList.Categories.Keys)
{
torrentList.CategoriesState[category].RemoveIfTrue(hash, FilterHelper.FilterCategory(torrent, category, torrentList.ServerState.UseSubcategories));
if (!torrentList.CategoriesState.TryGetValue(category, out var categoryState))
{
continue;
}
categoryState.RemoveIfTrue(hash, FilterHelper.FilterCategory(torrent, category, torrentList.ServerState.UseSubcategories));
}
foreach (var status in _statuses)
{
torrentList.StatusState[status.ToString()].RemoveIfTrue(hash, FilterHelper.FilterStatus(torrent, status));
if (!torrentList.StatusState.TryGetValue(status.ToString(), out var statusState))
{
continue;
}
statusState.RemoveIfTrue(hash, FilterHelper.FilterStatus(torrent, status));
}
torrentList.TrackersState[FilterHelper.TRACKER_ALL].Remove(hash);
torrentList.TrackersState[FilterHelper.TRACKER_TRACKERLESS].RemoveIfTrue(hash, FilterHelper.FilterTracker(torrent, FilterHelper.TRACKER_TRACKERLESS));
foreach (var tracker in torrentList.Trackers.Keys)
{
torrentList.TrackersState[tracker].RemoveIfTrue(hash, FilterHelper.FilterTracker(torrent, tracker));
if (!torrentList.TrackersState.TryGetValue(tracker, out var trackerState))
{
continue;
}
trackerState.RemoveIfTrue(hash, FilterHelper.FilterTracker(torrent, tracker));
}
}