Updates on downloader console

Author: S1mplector

Koware.Cli/Console/DownloadConsole.cs

@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using Koware.Domain.Models;
+
+namespace Koware.Cli.Console;
+
+internal static class DownloadConsole
+{
+    public static void PrintEpisodeHeader(string title, Episode episode, string? quality, int index, int total, string outputPath)
+    {
+        System.Console.WriteLine();
+        System.Console.ForegroundColor = ConsoleColor.Cyan;
+        System.Console.WriteLine($"Downloading {title} - Ep {episode.Number} [{quality ?? "auto"}] ({index}/{total})");
+        System.Console.ResetColor();
+        System.Console.WriteLine($"  -> {outputPath}");
+    }
+
+    public static void PrintEpisodeResult(string outputPath, int episodesLeft)
+    {
+        double sizeMb = 0;
+
+        try
+        {
+            if (File.Exists(outputPath))
+            {
+                var length = new FileInfo(outputPath).Length;
+                sizeMb = length / (1024.0 * 1024.0);
+            }
+        }
+        catch
+        {
+        }
+
+        if (sizeMb > 0)
+        {
+            System.Console.WriteLine($"  Downloaded size: {sizeMb:0.0} MiB");
+        }
+        else
+        {
+            System.Console.WriteLine("  Download completed.");
+        }
+
+        if (episodesLeft > 0)
+        {
+            System.Console.WriteLine($"  Episodes left to download: {episodesLeft}");
+        }
+    }
+}

Koware.Cli/Program.cs

@@ -39,8 +39,8 @@ static IHost BuildHost(string[] args)
     builder.Services.AddSingleton<IWatchHistoryStore, SqliteWatchHistoryStore>();
     builder.Logging.SetMinimumLevel(LogLevel.Warning);
     builder.Logging.AddFilter("koware", LogLevel.Information);
-    builder.Logging.AddFilter("Koware", LogLevel.Information);
     builder.Logging.AddFilter("Koware.Infrastructure.Scraping.GogoAnimeCatalog", LogLevel.Error);
+    builder.Logging.AddFilter("Koware.Infrastructure.Scraping.AllAnimeCatalog", LogLevel.Error);
 
     return builder.Build();
 }
