From 94fd7cf5c1e05d057d97b94412dec9f261d2a971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Jasi=C5=84ski?= Date: Tue, 12 May 2026 14:55:34 +0200 Subject: [PATCH 1/2] feat(ingestion): implement hybrid metadata verification form in ingestion modal #34 --- .../Services/IBookStorageService.cs | 7 + .../Commands/Library/IngestEbookCommand.cs | 12 ++ .../Library/IngestEbookCommandHandler.cs | 71 ++++++++++ .../Commands/Library/IngestEbookRequest.cs | 8 ++ .../Queries/Reader/LocalEpubMetadata.cs | 11 +- .../DependencyInjection.cs | 1 + .../Services/BookStorageService.cs | 50 +++++++ .../Services/EpubService.cs | 2 +- .../Organisms/BookIngestionModal.razor | 111 +++++++++++++-- .../Organisms/BookIngestionModal.razor.css | 128 ++++++++++++++++++ src/NexusReader.Web.Client/Program.cs | 7 + .../Services/WasmEpubService.cs | 2 +- src/NexusReader.Web/Program.cs | 43 +++++- 13 files changed, 431 insertions(+), 22 deletions(-) create mode 100644 src/NexusReader.Application/Abstractions/Services/IBookStorageService.cs create mode 100644 src/NexusReader.Application/Commands/Library/IngestEbookCommand.cs create mode 100644 src/NexusReader.Application/Commands/Library/IngestEbookCommandHandler.cs create mode 100644 src/NexusReader.Application/Commands/Library/IngestEbookRequest.cs create mode 100644 src/NexusReader.Infrastructure/Services/BookStorageService.cs diff --git a/src/NexusReader.Application/Abstractions/Services/IBookStorageService.cs b/src/NexusReader.Application/Abstractions/Services/IBookStorageService.cs new file mode 100644 index 0000000..eb39b53 --- /dev/null +++ b/src/NexusReader.Application/Abstractions/Services/IBookStorageService.cs @@ -0,0 +1,7 @@ +namespace NexusReader.Application.Abstractions.Services; + +public interface IBookStorageService +{ + Task SaveEbookAsync(byte[] data, string fileName); + Task SaveCoverAsync(byte[] data, string fileName); +} diff --git a/src/NexusReader.Application/Commands/Library/IngestEbookCommand.cs b/src/NexusReader.Application/Commands/Library/IngestEbookCommand.cs new file mode 100644 index 0000000..18c11c4 --- /dev/null +++ b/src/NexusReader.Application/Commands/Library/IngestEbookCommand.cs @@ -0,0 +1,12 @@ +using NexusReader.Application.Abstractions.Messaging; + +namespace NexusReader.Application.Commands.Library; + +public record IngestEbookCommand( + string Title, + string AuthorName, + byte[]? CoverImage, + byte[] EpubData, + string UserId, + string TenantId = "global" +) : ICommand; diff --git a/src/NexusReader.Application/Commands/Library/IngestEbookCommandHandler.cs b/src/NexusReader.Application/Commands/Library/IngestEbookCommandHandler.cs new file mode 100644 index 0000000..f01dcd3 --- /dev/null +++ b/src/NexusReader.Application/Commands/Library/IngestEbookCommandHandler.cs @@ -0,0 +1,71 @@ +using FluentResults; +using MediatR; +using Microsoft.EntityFrameworkCore; +using NexusReader.Application.Abstractions.Messaging; +using NexusReader.Application.Abstractions.Services; +using NexusReader.Data.Persistence; +using NexusReader.Domain.Entities; + +namespace NexusReader.Application.Commands.Library; + +public class IngestEbookCommandHandler : IRequestHandler> +{ + private readonly IDbContextFactory _dbContextFactory; + private readonly IBookStorageService _storageService; + + public IngestEbookCommandHandler( + IDbContextFactory dbContextFactory, + IBookStorageService storageService) + { + _dbContextFactory = dbContextFactory; + _storageService = storageService; + } + + public async Task> Handle(IngestEbookCommand request, CancellationToken cancellationToken) + { + try + { + using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken); + + // 1. Save Files + var epubPath = await _storageService.SaveEbookAsync(request.EpubData, $"{request.Title}.epub"); + var coverUrl = request.CoverImage != null && request.CoverImage.Length > 0 + ? await _storageService.SaveCoverAsync(request.CoverImage, $"{request.Title}_cover.jpg") + : null; + + // 2. Resolve Author + var authorName = string.IsNullOrWhiteSpace(request.AuthorName) ? "Unknown Author" : request.AuthorName.Trim(); + var author = await context.Authors + .FirstOrDefaultAsync(a => a.Name.ToLower() == authorName.ToLower(), cancellationToken); + + if (author == null) + { + author = new Author { Name = authorName }; + context.Authors.Add(author); + // We need to save to get the Author ID if we want to use it, + // but EF will handle it if we assign the object. + } + + // 3. Create Ebook + var ebook = new Ebook + { + Title = request.Title, + Author = author, + FilePath = epubPath, + CoverUrl = coverUrl, + UserId = request.UserId, + TenantId = request.TenantId, + AddedDate = DateTime.UtcNow + }; + + context.Ebooks.Add(ebook); + await context.SaveChangesAsync(cancellationToken); + + return Result.Ok(ebook.Id); + } + catch (Exception ex) + { + return Result.Fail(new Error("Failed to ingest ebook").CausedBy(ex)); + } + } +} diff --git a/src/NexusReader.Application/Commands/Library/IngestEbookRequest.cs b/src/NexusReader.Application/Commands/Library/IngestEbookRequest.cs new file mode 100644 index 0000000..16adfbc --- /dev/null +++ b/src/NexusReader.Application/Commands/Library/IngestEbookRequest.cs @@ -0,0 +1,8 @@ +namespace NexusReader.Application.Commands.Library; + +public record IngestEbookRequest( + string Title, + string AuthorName, + string? CoverImageBase64, + string EpubDataBase64 +); diff --git a/src/NexusReader.Application/Queries/Reader/LocalEpubMetadata.cs b/src/NexusReader.Application/Queries/Reader/LocalEpubMetadata.cs index be21c38..bfaee6a 100644 --- a/src/NexusReader.Application/Queries/Reader/LocalEpubMetadata.cs +++ b/src/NexusReader.Application/Queries/Reader/LocalEpubMetadata.cs @@ -1,7 +1,8 @@ namespace NexusReader.Application.Queries.Reader; -public record LocalEpubMetadata( - string Title, - string Author, - byte[]? CoverImage = null -); +public record LocalEpubMetadata +{ + public string Title { get; set; } = string.Empty; + public string Author { get; set; } = string.Empty; + public byte[]? CoverImage { get; set; } +} diff --git a/src/NexusReader.Infrastructure/DependencyInjection.cs b/src/NexusReader.Infrastructure/DependencyInjection.cs index 46d4fc4..2779061 100644 --- a/src/NexusReader.Infrastructure/DependencyInjection.cs +++ b/src/NexusReader.Infrastructure/DependencyInjection.cs @@ -75,6 +75,7 @@ public static class DependencyInjection services.AddScoped(); services.AddTransient(); services.AddTransient(); + services.AddScoped(); services.AddAuthorizationCore(options => { diff --git a/src/NexusReader.Infrastructure/Services/BookStorageService.cs b/src/NexusReader.Infrastructure/Services/BookStorageService.cs new file mode 100644 index 0000000..caaed22 --- /dev/null +++ b/src/NexusReader.Infrastructure/Services/BookStorageService.cs @@ -0,0 +1,50 @@ +using Microsoft.AspNetCore.Hosting; +using NexusReader.Application.Abstractions.Services; + +namespace NexusReader.Infrastructure.Services; + +public class BookStorageService : IBookStorageService +{ + private readonly IWebHostEnvironment _environment; + + public BookStorageService(IWebHostEnvironment environment) + { + _environment = environment; + } + + public async Task SaveEbookAsync(byte[] data, string fileName) + { + var uploadsFolder = Path.Combine(_environment.WebRootPath, "uploads"); + if (!Directory.Exists(uploadsFolder)) + { + Directory.CreateDirectory(uploadsFolder); + } + + var uniqueFileName = $"{Guid.NewGuid()}_{fileName}"; + var filePath = Path.Combine(uploadsFolder, uniqueFileName); + + await File.WriteAllBytesAsync(filePath, data); + + // Return relative path for web access if needed, but entity expects FilePath + // Let's return the relative path from wwwroot + return Path.Combine("uploads", uniqueFileName); + } + + public async Task SaveCoverAsync(byte[] data, string fileName) + { + if (data == null || data.Length == 0) return null; + + var coversFolder = Path.Combine(_environment.WebRootPath, "covers"); + if (!Directory.Exists(coversFolder)) + { + Directory.CreateDirectory(coversFolder); + } + + var uniqueFileName = $"{Guid.NewGuid()}_{fileName}"; + var filePath = Path.Combine(coversFolder, uniqueFileName); + + await File.WriteAllBytesAsync(filePath, data); + + return Path.Combine("covers", uniqueFileName); + } +} diff --git a/src/NexusReader.Infrastructure/Services/EpubService.cs b/src/NexusReader.Infrastructure/Services/EpubService.cs index a473e9e..dea9445 100644 --- a/src/NexusReader.Infrastructure/Services/EpubService.cs +++ b/src/NexusReader.Infrastructure/Services/EpubService.cs @@ -228,7 +228,7 @@ public class EpubMetadataExtractor : IEpubMetadataExtractor var title = bookRef.Title ?? "Unknown Title"; var author = bookRef.Author ?? "Unknown Author"; byte[]? cover = await bookRef.ReadCoverAsync(); - return Result.Ok(new LocalEpubMetadata(title, author, cover)); + return Result.Ok(new LocalEpubMetadata { Title = title, Author = author, CoverImage = cover }); } catch (Exception ex) { diff --git a/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor b/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor index 41c3718..b9d87c0 100644 --- a/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor +++ b/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor @@ -1,8 +1,13 @@ @using Microsoft.AspNetCore.Components.Forms @using NexusReader.Application.Abstractions.Services @using NexusReader.Application.Queries.Reader +@using NexusReader.Application.Commands.Library +@using System.Net.Http.Json @inject IEpubMetadataExtractor MetadataExtractor @inject ILogger Logger +@inject HttpClient Http +@inject IReaderNavigationService ReaderNavigation +@inject IJSRuntime JSRuntime @implements IAsyncDisposable @if (IsOpen) @@ -24,22 +29,48 @@ -
+
@if (Metadata != null) { -
-

@Metadata.Title

-

@Metadata.Author

+
+
+ @if (Metadata.CoverImage != null) + { + Cover Preview + } + else + { +
+ +
+ } +
+ +
+
+ + +
+
+ + +
+
+
- - + Back + + @(IsIngesting ? "" : "Save to Library") +
}
@@ -64,6 +95,8 @@
} + + @code { /// /// Gets or sets a value indicating whether the modal is open. @@ -79,8 +112,11 @@ private bool _isDragging; private bool IsParsing { get; set; } + private bool IsVerifying { get; set; } + private bool IsIngesting { get; set; } private LocalEpubMetadata? Metadata { get; set; } private string? ErrorMessage { get; set; } + private byte[]? _epubBytes; // Allow up to 50 MB private const long MaxFileSize = 50 * 1024 * 1024; @@ -95,9 +131,12 @@ private void Reset() { IsParsing = false; + IsVerifying = false; + IsIngesting = false; Metadata = null; ErrorMessage = null; _isDragging = false; + _epubBytes = null; } private void OnDragEnter() => _isDragging = true; @@ -123,17 +162,17 @@ try { using var stream = file.OpenReadStream(MaxFileSize); - - // In Blazor WASM, we might need to copy to memory stream first for synchronous parsing if the parser doesn't stream well over interop using var memoryStream = new MemoryStream(); await stream.CopyToAsync(memoryStream); + _epubBytes = memoryStream.ToArray(); + memoryStream.Position = 0; - var result = await MetadataExtractor.ExtractMetadataAsync(memoryStream); if (result.IsSuccess) { Metadata = result.Value; + IsVerifying = true; } else { @@ -143,7 +182,7 @@ catch (Exception ex) { Logger.LogError(ex, "Error uploading EPUB"); - ErrorMessage = $"An unexpected error occurred: {ex.Message} \n {ex.StackTrace}"; + ErrorMessage = $"An unexpected error occurred: {ex.Message}"; } finally { @@ -151,9 +190,57 @@ StateHasChanged(); } } + + private async Task SaveToLibrary() + { + if (Metadata == null || _epubBytes == null) return; + + IsIngesting = true; + ErrorMessage = null; + StateHasChanged(); + + try + { + var request = new IngestEbookRequest( + Metadata.Title, + Metadata.Author, + Metadata.CoverImage != null ? Convert.ToBase64String(Metadata.CoverImage) : null, + Convert.ToBase64String(_epubBytes) + ); + + var response = await Http.PostAsJsonAsync("api/library/ingest", request); + + if (response.IsSuccessStatusCode) + { + var result = await response.Content.ReadFromJsonAsync(); + if (result != null) + { + await CloseModal(); + // Navigate to the newly added book + // ReaderNavigation.NavigateToBook(result.Id); + } + } + else + { + ErrorMessage = await response.Content.ReadAsStringAsync(); + } + } + catch (Exception ex) + { + Logger.LogError(ex, "Error during ingestion"); + ErrorMessage = "Failed to save book to library. Please try again."; + } + finally + { + IsIngesting = false; + StateHasChanged(); + } + } + + private record IngestResult(Guid Id); + public ValueTask DisposeAsync() { - // Cleanup if necessary return ValueTask.CompletedTask; } } diff --git a/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor.css b/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor.css index 635ca08..e8689a2 100644 --- a/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor.css +++ b/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor.css @@ -242,11 +242,139 @@ transform: translateY(0); } +/* Verification State */ +.verification-state { + display: flex; + flex-direction: column; + gap: 1.5rem; + animation: fadeIn 0.4s ease-out; +} + +.verification-layout { + display: grid; + grid-template-columns: 140px 1fr; + gap: 2rem; + align-items: start; +} + +.cover-preview { + width: 140px; + height: 200px; + border-radius: 12px; + overflow: hidden; + background: rgba(255, 255, 255, 0.03); + border: 1px solid rgba(255, 255, 255, 0.1); + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.3); + position: relative; +} + +.cover-preview img { + width: 100%; + height: 100%; + object-fit: cover; +} + +.glowing-placeholder { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + background: linear-gradient(135deg, #1a1a1a 0%, #0a0a0a 100%); + position: relative; + overflow: hidden; +} + +.glowing-placeholder::after { + content: ''; + position: absolute; + width: 150%; + height: 150%; + background: radial-gradient(circle, rgba(0, 255, 153, 0.15) 0%, transparent 70%); + animation: pulseGlow 4s infinite alternate; +} + +.glowing-placeholder svg { + color: var(--nexus-neon, #00ffaa); + opacity: 0.5; + z-index: 1; + filter: drop-shadow(0 0 10px rgba(0, 255, 153, 0.3)); +} + +.verification-form { + display: flex; + flex-direction: column; + gap: 1.25rem; +} + +.form-group { + display: flex; + flex-direction: column; + gap: 0.5rem; +} + +.form-group label { + font-size: 0.75rem; + text-transform: uppercase; + letter-spacing: 1px; + color: var(--nexus-text-muted, #888); + font-weight: 600; +} + +.form-input { + background: rgba(255, 255, 255, 0.03); + border: 1px solid rgba(255, 255, 255, 0.1); + border-radius: 8px; + padding: 0.75rem 1rem; + color: var(--nexus-text); + font-family: var(--nexus-font-sans); + transition: all 0.3s; +} + +.form-input:focus { + outline: none; + border-color: var(--nexus-neon, #00ffaa); + background: rgba(255, 255, 255, 0.06); + box-shadow: 0 0 15px rgba(0, 255, 153, 0.1); +} + .error-message { margin-top: 1rem; color: #ff5555; text-align: center; font-size: 0.9rem; + padding: 0.75rem; + background: rgba(255, 85, 85, 0.1); + border-radius: 8px; + border: 1px solid rgba(255, 85, 85, 0.2); +} + +@keyframes pulseGlow { + from { transform: scale(1); opacity: 0.5; } + to { transform: scale(1.2); opacity: 0.8; } +} + +.btn:disabled { + opacity: 0.5; + cursor: not-allowed; + filter: grayscale(1); +} + +.btn-loading { + position: relative; + color: transparent !important; +} + +.btn-loading::after { + content: ""; + position: absolute; + width: 20px; + height: 20px; + border: 2px solid rgba(0, 0, 0, 0.1); + border-top-color: #000; + border-radius: 50%; + animation: spin 0.8s linear infinite; } @keyframes fadeIn { diff --git a/src/NexusReader.Web.Client/Program.cs b/src/NexusReader.Web.Client/Program.cs index 461854d..cb7cd55 100644 --- a/src/NexusReader.Web.Client/Program.cs +++ b/src/NexusReader.Web.Client/Program.cs @@ -45,6 +45,7 @@ builder.Services.AddScoped(sp => sp.GetRequiredService().Cre // Dummy registrations for server-only handlers to satisfy DI validation builder.Services.AddSingleton>(new ThrowingDbContextFactory()); builder.Services.AddSingleton>>(new ThrowingEmbeddingGenerator()); +builder.Services.AddSingleton(new ThrowingBookStorageService()); builder.Services.AddApplication(); builder.Services.AddScoped(); @@ -64,3 +65,9 @@ public class ThrowingEmbeddingGenerator : IEmbeddingGenerator throw new NotSupportedException("Embedding generation cannot be used in WASM client."); public object? GetService(Type serviceType, object? serviceKey = null) => null; } + +public class ThrowingBookStorageService : IBookStorageService +{ + public Task SaveEbookAsync(byte[] data, string fileName) => throw new NotSupportedException(); + public Task SaveCoverAsync(byte[] data, string fileName) => throw new NotSupportedException(); +} diff --git a/src/NexusReader.Web.Client/Services/WasmEpubService.cs b/src/NexusReader.Web.Client/Services/WasmEpubService.cs index 63c5760..e2cb7de 100644 --- a/src/NexusReader.Web.Client/Services/WasmEpubService.cs +++ b/src/NexusReader.Web.Client/Services/WasmEpubService.cs @@ -48,7 +48,7 @@ public class WasmEpubMetadataExtractor : IEpubMetadataExtractor var title = bookRef.Title ?? "Unknown Title"; var author = bookRef.Author ?? "Unknown Author"; byte[]? cover = await bookRef.ReadCoverAsync(); - return Result.Ok(new LocalEpubMetadata(title, author, cover)); + return Result.Ok(new LocalEpubMetadata { Title = title, Author = author, CoverImage = cover }); } catch (Exception ex) { diff --git a/src/NexusReader.Web/Program.cs b/src/NexusReader.Web/Program.cs index 9dc5875..0ed60e3 100644 --- a/src/NexusReader.Web/Program.cs +++ b/src/NexusReader.Web/Program.cs @@ -1,9 +1,11 @@ using NexusReader.Web.Components; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Components; using NexusReader.Application; using NexusReader.Infrastructure; using NexusReader.Application.Abstractions.Services; using NexusReader.Application.Queries.User; +using NexusReader.Application.Commands.Library; using MediatR; using NexusReader.Web.Client.Services; using NexusReader.UI.Shared.Services; @@ -48,9 +50,20 @@ builder.Services.AddScoped( builder.Services.AddScoped(); builder.Services.AddScoped(); -builder.Services.AddHttpClient("NexusAPI", client => +builder.Services.AddHttpClient("NexusAPI", (sp, client) => { - client.BaseAddress = new Uri(builder.Configuration["ApiBaseUrl"] ?? "http://localhost:5000"); + var configuration = sp.GetRequiredService(); + var apiBaseUrl = configuration["ApiBaseUrl"]; + if (!string.IsNullOrEmpty(apiBaseUrl)) + { + client.BaseAddress = new Uri(apiBaseUrl); + } + else + { + // For local development/Interactive Server, we use the current base address + var nav = sp.GetRequiredService(); + client.BaseAddress = new Uri(nav.BaseUri); + } }); builder.Services.AddScoped(sp => sp.GetRequiredService().CreateClient("NexusAPI")); @@ -220,9 +233,9 @@ if (!app.Environment.IsDevelopment()) app.UseHttpsRedirection(); } -app.UseAntiforgery(); app.UseAuthentication(); app.UseAuthorization(); +app.UseAntiforgery(); app.MapStaticAssets(); app.MapHub("/synchub"); @@ -281,6 +294,30 @@ knowledgeApi.MapDelete("/", async (IKnowledgeService knowledgeService) => return Results.BadRequest(errorMsg); }); +app.MapPost("/api/library/ingest", async ([FromBody] IngestEbookRequest request, ClaimsPrincipal user, IMediator mediator) => +{ + var userId = user.FindFirstValue(ClaimTypes.NameIdentifier); + if (string.IsNullOrEmpty(userId)) return Results.Unauthorized(); + + var epubData = Convert.FromBase64String(request.EpubDataBase64); + byte[]? coverData = !string.IsNullOrEmpty(request.CoverImageBase64) + ? Convert.FromBase64String(request.CoverImageBase64) + : null; + + var command = new IngestEbookCommand( + request.Title, + request.AuthorName, + coverData, + epubData, + userId + ); + + var result = await mediator.Send(command); + if (result.IsSuccess) return Results.Ok(new { Id = result.Value }); + + return Results.BadRequest(result.Errors.FirstOrDefault()?.Message ?? "Ingestion failed"); +}).RequireAuthorization().DisableAntiforgery(); + app.MapPost("/api/StripeWebhook", async ( HttpContext context, UserManager userManager, -- 2.52.0 From 531ad3c2d032ee0766df4adaa6336652c8153754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Jasi=C5=84ski?= Date: Tue, 12 May 2026 20:12:12 +0200 Subject: [PATCH 2/2] refactor: address PR review comments for ingestion workflow --- .../Services/IBookStorageService.cs | 22 +++++++++ .../Commands/Library/IngestEbookCommand.cs | 9 ++++ .../Library/IngestEbookCommandHandler.cs | 30 +++++++++---- .../Queries/Reader/LocalEpubMetadata.cs | 14 ++++++ .../DependencyInjection.cs | 2 +- .../Services/BookStorageService.cs | 45 ++++++++++++++----- .../Organisms/BookIngestionModal.razor | 3 +- .../Organisms/BookIngestionModal.razor.css | 10 ++--- .../Services/IReaderNavigationService.cs | 5 +++ .../Services/ReaderNavigationService.cs | 13 ++++++ src/NexusReader.Web.Client/Program.cs | 8 +++- src/NexusReader.Web/Program.cs | 1 - 12 files changed, 131 insertions(+), 31 deletions(-) diff --git a/src/NexusReader.Application/Abstractions/Services/IBookStorageService.cs b/src/NexusReader.Application/Abstractions/Services/IBookStorageService.cs index eb39b53..a45b420 100644 --- a/src/NexusReader.Application/Abstractions/Services/IBookStorageService.cs +++ b/src/NexusReader.Application/Abstractions/Services/IBookStorageService.cs @@ -1,7 +1,29 @@ namespace NexusReader.Application.Abstractions.Services; +/// +/// Service for managing ebook and cover file storage. +/// public interface IBookStorageService { + /// + /// Saves an ebook file and returns its relative path/URL. + /// Task SaveEbookAsync(byte[] data, string fileName); + + /// + /// Saves an ebook file using a stream and returns its relative path/URL. + /// + Task SaveEbookAsync(Stream data, string fileName); + + /// + /// Saves a cover image and returns its relative path/URL. + /// Returns null if no cover data is provided. + /// Task SaveCoverAsync(byte[] data, string fileName); + + /// + /// Saves a cover image using a stream and returns its relative path/URL. + /// Returns null if no cover data is provided. + /// + Task SaveCoverAsync(Stream data, string fileName); } diff --git a/src/NexusReader.Application/Commands/Library/IngestEbookCommand.cs b/src/NexusReader.Application/Commands/Library/IngestEbookCommand.cs index 18c11c4..7026e25 100644 --- a/src/NexusReader.Application/Commands/Library/IngestEbookCommand.cs +++ b/src/NexusReader.Application/Commands/Library/IngestEbookCommand.cs @@ -2,6 +2,15 @@ using NexusReader.Application.Abstractions.Messaging; namespace NexusReader.Application.Commands.Library; +/// +/// Command to ingest a new ebook into the library. +/// +/// The title of the book. +/// The name of the author. +/// The raw bytes of the cover image (optional). +/// The raw bytes of the EPUB file. +/// The ID of the user owning the book. +/// The tenant ID for multi-tenant isolation. Defaults to "global" for single-tenant or default usage. public record IngestEbookCommand( string Title, string AuthorName, diff --git a/src/NexusReader.Application/Commands/Library/IngestEbookCommandHandler.cs b/src/NexusReader.Application/Commands/Library/IngestEbookCommandHandler.cs index f01dcd3..0b2727d 100644 --- a/src/NexusReader.Application/Commands/Library/IngestEbookCommandHandler.cs +++ b/src/NexusReader.Application/Commands/Library/IngestEbookCommandHandler.cs @@ -23,18 +23,30 @@ public class IngestEbookCommandHandler : IRequestHandler> Handle(IngestEbookCommand request, CancellationToken cancellationToken) { + using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken); + + string epubPath; + string? coverUrl; + try { - using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken); - // 1. Save Files - var epubPath = await _storageService.SaveEbookAsync(request.EpubData, $"{request.Title}.epub"); - var coverUrl = request.CoverImage != null && request.CoverImage.Length > 0 + epubPath = await _storageService.SaveEbookAsync(request.EpubData, $"{request.Title}.epub"); + coverUrl = request.CoverImage != null && request.CoverImage.Length > 0 ? await _storageService.SaveCoverAsync(request.CoverImage, $"{request.Title}_cover.jpg") : null; + } + catch (Exception ex) + { + return Result.Fail(new Error($"Storage failure: {ex.Message}").CausedBy(ex)); + } + try + { // 2. Resolve Author var authorName = string.IsNullOrWhiteSpace(request.AuthorName) ? "Unknown Author" : request.AuthorName.Trim(); + + // Use case-insensitive comparison var author = await context.Authors .FirstOrDefaultAsync(a => a.Name.ToLower() == authorName.ToLower(), cancellationToken); @@ -42,8 +54,6 @@ public class IngestEbookCommandHandler : IRequestHandler +/// Represents metadata extracted from a local EPUB file. +/// public record LocalEpubMetadata { + /// + /// The title of the book. + /// public string Title { get; set; } = string.Empty; + + /// + /// The author(s) of the book. + /// public string Author { get; set; } = string.Empty; + + /// + /// The raw bytes of the cover image, if available. + /// public byte[]? CoverImage { get; set; } } diff --git a/src/NexusReader.Infrastructure/DependencyInjection.cs b/src/NexusReader.Infrastructure/DependencyInjection.cs index 2779061..3484315 100644 --- a/src/NexusReader.Infrastructure/DependencyInjection.cs +++ b/src/NexusReader.Infrastructure/DependencyInjection.cs @@ -75,7 +75,7 @@ public static class DependencyInjection services.AddScoped(); services.AddTransient(); services.AddTransient(); - services.AddScoped(); + services.AddSingleton(); services.AddAuthorizationCore(options => { diff --git a/src/NexusReader.Infrastructure/Services/BookStorageService.cs b/src/NexusReader.Infrastructure/Services/BookStorageService.cs index caaed22..58ec6ca 100644 --- a/src/NexusReader.Infrastructure/Services/BookStorageService.cs +++ b/src/NexusReader.Infrastructure/Services/BookStorageService.cs @@ -3,6 +3,10 @@ using NexusReader.Application.Abstractions.Services; namespace NexusReader.Infrastructure.Services; +/// +/// Infrastructure implementation of book storage using local filesystem. +/// All paths returned are relative to the web root. +/// public class BookStorageService : IBookStorageService { private readonly IWebHostEnvironment _environment; @@ -13,38 +17,55 @@ public class BookStorageService : IBookStorageService } public async Task SaveEbookAsync(byte[] data, string fileName) + { + using var stream = new MemoryStream(data); + return await SaveEbookAsync(stream, fileName); + } + + public async Task SaveEbookAsync(Stream data, string fileName) { var uploadsFolder = Path.Combine(_environment.WebRootPath, "uploads"); - if (!Directory.Exists(uploadsFolder)) - { - Directory.CreateDirectory(uploadsFolder); - } + EnsureDirectoryExists(uploadsFolder); var uniqueFileName = $"{Guid.NewGuid()}_{fileName}"; var filePath = Path.Combine(uploadsFolder, uniqueFileName); - await File.WriteAllBytesAsync(filePath, data); + using (var fileStream = new FileStream(filePath, FileMode.Create)) + { + await data.CopyToAsync(fileStream); + } - // Return relative path for web access if needed, but entity expects FilePath - // Let's return the relative path from wwwroot return Path.Combine("uploads", uniqueFileName); } public async Task SaveCoverAsync(byte[] data, string fileName) { if (data == null || data.Length == 0) return null; + using var stream = new MemoryStream(data); + return await SaveCoverAsync(stream, fileName); + } + public async Task SaveCoverAsync(Stream data, string fileName) + { var coversFolder = Path.Combine(_environment.WebRootPath, "covers"); - if (!Directory.Exists(coversFolder)) - { - Directory.CreateDirectory(coversFolder); - } + EnsureDirectoryExists(coversFolder); var uniqueFileName = $"{Guid.NewGuid()}_{fileName}"; var filePath = Path.Combine(coversFolder, uniqueFileName); - await File.WriteAllBytesAsync(filePath, data); + using (var fileStream = new FileStream(filePath, FileMode.Create)) + { + await data.CopyToAsync(fileStream); + } return Path.Combine("covers", uniqueFileName); } + + private void EnsureDirectoryExists(string path) + { + if (!Directory.Exists(path)) + { + Directory.CreateDirectory(path); + } + } } diff --git a/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor b/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor index b9d87c0..6caa2b0 100644 --- a/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor +++ b/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor @@ -216,8 +216,7 @@ if (result != null) { await CloseModal(); - // Navigate to the newly added book - // ReaderNavigation.NavigateToBook(result.Id); + ReaderNavigation.NavigateToBook(result.Id); } } else diff --git a/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor.css b/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor.css index e8689a2..64f412f 100644 --- a/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor.css +++ b/src/NexusReader.UI.Shared/Components/Organisms/BookIngestionModal.razor.css @@ -291,7 +291,7 @@ position: absolute; width: 150%; height: 150%; - background: radial-gradient(circle, rgba(0, 255, 153, 0.15) 0%, transparent 70%); + background: radial-gradient(circle, var(--nexus-neon-alpha, rgba(0, 255, 153, 0.15)) 0%, transparent 70%); animation: pulseGlow 4s infinite alternate; } @@ -299,7 +299,7 @@ color: var(--nexus-neon, #00ffaa); opacity: 0.5; z-index: 1; - filter: drop-shadow(0 0 10px rgba(0, 255, 153, 0.3)); + filter: drop-shadow(0 0 10px var(--nexus-neon-alpha-deep, rgba(0, 255, 153, 0.3))); } .verification-form { @@ -341,13 +341,13 @@ .error-message { margin-top: 1rem; - color: #ff5555; + color: var(--nexus-error, #ff5555); text-align: center; font-size: 0.9rem; padding: 0.75rem; - background: rgba(255, 85, 85, 0.1); + background: var(--nexus-error-alpha, rgba(255, 85, 85, 0.1)); border-radius: 8px; - border: 1px solid rgba(255, 85, 85, 0.2); + border: 1px solid var(--nexus-error-alpha-deep, rgba(255, 85, 85, 0.2)); } @keyframes pulseGlow { diff --git a/src/NexusReader.UI.Shared/Services/IReaderNavigationService.cs b/src/NexusReader.UI.Shared/Services/IReaderNavigationService.cs index 31c1b25..ff7096d 100644 --- a/src/NexusReader.UI.Shared/Services/IReaderNavigationService.cs +++ b/src/NexusReader.UI.Shared/Services/IReaderNavigationService.cs @@ -12,4 +12,9 @@ public interface IReaderNavigationService Task GoToNextChapter(); Task GoToPreviousChapter(); Task UpdateMetadataAsync(int currentIndex, int totalChapters, string title); + + /// + /// Navigates to the reader for a specific book. + /// + void NavigateToBook(Guid bookId); } diff --git a/src/NexusReader.UI.Shared/Services/ReaderNavigationService.cs b/src/NexusReader.UI.Shared/Services/ReaderNavigationService.cs index 837daf7..15e55ce 100644 --- a/src/NexusReader.UI.Shared/Services/ReaderNavigationService.cs +++ b/src/NexusReader.UI.Shared/Services/ReaderNavigationService.cs @@ -1,9 +1,17 @@ using System.Linq; +using Microsoft.AspNetCore.Components; namespace NexusReader.UI.Shared.Services; public class ReaderNavigationService : IReaderNavigationService { + private readonly NavigationManager _navigationManager; + + public ReaderNavigationService(NavigationManager navigationManager) + { + _navigationManager = navigationManager; + } + public int CurrentChapterIndex { get; private set; } = 0; public int TotalChapters { get; private set; } = 1; public string ChapterTitle { get; private set; } = "Loading..."; @@ -47,6 +55,11 @@ public class ReaderNavigationService : IReaderNavigationService } } + public void NavigateToBook(Guid bookId) + { + _navigationManager.NavigateTo($"/reader/{bookId}"); + } + private async Task NotifyNavigationChangedAsync() { var handlers = OnNavigationChanged?.GetInvocationList(); diff --git a/src/NexusReader.Web.Client/Program.cs b/src/NexusReader.Web.Client/Program.cs index cb7cd55..eeb4f74 100644 --- a/src/NexusReader.Web.Client/Program.cs +++ b/src/NexusReader.Web.Client/Program.cs @@ -68,6 +68,10 @@ public class ThrowingEmbeddingGenerator : IEmbeddingGenerator SaveEbookAsync(byte[] data, string fileName) => throw new NotSupportedException(); - public Task SaveCoverAsync(byte[] data, string fileName) => throw new NotSupportedException(); + private const string ErrorMessage = "File storage operations are not supported in the WASM client. Use the API endpoint for ingestion."; + + public Task SaveEbookAsync(byte[] data, string fileName) => throw new NotSupportedException(ErrorMessage); + public Task SaveEbookAsync(Stream data, string fileName) => throw new NotSupportedException(ErrorMessage); + public Task SaveCoverAsync(byte[] data, string fileName) => throw new NotSupportedException(ErrorMessage); + public Task SaveCoverAsync(Stream data, string fileName) => throw new NotSupportedException(ErrorMessage); } diff --git a/src/NexusReader.Web/Program.cs b/src/NexusReader.Web/Program.cs index 0ed60e3..0cdd861 100644 --- a/src/NexusReader.Web/Program.cs +++ b/src/NexusReader.Web/Program.cs @@ -67,7 +67,6 @@ builder.Services.AddHttpClient("NexusAPI", (sp, client) => }); builder.Services.AddScoped(sp => sp.GetRequiredService().CreateClient("NexusAPI")); -builder.Services.AddHttpContextAccessor(); builder.Services.AddScoped(); builder.Services.AddCascadingAuthenticationState(); -- 2.52.0