chore: Clean up redundant code and align model signatures (#417)

JusterZhu · web-flow · commit 656468c08380 · 2026-05-25T20:10:24.000+08:00
* chore: remove empty ClientCore dir, align DownloadResult with plan - Delete empty GeneralUpdate.ClientCore directory (bin/obj artifacts only) - DownloadResult.Url replaced with DownloadResult.Asset (full DownloadAsset) - IDownloadExecutor.ExecuteAsync now accepts DownloadAsset instead of string url Closes #411 * fix: update test stubs and model constructors for DownloadResult.Asset
diff --git a/src/c#/GeneralUpdate.Core/Download/Abstractions/IDownloadExecutor.cs b/src/c#/GeneralUpdate.Core/Download/Abstractions/IDownloadExecutor.cs
@@ -9,7 +9,7 @@ namespace GeneralUpdate.Core.Download.Abstractions;
 public interface IDownloadExecutor
 {
     Task<DownloadResult> ExecuteAsync(
-        string url, string destPath,
+        DownloadAsset asset, string destPath,
         IProgress<DownloadProgress>? progress = null,
         CancellationToken token = default);
 }
diff --git a/src/c#/GeneralUpdate.Core/Download/Executors/HttpDownloadExecutor.cs b/src/c#/GeneralUpdate.Core/Download/Executors/HttpDownloadExecutor.cs
@@ -26,7 +26,7 @@ public HttpDownloadExecutor(HttpClient client, TimeSpan? timeout = null, bool en
     }
 
     public async Task<DownloadResult> ExecuteAsync(
-        string url, string destPath,
+        DownloadAsset asset, string destPath,
         IProgress<DownloadProgress>? progress = null,
         CancellationToken token = default)
     {
@@ -42,7 +42,7 @@ public async Task<DownloadResult> ExecuteAsync(
 
         try
         {
-            using var request = new HttpRequestMessage(HttpMethod.Get, url);
+            using var request = new HttpRequestMessage(HttpMethod.Get, asset.Url);
             if (_enableResume && existingBytes > 0)
                 request.Headers.Range = new System.Net.Http.Headers.RangeHeaderValue(existingBytes, null);
 
@@ -74,12 +74,12 @@ public async Task<DownloadResult> ExecuteAsync(
                 totalBytes > 0 ? totalBytes + existingBytes : null,
                 100, DownloadStatus.Completed));
 
-            return new DownloadResult(url, destPath, downloaded, elapsed, retries, true, null);
+            return new DownloadResult(asset, destPath, downloaded, elapsed, retries, true, null);
         }
         catch (Exception ex) when (ex is not OperationCanceledException)
         {
             sw.Stop();
-            return new DownloadResult(url, null, existingBytes, sw.Elapsed, retries, false, ex.Message);
+            return new DownloadResult(asset, null, existingBytes, sw.Elapsed, retries, false, ex.Message);
         }
     }
 
diff --git a/src/c#/GeneralUpdate.Core/Download/Executors/OssDownloadExecutor.cs b/src/c#/GeneralUpdate.Core/Download/Executors/OssDownloadExecutor.cs
@@ -17,14 +17,14 @@ public OssDownloadExecutor(HttpClient client)
         => _client = client ?? throw new ArgumentNullException(nameof(client));
 
     public async Task<DownloadResult> ExecuteAsync(
-        string url, string destPath,
+        DownloadAsset asset, string destPath,
         IProgress<DownloadProgress>? progress = null,
         CancellationToken token = default)
     {
         var sw = System.Diagnostics.Stopwatch.StartNew();
         try
         {
-            using var response = await _client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token)
+            using var response = await _client.GetAsync(asset.Url, HttpCompletionOption.ResponseHeadersRead, token)
                 .ConfigureAwait(false);
             response.EnsureSuccessStatusCode();
             var total = response.Content.Headers.ContentLength ?? -1;
@@ -37,12 +37,12 @@ public async Task<DownloadResult> ExecuteAsync(
 
             progress?.Report(new DownloadProgress(
                 Path.GetFileName(destPath), downloaded, total > 0 ? total : null, 100, DownloadStatus.Completed));
-            return new DownloadResult(url, destPath, downloaded, elapsed, 0, true, null);
+            return new DownloadResult(asset, destPath, downloaded, elapsed, 0, true, null);
         }
         catch (Exception ex) when (ex is not OperationCanceledException)
         {
             sw.Stop();
-            return new DownloadResult(url, null, 0, sw.Elapsed, 0, false, ex.Message);
+            return new DownloadResult(asset, null, 0, sw.Elapsed, 0, false, ex.Message);
         }
     }
 }