@@ -918,10 +918,7 @@ static async Task<int> HandleDownloadAsync(ScrapeOrchestrator orchestrator, stri
                 : allAnimeOptions?.Referer;
             var httpUserAgent = allAnimeOptions?.UserAgent;
 
-            Console.WriteLine();
-            Console.ForegroundColor = ConsoleColor.Cyan;
-            Console.WriteLine($"Downloading {title} - Ep {episode.Number} [{stream.Quality ?? "auto"}] ({index}/{total})");
-            Console.ResetColor();
+            DownloadConsole.PrintEpisodeHeader(title, episode, stream.Quality, index, total, outputPath);
 
             var isPlaylist = IsPlaylist(stream);
             var ffmpegPath = ResolveExecutablePath("ffmpeg");
@@ -940,6 +937,9 @@ static async Task<int> HandleDownloadAsync(ScrapeOrchestrator orchestrator, stri
             {
                 await DownloadWithHttpAsync(httpClient, stream, outputPath, httpReferrer, httpUserAgent, logger, cancellationToken);
             }
+
+            var episodesLeft = total - index;
+            DownloadConsole.PrintEpisodeResult(outputPath, episodesLeft);
         }
         catch (OperationCanceledException)
         {
@@ -1267,56 +1267,11 @@ static async Task DownloadWithHttpAsync(HttpClient httpClient, StreamLink stream
     await using var fileStream = new FileStream(outputPath, FileMode.Create, FileAccess.Write, FileShare.None, 81920, useAsync: true);
 
     var buffer = new byte[81920];
-    long totalRead = 0;
     int read;
-    var lastUpdate = DateTimeOffset.UtcNow;
 
     while ((read = await responseStream.ReadAsync(buffer.AsMemory(0, buffer.Length), cancellationToken)) > 0)
     {
         await fileStream.WriteAsync(buffer.AsMemory(0, read), cancellationToken);
-        totalRead += read;
-
-        var now = DateTimeOffset.UtcNow;
-        if (now - lastUpdate > TimeSpan.FromMilliseconds(100))
-        {
-            lastUpdate = now;
-            RenderDownloadProgress(totalRead, total);
-        }
-    }
-
-    RenderDownloadProgress(totalRead, total);
-    Console.WriteLine();
-
-    static void RenderDownloadProgress(long bytesRead, long? totalBytes)
-    {
-        var readMb = bytesRead / (1024.0 * 1024.0);
-        string text;
-
-        if (totalBytes.HasValue && totalBytes.Value > 0)
-        {
-            var totalMb = totalBytes.Value / (1024.0 * 1024.0);
-            var progress = Math.Clamp(bytesRead / (double)totalBytes.Value, 0, 1);
-            const int width = 30;
-            var filled = (int)(progress * width);
-            if (filled > width)
-            {
-                filled = width;
-            }
-
-            var bar = new string('#', filled) + new string('-', width - filled);
-            text = $"[{bar}] {progress * 100,5:0.0}% {readMb,6:0.0}/{totalMb,6:0.0} MiB";
-        }
-        else
-        {
-            text = $"Downloaded {readMb:0.0} MiB";
-        }
-
-        if (text.Length > 80)
-        {
-            text = text[..80];
-        }
-
-        Console.Write("\r" + text.PadRight(80));
     }
 }
 
@@ -1342,41 +1297,72 @@ static string BuildFfmpegHeaders(string? httpReferrer, string? httpUserAgent)
     return string.Join("\r\n", parts) + "\r\n";
 }
 
-static Task DownloadWithFfmpegAsync(string ffmpegPath, StreamLink stream, string outputPath, string? httpReferrer, string? httpUserAgent, ILogger logger, CancellationToken cancellationToken)
+static async Task DownloadWithFfmpegAsync(string ffmpegPath, StreamLink stream, string outputPath, string? httpReferrer, string? httpUserAgent, ILogger logger, CancellationToken cancellationToken)
 {
-    return Task.Run(() =>
+    cancellationToken.ThrowIfCancellationRequested();
+
+    var start = new ProcessStartInfo
     {
-        cancellationToken.ThrowIfCancellationRequested();
+        FileName = ffmpegPath,
+        UseShellExecute = false,
+        RedirectStandardError = true,
+        RedirectStandardOutput = true,
+        CreateNoWindow = true
+    };
 
-        var start = new ProcessStartInfo
-        {
-            FileName = ffmpegPath,
-            UseShellExecute = false
-        };
+    start.ArgumentList.Add("-y");
+    start.ArgumentList.Add("-loglevel");
+    start.ArgumentList.Add("error");
+
+    var headers = BuildFfmpegHeaders(httpReferrer, httpUserAgent);
+    if (!string.IsNullOrWhiteSpace(headers))
+    {
+        start.ArgumentList.Add("-headers");
+        start.ArgumentList.Add(headers);
+    }
 
-        start.ArgumentList.Add("-y");
+    start.ArgumentList.Add("-i");
+    start.ArgumentList.Add(stream.Url.ToString());
+    start.ArgumentList.Add("-c");
+    start.ArgumentList.Add("copy");
+    start.ArgumentList.Add("-bsf:a");
+    start.ArgumentList.Add("aac_adtstoasc");
+    start.ArgumentList.Add(outputPath);
 
-        var headers = BuildFfmpegHeaders(httpReferrer, httpUserAgent);
-        if (!string.IsNullOrWhiteSpace(headers))
+    using var process = new Process { StartInfo = start };
+
+    try
+    {
+        if (!process.Start())
         {
-            start.ArgumentList.Add("-headers");
-            start.ArgumentList.Add(headers);
+            throw new InvalidOperationException("Failed to start ffmpeg process.");
         }
 
-        start.ArgumentList.Add("-i");
-        start.ArgumentList.Add(stream.Url.ToString());
-        start.ArgumentList.Add("-c");
-        start.ArgumentList.Add("copy");
-        start.ArgumentList.Add("-bsf:a");
-        start.ArgumentList.Add("aac_adtstoasc");
-        start.ArgumentList.Add(outputPath);
-
-        var exitCode = StartProcessAndWait(logger, start, ffmpegPath);
-        if (exitCode != 0)
+        _ = process.StandardError.ReadToEndAsync();
+        _ = process.StandardOutput.ReadToEndAsync();
+
+        await Task.Run(() => process.WaitForExit(), cancellationToken);
+
+        if (process.ExitCode != 0)
         {
-            throw new InvalidOperationException($"ffmpeg exited with code {exitCode}.");
+            throw new InvalidOperationException($"ffmpeg exited with code {process.ExitCode}.");
         }
-    }, cancellationToken);
+    }
+    catch
+    {
+        try
+        {
+            if (!process.HasExited)
+            {
+                process.Kill(entireProcessTree: true);
+            }
+        }
+        catch
+        {
+        }
+
+        throw;
+    }
 }
 
 static string? ResolveExecutablePath(string command)

Scripts/test-koware.ps1

@@ -0,0 +1,36 @@
+[CmdletBinding()]
+param(
+    [ValidateSet("Debug", "Release")]
+    [string]$Configuration = "Debug"
+)
+
+$ErrorActionPreference = "Stop"
+
+# Determine repo root (this script lives in the Scripts folder)
+$repoRoot = Split-Path -Path $PSScriptRoot -Parent
+$testProject = Join-Path $repoRoot "Koware.Tests\Koware.Tests.csproj"
+
+if (-not (Test-Path $testProject)) {
+    Write-Host "Test project not found: $testProject" -ForegroundColor Red
+    exit 1
+}
+
+Write-Host "Running Koware tests (configuration: $Configuration)..." -ForegroundColor Cyan
+
+Push-Location $repoRoot
+try {
+    dotnet test $testProject -c $Configuration --nologo
+    $exitCode = $LASTEXITCODE
+}
+finally {
+    Pop-Location
+}
+
+if ($exitCode -eq 0) {
+    Write-Host "All tests passed." -ForegroundColor Green
+    exit 0
+}
+else {
+    Write-Host "One or more tests failed. dotnet test exit code: $exitCode" -ForegroundColor Red
+    exit $exitCode
+}