Skip to content

Epic manifest parsing frontend part #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devedse wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Epic manifest parsing frontend part #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ffec8d
WIP rewriting codebase a little
devedse May 11, 2025
036ee85
Added total download progress
devedse May 11, 2025
87ac383
Merge remote-tracking branch 'origin/master' into EpicManifestParsing…
devedse May 11, 2025
1591a0d
Fix build
devedse May 11, 2025
0c255ce
Small pattern matching fix
devedse May 11, 2025
acd909c
Fix some warnings
devedse May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/githubactionsbuilds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Login to Docker Hub
if: github.ref == 'refs/heads/master'
uses: docker/login-action@v3
with:
username: devedse
Expand Down
8 changes: 4 additions & 4 deletions DeveLanCacheUI_Frontend/ApiModels/DownloadEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ public class DownloadEvent
public int Id { get; set; }

//steam/epicgames/wsus/epicgames
public string CacheIdentifier { get; set; }
public required string CacheIdentifier { get; set; }

public int? DownloadIdentifier { get; set; }
public uint? DownloadIdentifier { get; set; }
public string? DownloadIdentifierString { get; set; }

public required string ClientIp { get; set; }
Expand All @@ -18,9 +18,9 @@ public class DownloadEvent
public long CacheHitBytes { get; set; }
public long CacheMissBytes { get; set; }

public ulong TotalBytes { get; set; }
//public ulong TotalBytes { get; set; }


public SteamDepot? SteamDepot { get; set; }
public DownloadInfo? DownloadInfo { get; set; }
}
}
17 changes: 17 additions & 0 deletions DeveLanCacheUI_Frontend/ApiModels/DownloadInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace DeveLanCacheUI_Frontend.ApiModels
{
public class DownloadInfo
{
public string? Name { get; set; }

public string? AppUrl { get; set; }
public string? AppImageUrl { get; set; }

//E.g. the DepotId
public string? DownloadIdentifier { get; set; }
public string? DownloadIdentifierUrl { get; set; }
public string? DownloadIdentifierImageUrl { get; set; }

public ulong? TotalBytes { get; set; }
}
}
10 changes: 0 additions & 10 deletions DeveLanCacheUI_Frontend/ApiModels/SteamDepot.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion DeveLanCacheUI_Frontend/Client/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;