diff --git a/src/c#/GeneralUpdate.Core/Download/Models/DownloadProgress.cs b/src/c#/GeneralUpdate.Core/Download/Models/DownloadProgress.cs
@@ -15,7 +15,7 @@ DownloadStatus Status
 );
 
 public record DownloadResult(
-    string? Url,
+    DownloadAsset Asset,
     string? LocalPath,
     long DownloadedBytes,
     TimeSpan Duration,
diff --git a/src/c#/GeneralUpdate.Core/Download/Orchestrators/DefaultDownloadOrchestrator.cs b/src/c#/GeneralUpdate.Core/Download/Orchestrators/DefaultDownloadOrchestrator.cs
@@ -80,7 +80,7 @@ public async Task<DownloadReport> ExecuteAsync(
                 {
                     // Download
                     var downloadResult = await executor.ExecuteAsync(
-                        asset.Url, destPath,
+                        asset, destPath,
                         progress != null ? new AssetProgressReporter(progress, asset.Name) : null,
                         ct).ConfigureAwait(false);
 
@@ -100,7 +100,7 @@ public async Task<DownloadReport> ExecuteAsync(
                     }
                     catch (Exception ex)
                     {
-                        return new DownloadResult(asset.Url, destPath,
+                        return new DownloadResult(asset, destPath,
                             downloadResult.DownloadedBytes, downloadResult.Duration,
                             downloadResult.RetryCount, false, $"SHA256 verification failed: {ex.Message}");
                     }
@@ -122,7 +122,7 @@ public async Task<DownloadReport> ExecuteAsync(
 
         // Dispatch all-completed event ONCE after all assets finish (only failed results)
         var failedDetails = results.Where(r => !r.Success)
-            .Select(r => ((object)r.Url, r.ErrorMessage ?? "failed")).ToList();
+            .Select(r => ((object)r.Asset.Url, r.ErrorMessage ?? "failed")).ToList();
         DownloadProgressReporter.DispatchAllCompleted(
             this,
             results.All(r => r.Success),
diff --git a/tests/CoreTest/Bootstrap/BootstrapFullParameterMatrixTests.cs b/tests/CoreTest/Bootstrap/BootstrapFullParameterMatrixTests.cs
@@ -129,9 +129,9 @@ private sealed class StubDownloadPolicy : GeneralUpdate.Core.Download.Abstractio
 
         private sealed class StubDownloadExecutor : GeneralUpdate.Core.Download.Abstractions.IDownloadExecutor
         {
-            public Task<GeneralUpdate.Core.Download.Models.DownloadResult> ExecuteAsync(string url, string destPath,
+            public Task<GeneralUpdate.Core.Download.Models.DownloadResult> ExecuteAsync(GeneralUpdate.Core.Download.Models.DownloadAsset asset, string destPath,
                 IProgress<GeneralUpdate.Core.Download.Models.DownloadProgress>? progress = null, CancellationToken token = default)
-                => Task.FromResult(new GeneralUpdate.Core.Download.Models.DownloadResult(url, destPath, 0, TimeSpan.Zero, 0, true, null));
+                => Task.FromResult(new GeneralUpdate.Core.Download.Models.DownloadResult(asset, destPath, 0, TimeSpan.Zero, 0, true, null));
         }
 
         private sealed class StubDownloadSource : GeneralUpdate.Core.Download.Abstractions.IDownloadSource
diff --git a/tests/CoreTest/Configuration/ConfigurationModelsTests.cs b/tests/CoreTest/Configuration/ConfigurationModelsTests.cs
@@ -219,7 +219,7 @@ public void DownloadProgress_Failed()
         public void DownloadResult_Success()
         {
             var result = new DownloadResult(
-                "https://cdn.example.com/update.zip",
+                null!,
                 "/tmp/update.zip",
                 50L * 1024 * 1024,
                 TimeSpan.FromSeconds(30),
@@ -236,7 +236,7 @@ public void DownloadResult_Success()
         public void DownloadResult_FailureWithRetries()
         {
             var result = new DownloadResult(
-                "https://cdn.example.com/update.zip",
+                null!,
                 null,
                 0,
                 TimeSpan.FromSeconds(15),
diff --git a/tests/CoreTest/Download/OrchestratorOptionsBehaviourTests.cs b/tests/CoreTest/Download/OrchestratorOptionsBehaviourTests.cs
@@ -263,8 +263,9 @@ public async Task HttpDownloadExecutor_EnableResumeFalse_DeletesExistingFile()
 
         try
         {
+            var asset = new DownloadAsset("file.bin", "http://example.com/file.bin", 0, null, "1.0.0");
             var result = await executor.ExecuteAsync(
-                "http://example.com/file.bin", destPath, token: CancellationToken.None);
+                asset, destPath, token: CancellationToken.None);
             Assert.True(result.Success, $"Download should succeed, error: {result.ErrorMessage}");
             Assert.True(File.Exists(destPath));
         }
@@ -308,8 +309,9 @@ public async Task HttpDownloadExecutor_WithRangeResponse_AppendsCorrectly()
 
         try
         {
+            var asset = new DownloadAsset("file.bin", "http://example.com/file.bin", 0, null, "1.0.0");
             var result = await executor.ExecuteAsync(
-                "http://example.com/file.bin", destPath, token: CancellationToken.None);
+                asset, destPath, token: CancellationToken.None);
             Assert.True(result.Success);
             // Partial content (30 bytes) appended to existing (20 bytes) = 50 total
             var fileInfo = new FileInfo(destPath);

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace GeneralUpdate.Core.Download.Abstractions;`
`9`	`9`	`public interface IDownloadExecutor`
`10`	`10`	`{`
`11`	`11`	`Task<DownloadResult> ExecuteAsync(`
`12`		`- string url, string destPath,`
	`12`	`+ DownloadAsset asset, string destPath,`
`13`	`13`	`IProgress<DownloadProgress>? progress = null,`
`14`	`14`	`CancellationToken token = default);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public HttpDownloadExecutor(HttpClient client, TimeSpan? timeout = null, bool en`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public async Task<DownloadResult> ExecuteAsync(`
`29`		`- string url, string destPath,`
	`29`	`+ DownloadAsset asset, string destPath,`
`30`	`30`	`IProgress<DownloadProgress>? progress = null,`
`31`	`31`	`CancellationToken token = default)`
`32`	`32`	`{`
`@@ -42,7 +42,7 @@ public async Task<DownloadResult> ExecuteAsync(`
`42`	`42`
`43`	`43`	`try`
`44`	`44`	`{`
`45`		`- using var request = new HttpRequestMessage(HttpMethod.Get, url);`
	`45`	`+ using var request = new HttpRequestMessage(HttpMethod.Get, asset.Url);`
`46`	`46`	`if (_enableResume && existingBytes > 0)`
`47`	`47`	`request.Headers.Range = new System.Net.Http.Headers.RangeHeaderValue(existingBytes, null);`
`48`	`48`
`@@ -74,12 +74,12 @@ public async Task<DownloadResult> ExecuteAsync(`
`74`	`74`	`totalBytes > 0 ? totalBytes + existingBytes : null,`
`75`	`75`	`100, DownloadStatus.Completed));`
`76`	`76`
`77`		`- return new DownloadResult(url, destPath, downloaded, elapsed, retries, true, null);`
	`77`	`+ return new DownloadResult(asset, destPath, downloaded, elapsed, retries, true, null);`
`78`	`78`	`}`
`79`	`79`	`catch (Exception ex) when (ex is not OperationCanceledException)`
`80`	`80`	`{`
`81`	`81`	`sw.Stop();`
`82`		`- return new DownloadResult(url, null, existingBytes, sw.Elapsed, retries, false, ex.Message);`
	`82`	`+ return new DownloadResult(asset, null, existingBytes, sw.Elapsed, retries, false, ex.Message);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ public OssDownloadExecutor(HttpClient client)`
`17`	`17`	`=> _client = client ?? throw new ArgumentNullException(nameof(client));`
`18`	`18`
`19`	`19`	`public async Task<DownloadResult> ExecuteAsync(`
`20`		`- string url, string destPath,`
	`20`	`+ DownloadAsset asset, string destPath,`
`21`	`21`	`IProgress<DownloadProgress>? progress = null,`
`22`	`22`	`CancellationToken token = default)`
`23`	`23`	`{`
`24`	`24`	`var sw = System.Diagnostics.Stopwatch.StartNew();`
`25`	`25`	`try`
`26`	`26`	`{`
`27`		`- using var response = await _client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token)`
	`27`	`+ using var response = await _client.GetAsync(asset.Url, HttpCompletionOption.ResponseHeadersRead, token)`
`28`	`28`	`.ConfigureAwait(false);`
`29`	`29`	`response.EnsureSuccessStatusCode();`
`30`	`30`	`var total = response.Content.Headers.ContentLength ?? -1;`
`@@ -37,12 +37,12 @@ public async Task<DownloadResult> ExecuteAsync(`
`37`	`37`
`38`	`38`	`progress?.Report(new DownloadProgress(`
`39`	`39`	`Path.GetFileName(destPath), downloaded, total > 0 ? total : null, 100, DownloadStatus.Completed));`
`40`		`- return new DownloadResult(url, destPath, downloaded, elapsed, 0, true, null);`
	`40`	`+ return new DownloadResult(asset, destPath, downloaded, elapsed, 0, true, null);`
`41`	`41`	`}`
`42`	`42`	`catch (Exception ex) when (ex is not OperationCanceledException)`
`43`	`43`	`{`
`44`	`44`	`sw.Stop();`
`45`		`- return new DownloadResult(url, null, 0, sw.Elapsed, 0, false, ex.Message);`
	`45`	`+ return new DownloadResult(asset, null, 0, sw.Elapsed, 0, false, ex.Message);`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public async Task<DownloadReport> ExecuteAsync(`
`80`	`80`	`{`
`81`	`81`	`// Download`
`82`	`82`	`var downloadResult = await executor.ExecuteAsync(`
`83`		`- asset.Url, destPath,`
	`83`	`+ asset, destPath,`
`84`	`84`	`progress != null ? new AssetProgressReporter(progress, asset.Name) : null,`
`85`	`85`	`ct).ConfigureAwait(false);`
`86`	`86`
`@@ -100,7 +100,7 @@ public async Task<DownloadReport> ExecuteAsync(`
`100`	`100`	`}`
`101`	`101`	`catch (Exception ex)`
`102`	`102`	`{`
`103`		`- return new DownloadResult(asset.Url, destPath,`
	`103`	`+ return new DownloadResult(asset, destPath,`
`104`	`104`	`downloadResult.DownloadedBytes, downloadResult.Duration,`
`105`	`105`	`downloadResult.RetryCount, false, $"SHA256 verification failed: {ex.Message}");`
`106`	`106`	`}`
`@@ -122,7 +122,7 @@ public async Task<DownloadReport> ExecuteAsync(`
`122`	`122`
`123`	`123`	`// Dispatch all-completed event ONCE after all assets finish (only failed results)`
`124`	`124`	`var failedDetails = results.Where(r => !r.Success)`
`125`		`- .Select(r => ((object)r.Url, r.ErrorMessage ?? "failed")).ToList();`
	`125`	`+ .Select(r => ((object)r.Asset.Url, r.ErrorMessage ?? "failed")).ToList();`
`126`	`126`	`DownloadProgressReporter.DispatchAllCompleted(`
`127`	`127`	`this,`
`128`	`128`	`results.All(r => r.Success),`
Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,9 @@ private sealed class StubDownloadPolicy : GeneralUpdate.Core.Download.Abstractio`
`129`	`129`
`130`	`130`	`private sealed class StubDownloadExecutor : GeneralUpdate.Core.Download.Abstractions.IDownloadExecutor`
`131`	`131`	`{`
`132`		`- public Task<GeneralUpdate.Core.Download.Models.DownloadResult> ExecuteAsync(string url, string destPath,`
	`132`	`+ public Task<GeneralUpdate.Core.Download.Models.DownloadResult> ExecuteAsync(GeneralUpdate.Core.Download.Models.DownloadAsset asset, string destPath,`
`133`	`133`	`IProgress<GeneralUpdate.Core.Download.Models.DownloadProgress>? progress = null, CancellationToken token = default)`
`134`		`- => Task.FromResult(new GeneralUpdate.Core.Download.Models.DownloadResult(url, destPath, 0, TimeSpan.Zero, 0, true, null));`
	`134`	`+ => Task.FromResult(new GeneralUpdate.Core.Download.Models.DownloadResult(asset, destPath, 0, TimeSpan.Zero, 0, true, null));`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`private sealed class StubDownloadSource : GeneralUpdate.Core.Download.Abstractions.IDownloadSource`
Original file line number	Diff line number	Diff line change
`@@ -263,8 +263,9 @@ public async Task HttpDownloadExecutor_EnableResumeFalse_DeletesExistingFile()`
`263`	`263`
`264`	`264`	`try`
`265`	`265`	`{`
	`266`	`+ var asset = new DownloadAsset("file.bin", "http://example.com/file.bin", 0, null, "1.0.0");`
`266`	`267`	`var result = await executor.ExecuteAsync(`
`267`		`- "http://example.com/file.bin", destPath, token: CancellationToken.None);`
	`268`	`+ asset, destPath, token: CancellationToken.None);`
`268`	`269`	`Assert.True(result.Success, $"Download should succeed, error: {result.ErrorMessage}");`
`269`	`270`	`Assert.True(File.Exists(destPath));`
`270`	`271`	`}`
`@@ -308,8 +309,9 @@ public async Task HttpDownloadExecutor_WithRangeResponse_AppendsCorrectly()`
`308`	`309`
`309`	`310`	`try`
`310`	`311`	`{`
	`312`	`+ var asset = new DownloadAsset("file.bin", "http://example.com/file.bin", 0, null, "1.0.0");`
`311`	`313`	`var result = await executor.ExecuteAsync(`
`312`		`- "http://example.com/file.bin", destPath, token: CancellationToken.None);`
	`314`	`+ asset, destPath, token: CancellationToken.None);`
`313`	`315`	`Assert.True(result.Success);`
`314`	`316`	`// Partial content (30 bytes) appended to existing (20 bytes) = 50 total`
`315`	`317`	`var fileInfo = new FileInfo(destPath);`