Prep for Hotfix (#2362)

API/Controllers/LibraryController.cs

@@ -412,14 +412,15 @@ public class LibraryController : BaseApiController
     [HttpPost("update")]
     public async Task<ActionResult> UpdateLibrary(UpdateLibraryDto dto)
     {
+        var userId = User.GetUserId();
         var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(dto.Id, LibraryIncludes.Folders);
-        if (library == null) return BadRequest(await _localizationService.Translate(User.GetUserId(), "library-doesnt-exist"));
+        if (library == null) return BadRequest(await _localizationService.Translate(userId, "library-doesnt-exist"));
 
         var newName = dto.Name.Trim();
         if (await _unitOfWork.LibraryRepository.LibraryExists(newName) && !library.Name.Equals(newName))
-            return BadRequest(await _localizationService.Translate(User.GetUserId(), "library-name-exists"));
+            return BadRequest(await _localizationService.Translate(userId, "library-name-exists"));
 
-        var originalFolders = library.Folders.Select(x => x.Path).ToList();
+        var originalFoldersCount = library.Folders.Count;
 
         library.Name = newName;
         library.Folders = dto.Folders.Select(s => new FolderPath() {Path = s}).Distinct().ToList();
@@ -445,8 +446,8 @@ public class LibraryController : BaseApiController
 
         _unitOfWork.LibraryRepository.Update(library);
 
-        if (!await _unitOfWork.CommitAsync()) return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-library-update"));
-        if (originalFolders.Count != dto.Folders.Count() || typeUpdate)
+        if (!await _unitOfWork.CommitAsync()) return BadRequest(await _localizationService.Translate(userId, "generic-library-update"));
+        if (originalFoldersCount != dto.Folders.Count() || typeUpdate)
         {
             await _libraryWatcher.RestartWatching();
             _taskScheduler.ScanLibrary(library.Id);
@@ -458,8 +459,9 @@ public class LibraryController : BaseApiController
         }
         await _eventHub.SendMessageAsync(MessageFactory.LibraryModified,
             MessageFactory.LibraryModifiedEvent(library.Id, "update"), false);
+
         await _eventHub.SendMessageAsync(MessageFactory.SideNavUpdate,
-            MessageFactory.SideNavUpdateEvent(User.GetUserId()), false);
+            MessageFactory.SideNavUpdateEvent(userId), false);
 
         await _libraryCacheProvider.RemoveByPrefixAsync(CacheKey);
 

API/Controllers/OPDSController.cs

@@ -1079,10 +1079,11 @@ public class OpdsController : BaseApiController
     /// <param name="volumeId"></param>
     /// <param name="chapterId"></param>
     /// <param name="pageNumber"></param>
+    /// <param name="saveProgress">Optional parameter. Can pass false and progress saving will be suppressed</param>
     /// <returns></returns>
     [HttpGet("{apiKey}/image")]
     public async Task<ActionResult> GetPageStreamedImage(string apiKey, [FromQuery] int libraryId, [FromQuery] int seriesId,
-        [FromQuery] int volumeId,[FromQuery] int chapterId, [FromQuery] int pageNumber)
+        [FromQuery] int volumeId,[FromQuery] int chapterId, [FromQuery] int pageNumber, [FromQuery] bool saveProgress = true)
     {
         var userId = await GetUser(apiKey);
         if (pageNumber < 0) return BadRequest(await _localizationService.Translate(userId, "greater-0", "Page"));
@@ -1101,15 +1102,20 @@ public class OpdsController : BaseApiController
             // Calculates SHA1 Hash for byte[]
             Response.AddCacheHeader(content);
 
-            // Save progress for the user
-            await _readerService.SaveReadingProgress(new ProgressDto()
+            // Save progress for the user (except Panels, they will use a direct connection)
+            var userAgent = Request.Headers["User-Agent"].ToString();
+            if (!userAgent.StartsWith("Panels", StringComparison.InvariantCultureIgnoreCase) || !saveProgress)
             {
-                ChapterId = chapterId,
-                PageNum = pageNumber,
-                SeriesId = seriesId,
-                VolumeId = volumeId,
-                LibraryId =libraryId
-            }, await GetUser(apiKey));
+                await _readerService.SaveReadingProgress(new ProgressDto()
+                {
+                    ChapterId = chapterId,
+                    PageNum = pageNumber,
+                    SeriesId = seriesId,
+                    VolumeId = volumeId,
+                    LibraryId =libraryId
+                }, await GetUser(apiKey));
+            }
+
 
             return File(content, MimeTypeMap.GetMimeType(format));
         }

API/Controllers/PanelsController.cs

@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+using API.Data;
+using API.DTOs;
+using API.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace API.Controllers;
+
+/// <summary>
+/// For the Panels app explicitly
+/// </summary>
+[AllowAnonymous]
+public class PanelsController : BaseApiController
+{
+    private readonly IReaderService _readerService;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public PanelsController(IReaderService readerService, IUnitOfWork unitOfWork)
+    {
+        _readerService = readerService;
+        _unitOfWork = unitOfWork;
+    }
+
+    /// <summary>
+    /// Saves the progress of a given chapter.
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <param name="apiKey"></param>
+    /// <returns></returns>
+    [HttpPost("save-progress")]
+    public async Task<ActionResult> SaveProgress(ProgressDto dto, [FromQuery] string apiKey)
+    {
+        if (string.IsNullOrEmpty(apiKey)) return Unauthorized("ApiKey is required");
+        var userId = await _unitOfWork.UserRepository.GetUserIdByApiKeyAsync(apiKey);
+        await _readerService.SaveReadingProgress(dto, userId);
+        return Ok();
+    }
+
+    /// <summary>
+    /// Gets the Progress of a given chapter
+    /// </summary>
+    /// <param name="chapterId"></param>
+    /// <param name="apiKey"></param>
+    /// <returns>The number of pages read, 0 if none read</returns>
+    [HttpGet("get-progress")]
+    public async Task<ActionResult<int>> GetProgress(int chapterId, [FromQuery] string apiKey)
+    {
+        if (string.IsNullOrEmpty(apiKey)) return Unauthorized("ApiKey is required");
+        var userId = await _unitOfWork.UserRepository.GetUserIdByApiKeyAsync(apiKey);
+
+        var progress = await _unitOfWork.AppUserProgressRepository.GetUserProgressDtoAsync(chapterId, userId);
+        return Ok(progress?.PageNum ?? 0);
+    }
+}

API/Helpers/SmartFilterHelper.cs

@@ -72,7 +72,7 @@ public static class SmartFilterHelper
 
     private static string EncodeSortOptions(SortOptions sortOptions)
     {
-        return Uri.EscapeDataString($"sortField={(int) sortOptions.SortField}&isAscending={sortOptions.IsAscending}");
+        return Uri.EscapeDataString($"sortField={(int) sortOptions.SortField},isAscending={sortOptions.IsAscending}");
     }
 
     private static string EncodeFilterStatementDtos(ICollection<FilterStatementDto> statements)