namespace DeveLanCacheUI_Frontend
namespace DeveLanCacheUI_Frontend.Client
{
public class Program
{
Expand Down
57 changes: 37 additions & 20 deletions DeveLanCacheUI_Frontend/Pages/LatestDownload.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,25 @@
<th>Client</th>
<th>Cache Hit</th>
<th>Cache Miss</th>
<th>Progress</th>
</tr>
</thead>
<tbody>
@foreach (var downloadEvent in downloadEvents)
{
double cacheHitPercent = 0.0;
double cacheMissPercent = 0.0;
double totalPercent = 0.0;
if ((downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes) != 0)
{
cacheHitPercent = Math.Round(((double)downloadEvent.CacheHitBytes / (downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes)) * 100, 2);
cacheMissPercent = Math.Round(((double)downloadEvent.CacheMissBytes / (downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes)) * 100, 2);
var totalBytes = downloadEvent.DownloadInfo?.TotalBytes;
if (totalBytes is not null and not 0)
{
totalPercent = Math.Round(((double)(downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes) / totalBytes.Value) * 100, 2);
}
}
var appId = downloadEvent.SteamDepot?.SteamAppId ?? 0;
var downloadIdentifierString = downloadEvent.DownloadIdentifierString;
var appHref = appId != 0 ? $"https://steamdb.info/app/{appId}/" : "";
var depotHref = downloadIdentifierString != null && downloadEvent.CacheIdentifier == "steam" ? $"https://steamdb.info/depot/{downloadIdentifierString}/" : null;
var imgUrl = appId != 0 ? $"https://cdn.cloudflare.steamstatic.com/steam/apps/{appId}/header.jpg" : "";
<tr class="@(_localStorage.GetItem<bool>(LocalStorageField.CompactLayoutEnabled) ? "compact-layout" : "")">
<td>
@downloadEvent.CacheIdentifier
Expand All @@ -61,29 +63,28 @@
@downloadEvent.CreatedAt - @downloadEvent.LastUpdatedAt
</td>
<td>
@if (appId != 0)
@if (downloadEvent.DownloadInfo != null)
{
<a href="@appHref" target="_blank">
<img src="@imgUrl" style="width:200px;height:auto;" />
@*@(downloadEvent.SteamDepot?.SteamApp?.AppName ?? "unknown")*@
<a href="@(downloadEvent.DownloadInfo?.AppUrl ?? null)" target="_blank">
@if (downloadEvent.DownloadInfo?.AppImageUrl != null)
{
<img src="@downloadEvent.DownloadInfo?.AppImageUrl" style="width:200px;height:auto;" onerror="this.style.display='none'" />
}
<p>@(downloadEvent.DownloadInfo?.Name ?? "unknown")</p>
</a>
}
else
{
<span>@(downloadEvent.SteamDepot?.SteamApp?.name ?? "unknown")</span>
}
</td>
<td>
@if (depotHref != null)
@if (downloadEvent.DownloadInfo != null)
{
<a href="@depotHref" target="_blank">
@downloadEvent.DownloadIdentifierString
<a href="@(downloadEvent.DownloadInfo?.DownloadIdentifierUrl ?? null)" target="_blank">
@if (downloadEvent.DownloadInfo?.DownloadIdentifierImageUrl != null)
{
<img src="@downloadEvent.DownloadInfo?.DownloadIdentifierImageUrl" style="width:200px;height:auto;" onerror="this.style.display='none'" />
}
<p>@(downloadEvent.DownloadInfo?.DownloadIdentifier ?? "unknown")</p>
</a>
}
else
{
<span>@downloadEvent.DownloadIdentifierString</span>
}
</td>
<td style="text-align:center;">
@if (backendBaseUrl != null && _localStorage.GetItem<bool>(LocalStorageField.HashImagesEnabled))
Expand All @@ -110,6 +111,22 @@
@($"{DeveCoolLib.Conversion.ValuesToStringHelper.BytesToString(downloadEvent.CacheMissBytes)} ({cacheMissPercent}%)")
}
</td>
<td>
@if (downloadEvent.DownloadInfo?.TotalBytes is not null and not 0)
{
<progress max="100" value="@(totalPercent.ToString(CultureInfo.InvariantCulture))"></progress>

var totalBytesString = DeveCoolLib.Conversion.ValuesToStringHelper.BytesToString((long)downloadEvent.DownloadInfo?.TotalBytes!);
var downloadedBytesString = DeveCoolLib.Conversion.ValuesToStringHelper.BytesToString(downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes);
var progressString = totalPercent < 100 ? $"{downloadedBytesString}/{totalBytesString} ({totalPercent}%)" : $"{downloadedBytesString} (100%)";

@progressString
}
else
{
<span>Could not find Manifest</span>
}
</td>
</tr>
}
</tbody>
Expand Down
47 changes: 21 additions & 26 deletions DeveLanCacheUI_Frontend/Pages/SteamLatestDownloads.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<h1>
Steam Latest Downloads
<span class="status-ball @(hubConnection?.State == HubConnectionState.Connected ? "connected" : "disconnected")"
title="@(hubConnection?.State == HubConnectionState.Connected ? "Connected" : "Disconnected")">
title="@(hubConnection?.State == HubConnectionState.Connected ? "Connected" : "Disconnected")">
</span>
@if (loading)
{
Expand Down Expand Up @@ -48,44 +48,39 @@
{
cacheHitPercent = Math.Round(((double)downloadEvent.CacheHitBytes / (downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes)) * 100, 2);
cacheMissPercent = Math.Round(((double)downloadEvent.CacheMissBytes / (downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes)) * 100, 2);
if (downloadEvent.TotalBytes != 0)
var totalBytes = downloadEvent.DownloadInfo?.TotalBytes;
if (totalBytes is not null and not 0)
{
totalPercent = Math.Round(((double)(downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes) / (double)downloadEvent.TotalBytes) * 100, 2);
totalPercent = Math.Round(((double)(downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes) / totalBytes.Value) * 100, 2);
}
}
var appId = downloadEvent.SteamDepot?.SteamAppId ?? 0;
var downloadIdentifierString = downloadEvent.DownloadIdentifierString;
var appHref = appId != 0 ? $"https://steamdb.info/app/{appId}/" : "";
var depotHref = downloadIdentifierString != null && downloadEvent.CacheIdentifier == "steam" ? $"https://steamdb.info/depot/{downloadIdentifierString}/" : null;
var imgUrl = appId != 0 ? $"https://cdn.cloudflare.steamstatic.com/steam/apps/{appId}/header.jpg" : "";
<tr class="@(_localStorage.GetItem<bool>(LocalStorageField.CompactLayoutEnabled) ? "compact-layout" : "")">
<td>
@downloadEvent.CreatedAt - @downloadEvent.LastUpdatedAt
</td>
<td>
@if (appId != 0)
@if (downloadEvent.DownloadInfo != null)
{
<a href="@appHref" target="_blank">
<img src="@imgUrl" style="width:200px;height:auto;" />
@*@(downloadEvent.SteamDepot?.SteamApp?.AppName ?? "unknown")*@
<a href="@(downloadEvent.DownloadInfo?.AppUrl ?? null)" target="_blank">
@if (downloadEvent.DownloadInfo?.AppImageUrl != null)
{
<img src="@downloadEvent.DownloadInfo?.AppImageUrl" style="width:200px;height:auto;" onerror="this.style.display='none'" />
}
<p>@(downloadEvent.DownloadInfo?.Name ?? "unknown")</p>
</a>
}
else
{
<span>@(downloadEvent.SteamDepot?.SteamApp?.name ?? "unknown")</span>
}
</td>
<td>
@if (depotHref != null)
@if (downloadEvent.DownloadInfo != null)
{
<a href="@depotHref" target="_blank">
@downloadEvent.DownloadIdentifierString
<a href="@(downloadEvent.DownloadInfo?.DownloadIdentifierUrl ?? null)" target="_blank">
@if (downloadEvent.DownloadInfo?.DownloadIdentifierImageUrl != null)
{
<img src="@downloadEvent.DownloadInfo?.DownloadIdentifierImageUrl" style="width:200px;height:auto;" onerror="this.style.display='none'" />
}
<p>@(downloadEvent.DownloadInfo?.DownloadIdentifier ?? "unknown")</p>
</a>
}
else
{
<span>@downloadEvent.DownloadIdentifierString</span>
}
</td>
<td style="text-align:center;">
@if (backendBaseUrl != null && _localStorage.GetItem<bool>(LocalStorageField.HashImagesEnabled))
Expand Down Expand Up @@ -113,19 +108,19 @@
}
</td>
<td>
@if (downloadEvent.TotalBytes != 0)
@if (downloadEvent.DownloadInfo?.TotalBytes is not null and not 0)
{
<progress max="100" value="@(totalPercent.ToString(CultureInfo.InvariantCulture))"></progress>

var totalBytesString = DeveCoolLib.Conversion.ValuesToStringHelper.BytesToString((long)downloadEvent.TotalBytes);
var totalBytesString = DeveCoolLib.Conversion.ValuesToStringHelper.BytesToString((long)downloadEvent.DownloadInfo?.TotalBytes!);
var downloadedBytesString = DeveCoolLib.Conversion.ValuesToStringHelper.BytesToString(downloadEvent.CacheMissBytes + downloadEvent.CacheHitBytes);
var progressString = totalPercent < 100 ? $"{downloadedBytesString}/{totalBytesString} ({totalPercent}%)" : $"{downloadedBytesString} (100%)";

@progressString
}
else
{
<span>Could not find Steam Manifest</span>
<span>Could not find Manifest</span>
}
</td>
</tr>
Expand Down