Readable Bookmarks (#1228)

* Moved bookmarks to it's own page on side nav and integrated actions.

* Implemented the ability to read bookmarks in the manga reader.

* Removed old bookmark components that aren't needed any longer.

* Removed recently added component as we use all-series instead now

* Removed bookmark tab from card detail

* Fixed scroll to top not working and being missing

* When opening the side nav on mobile with metadata filter already open, collapse the filter.

* When on mobile viewports, when clicking an item from side nav, collapse it afterwards

* Converted most of series detail to use the card detail layout, except storyline which has custom logic

* Fixed unit test

API/Controllers/DownloadController.cs

@@ -171,7 +171,7 @@ namespace API.Controllers
             var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername());
             var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(downloadBookmarkDto.Bookmarks.First().SeriesId);
 
-            var files = await _bookmarkService.GetBookmarkFilesById(user.Id, downloadBookmarkDto.Bookmarks.Select(b => b.Id));
+            var files = await _bookmarkService.GetBookmarkFilesById(downloadBookmarkDto.Bookmarks.Select(b => b.Id));
 
             var filename = $"{series.Name} - Bookmarks.zip";
             await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,

API/Controllers/ReaderController.cs

@@ -73,6 +73,41 @@ namespace API.Controllers
             }
         }
 
+        /// <summary>
+        /// Returns an image for a given bookmark series. Side effect: This will cache the bookmark images for reading.
+        /// </summary>
+        /// <param name="seriesId"></param>
+        /// <param name="apiKey">Api key for the user the bookmarks are on</param>
+        /// <param name="page"></param>
+        /// <remarks>We must use api key as bookmarks could be leaked to other users via the API</remarks>
+        /// <returns></returns>
+        [HttpGet("bookmark-image")]
+        public async Task<ActionResult> GetBookmarkImage(int seriesId, string apiKey, int page)
+        {
+            if (page < 0) page = 0;
+            var userId = await _unitOfWork.UserRepository.GetUserIdByApiKeyAsync(apiKey);
+            var totalPages = await _cacheService.CacheBookmarkForSeries(userId, seriesId);
+            if (page > totalPages)
+            {
+                page = totalPages;
+            }
+
+            try
+            {
+                var path = _cacheService.GetCachedBookmarkPagePath(seriesId, page);
+                if (string.IsNullOrEmpty(path) || !System.IO.File.Exists(path)) return BadRequest($"No such image for page {page}");
+                var format = Path.GetExtension(path).Replace(".", "");
+
+                Response.AddCacheHeader(path, TimeSpan.FromMinutes(10).Seconds);
+                return PhysicalFile(path, "image/" + format, Path.GetFileName(path));
+            }
+            catch (Exception)
+            {
+                _cacheService.CleanupBookmarks(new []{ seriesId });
+                throw;
+            }
+        }
+
         /// <summary>
         /// Returns various information about a Chapter. Side effect: This will cache the chapter images for reading.
         /// </summary>
@@ -104,6 +139,29 @@ namespace API.Controllers
             });
         }
 
+        /// <summary>
+        /// Returns various information about all bookmark files for a Series. Side effect: This will cache the bookmark images for reading.
+        /// </summary>
+        /// <param name="seriesId">Series Id for all bookmarks</param>
+        /// <returns></returns>
+        [HttpGet("bookmark-info")]
+        public async Task<ActionResult<BookmarkInfoDto>> GetBookmarkInfo(int seriesId)
+        {
+            var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername());
+            var totalPages = await _cacheService.CacheBookmarkForSeries(user.Id, seriesId);
+            // TODO: Change Includes to None from LinkedSeries branch
+            var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId);
+
+            return Ok(new BookmarkInfoDto()
+            {
+                SeriesName = series.Name,
+                SeriesFormat = series.Format,
+                SeriesId = series.Id,
+                LibraryId = series.LibraryId,
+                Pages = totalPages,
+            });
+        }
+
 
         [HttpPost("mark-read")]
         public async Task<ActionResult> MarkRead(MarkReadDto markReadDto)