Merged develop into main

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,10 @@ assignees: ''
 
 ---
 
+**If this is a feature request, request [here](https://feats.kavitareader.com/) instead. Feature requests will be deleted from Github.**
+
+
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 

.github/workflows/sonar-scan.yml

@@ -147,6 +147,8 @@ jobs:
           body=${body//'%'/'%25'}
           body=${body//$'\n'/'%0A'}
           body=${body//$'\r'/'%0D'}
+          body=${body//$'`'/'%60'}
+          body=${body//$'>'/'%3E'}
           echo $body
           echo "::set-output name=BODY::$body"
 
@@ -249,6 +251,8 @@ jobs:
           body=${body//'%'/'%25'}
           body=${body//$'\n'/'%0A'}
           body=${body//$'\r'/'%0D'}
+          body=${body//$'`'/'%60'}
+          body=${body//$'>'/'%3E'}
           echo $body
           echo "::set-output name=BODY::$body"
 

API.Tests/Parser/ComicParserTests.cs

@@ -58,6 +58,11 @@ namespace API.Tests.Parser
         [InlineData("2000 AD 0366 [1984-04-28] (flopbie)", "2000 AD")]
         [InlineData("Daredevil - v6 - 10 - (2019)", "Daredevil")]
         [InlineData("Batman - The Man Who Laughs #1 (2005)", "Batman - The Man Who Laughs")]
+        [InlineData("Demon 012 (Sep 1973) c2c", "Demon")]
+        [InlineData("Dragon Age - Until We Sleep 01 (of 03)", "Dragon Age - Until We Sleep")]
+        [InlineData("Green Lantern v2 017 - The Spy-Eye that doomed Green Lantern v2", "Green Lantern")]
+        [InlineData("Green Lantern - Circle of Fire Special - Adam Strange (2000)", "Green Lantern - Circle of Fire  - Adam Strange")]
+        [InlineData("Identity Crisis Extra - Rags Morales Sketches (2005)", "Identity Crisis  - Rags Morales Sketches")]
         public void ParseComicSeriesTest(string filename, string expected)
         {
             Assert.Equal(expected, API.Parser.Parser.ParseComicSeries(filename));
@@ -138,6 +143,7 @@ namespace API.Tests.Parser
         [InlineData("Cyberpunk 2077 - Trauma Team #04.cbz", "4")]
         [InlineData("2000 AD 0366 [1984-04-28] (flopbie)", "366")]
         [InlineData("Daredevil - v6 - 10 - (2019)", "10")]
+        [InlineData("Batman Beyond 2016 - Chapter 001.cbz", "1")]
         public void ParseComicChapterTest(string filename, string expected)
         {
             Assert.Equal(expected, API.Parser.Parser.ParseComicChapter(filename));

API/API.csproj

@@ -107,6 +107,11 @@
     <EmbeddedResource Remove="logs\**" />
     <EmbeddedResource Remove="temp\**" />
     <EmbeddedResource Remove="covers\**" />
+    <EmbeddedResource Remove="config\covers\**" />
+    <EmbeddedResource Remove="config\backups\**" />
+    <EmbeddedResource Remove="config\logs\**" />
+    <EmbeddedResource Remove="config\temp\**" />
+    <EmbeddedResource Remove="config\stats\**" />
   </ItemGroup>
 
   <ItemGroup>
@@ -115,12 +120,18 @@
     <Content Remove="backups\**" />
     <Content Remove="logs\**" />
     <Content Remove="temp\**" />
-    <Content Remove="stats\**" />
+    <Content Remove="config\stats\**" />
+    <Content Remove="config\cache\**" />
+    <Content Remove="config\backups\**" />
+    <Content Remove="config\logs\**" />
+    <Content Remove="config\temp\**" />
+    <Content Remove="config\stats\**" />
     <Content Condition=" '$(Configuration)' == 'Release' " Remove="appsettings.Development.json" />
     <Content Update="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Remove="covers\**" />
+    <Content Remove="config\covers\**" />
   </ItemGroup>
 
   <ItemGroup>

API/Controllers/AccountController.cs

@@ -95,7 +95,7 @@ namespace API.Controllers
                 var settings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync();
                 if (!settings.EnableAuthentication && !registerDto.IsAdmin)
                 {
-                    _logger.LogInformation("User {UserName} is being registered as non-admin with no server authentication. Using default password.", registerDto.Username);
+                    _logger.LogInformation("User {UserName} is being registered as non-admin with no server authentication. Using default password", registerDto.Username);
                     registerDto.Password = AccountService.DefaultPassword;
                 }
 

API/Controllers/OPDSController.cs

@@ -17,6 +17,7 @@ using API.Interfaces.Services;
 using API.Services;
 using Kavita.Common;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 
 namespace API.Controllers
 {
@@ -48,7 +49,6 @@ namespace API.Controllers
             _cacheService = cacheService;
             _readerService = readerService;
 
-
             _xmlSerializer = new XmlSerializer(typeof(Feed));
             _xmlOpenSearchSerializer = new XmlSerializer(typeof(OpenSearchDescription));
 
@@ -62,18 +62,18 @@ namespace API.Controllers
             if (!(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).EnableOpds)
                 return BadRequest("OPDS is not enabled on this server");
             var feed = CreateFeed("Kavita", string.Empty, apiKey);
-            feed.Id = "root";
+            SetFeedId(feed, "root");
             feed.Entries.Add(new FeedEntry()
             {
-                Id = "inProgress",
+                Id = "onDeck",
-                Title = "In Progress",
+                Title = "On Deck",
                 Content = new FeedEntryContent()
                 {
-                    Text = "Browse by In Progress"
+                    Text = "Browse by On Deck"
                 },
                 Links = new List<FeedLink>()
                 {
-                    CreateLink(FeedLinkRelation.SubSection, FeedLinkType.AtomNavigation, Prefix + $"{apiKey}/in-progress"),
+                    CreateLink(FeedLinkRelation.SubSection, FeedLinkType.AtomNavigation, Prefix + $"{apiKey}/on-deck"),
                 }
             });
             feed.Entries.Add(new FeedEntry()
@@ -140,9 +140,8 @@ namespace API.Controllers
                 return BadRequest("OPDS is not enabled on this server");
             var userId = await GetUser(apiKey);
             var libraries = await _unitOfWork.LibraryRepository.GetLibrariesForUserIdAsync(userId);
-
             var feed = CreateFeed("All Libraries", $"{apiKey}/libraries", apiKey);
-
+            SetFeedId(feed, "libraries");
             foreach (var library in libraries)
             {
                 feed.Entries.Add(new FeedEntry()
@@ -181,7 +180,7 @@ namespace API.Controllers
 
 
             var feed = CreateFeed("All Collections", $"{apiKey}/collections", apiKey);
-
+            SetFeedId(feed, "collections");
             foreach (var tag in tags)
             {
                 feed.Entries.Add(new FeedEntry()
@@ -198,14 +197,6 @@ namespace API.Controllers
                 });
             }
 
-            if (tags.Count == 0)
-            {
-                feed.Entries.Add(new FeedEntry()
-                {
-                    Title = "Nothing here",
-                });
-            }
-
             return CreateXmlResult(SerializeXml(feed));
         }
 
@@ -243,6 +234,7 @@ namespace API.Controllers
             });
 
             var feed = CreateFeed(tag.Title + " Collection", $"{apiKey}/collections/{collectionId}", apiKey);
+            SetFeedId(feed, $"collections-{collectionId}");
             AddPagination(feed, series, $"{Prefix}{apiKey}/collections/{collectionId}");
 
             foreach (var seriesDto in series)
@@ -269,7 +261,7 @@ namespace API.Controllers
 
 
             var feed = CreateFeed("All Reading Lists", $"{apiKey}/reading-list", apiKey);
-
+            SetFeedId(feed, "reading-list");
             foreach (var readingListDto in readingLists)
             {
                 feed.Entries.Add(new FeedEntry()
@@ -304,6 +296,7 @@ namespace API.Controllers
             }
 
             var feed = CreateFeed(readingList.Title + " Reading List", $"{apiKey}/reading-list/{readingListId}", apiKey);
+            SetFeedId(feed, $"reading-list-{readingListId}");
 
             var items = (await _unitOfWork.ReadingListRepository.GetReadingListItemDtosByIdAsync(readingListId, userId)).ToList();
             foreach (var item in items)
@@ -320,16 +313,6 @@ namespace API.Controllers
                 });
             }
 
-            if (items.Count == 0)
-            {
-                feed.Entries.Add(new FeedEntry()
-                {
-                    Title = "Nothing here",
-                });
-            }
-
-
-
             return CreateXmlResult(SerializeXml(feed));
         }
 
@@ -355,6 +338,7 @@ namespace API.Controllers
             }, _filterDto);
 
             var feed = CreateFeed(library.Name, $"{apiKey}/libraries/{libraryId}", apiKey);
+            SetFeedId(feed, $"library-{library.Name}");
             AddPagination(feed, series, $"{Prefix}{apiKey}/libraries/{libraryId}");
 
             foreach (var seriesDto in series)
@@ -379,6 +363,7 @@ namespace API.Controllers
             }, _filterDto);
 
             var feed = CreateFeed("Recently Added", $"{apiKey}/recently-added", apiKey);
+            SetFeedId(feed, "recently-added");
             AddPagination(feed, recentlyAdded, $"{Prefix}{apiKey}/recently-added");
 
             foreach (var seriesDto in recentlyAdded)
@@ -386,21 +371,12 @@ namespace API.Controllers
                 feed.Entries.Add(CreateSeries(seriesDto, apiKey));
             }
 
-            if (recentlyAdded.Count == 0)
-            {
-                feed.Entries.Add(new FeedEntry()
-                {
-                    Title = "Nothing here",
-                });
-            }
-
-
             return CreateXmlResult(SerializeXml(feed));
         }
 
-        [HttpGet("{apiKey}/in-progress")]
+        [HttpGet("{apiKey}/on-deck")]
         [Produces("application/xml")]
-        public async Task<IActionResult> GetInProgress(string apiKey, [FromQuery] int pageNumber = 1)
+        public async Task<IActionResult> GetOnDeck(string apiKey, [FromQuery] int pageNumber = 1)
         {
             if (!(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).EnableOpds)
                 return BadRequest("OPDS is not enabled on this server");
@@ -410,29 +386,22 @@ namespace API.Controllers
                 PageNumber = pageNumber,
                 PageSize = 20
             };
-            var results = await _unitOfWork.SeriesRepository.GetInProgress(userId, 0, userParams, _filterDto);
+            var results = await _unitOfWork.SeriesRepository.GetOnDeck(userId, 0, userParams, _filterDto);
             var listResults = results.DistinctBy(s => s.Name).Skip((userParams.PageNumber - 1) * userParams.PageSize)
                 .Take(userParams.PageSize).ToList();
             var pagedList = new PagedList<SeriesDto>(listResults, listResults.Count, userParams.PageNumber, userParams.PageSize);
 
             Response.AddPaginationHeader(pagedList.CurrentPage, pagedList.PageSize, pagedList.TotalCount, pagedList.TotalPages);
 
-            var feed = CreateFeed("In Progress", $"{apiKey}/in-progress", apiKey);
+            var feed = CreateFeed("On Deck", $"{apiKey}/on-deck", apiKey);
-            AddPagination(feed, pagedList, $"{Prefix}{apiKey}/in-progress");
+            SetFeedId(feed, "on-deck");
+            AddPagination(feed, pagedList, $"{Prefix}{apiKey}/on-deck");
 
             foreach (var seriesDto in pagedList)
             {
                 feed.Entries.Add(CreateSeries(seriesDto, apiKey));
             }
 
-            if (pagedList.Count == 0)
-            {
-                feed.Entries.Add(new FeedEntry()
-                {
-                    Title = "Nothing here",
-                });
-            }
-
             return CreateXmlResult(SerializeXml(feed));
         }
 
@@ -456,7 +425,7 @@ namespace API.Controllers
             var series = await _unitOfWork.SeriesRepository.SearchSeries(libraries.Select(l => l.Id).ToArray(), query);
 
             var feed = CreateFeed(query, $"{apiKey}/series?query=" + query, apiKey);
-
+            SetFeedId(feed, "search-series");
             foreach (var seriesDto in series)
             {
                 feed.Entries.Add(CreateSeries(seriesDto, apiKey));
@@ -465,6 +434,11 @@ namespace API.Controllers
             return CreateXmlResult(SerializeXml(feed));
         }
 
+        private static void SetFeedId(Feed feed, string id)
+        {
+            feed.Id = id;
+        }
+
         [HttpGet("{apiKey}/search")]
         [Produces("application/xml")]
         public async Task<IActionResult> GetSearchDescriptor(string apiKey)
@@ -498,6 +472,7 @@ namespace API.Controllers
             var series = await _unitOfWork.SeriesRepository.GetSeriesDtoByIdAsync(seriesId, userId);
             var volumes = await _unitOfWork.VolumeRepository.GetVolumesDtoAsync(seriesId, userId);
             var feed = CreateFeed(series.Name + " - Volumes", $"{apiKey}/series/{series.Id}", apiKey);
+            SetFeedId(feed, $"series-{series.Id}");
             feed.Links.Add(CreateLink(FeedLinkRelation.Image, FeedLinkType.Image, $"/api/image/series-cover?seriesId={seriesId}"));
             foreach (var volumeDto in volumes)
             {
@@ -521,6 +496,7 @@ namespace API.Controllers
                     _chapterSortComparer);
 
             var feed = CreateFeed(series.Name + " - Volume " + volume.Name + " - Chapters ", $"{apiKey}/series/{seriesId}/volume/{volumeId}", apiKey);
+            SetFeedId(feed, $"series-{series.Id}-volume-{volume.Id}-chapters");
             foreach (var chapter in chapters)
             {
                 feed.Entries.Add(new FeedEntry()
@@ -551,6 +527,7 @@ namespace API.Controllers
             var files = await _unitOfWork.ChapterRepository.GetFilesForChapterAsync(chapterId);
 
             var feed = CreateFeed(series.Name + " - Volume " + volume.Name + " - Chapters ", $"{apiKey}/series/{seriesId}/volume/{volumeId}/chapter/{chapterId}", apiKey);
+            SetFeedId(feed, $"series-{series.Id}-volume-{volume.Id}-chapter-{chapter.Id}-files");
             foreach (var mangaFile in files)
             {
                 feed.Entries.Add(CreateChapter(seriesId, volumeId, chapterId, mangaFile, series, volume, chapter, apiKey));

API/Controllers/SeriesController.cs

@@ -180,7 +180,7 @@ namespace API.Controllers
 
             if (series == null) return BadRequest("Series does not exist");
 
-            if (series.Name != updateSeries.Name && await _unitOfWork.SeriesRepository.DoesSeriesNameExistInLibrary(updateSeries.Name))
+            if (series.Name != updateSeries.Name && await _unitOfWork.SeriesRepository.DoesSeriesNameExistInLibrary(updateSeries.Name, series.Format))
             {
                 return BadRequest("A series already exists in this library with this name. Series Names must be unique to a library.");
             }
@@ -230,12 +230,19 @@ namespace API.Controllers
             return Ok(series);
         }
 
-        [HttpPost("in-progress")]
+        /// <summary>
-        public async Task<ActionResult<IEnumerable<SeriesDto>>> GetInProgress(FilterDto filterDto, [FromQuery] UserParams userParams, [FromQuery] int libraryId = 0)
+        /// Fetches series that are on deck aka have progress on them.
+        /// </summary>
+        /// <param name="filterDto"></param>
+        /// <param name="userParams"></param>
+        /// <param name="libraryId">Default of 0 meaning all libraries</param>
+        /// <returns></returns>
+        [HttpPost("on-deck")]
+        public async Task<ActionResult<IEnumerable<SeriesDto>>> GetOnDeck(FilterDto filterDto, [FromQuery] UserParams userParams, [FromQuery] int libraryId = 0)
         {
             // NOTE: This has to be done manually like this due to the DistinctBy requirement
             var userId = await _unitOfWork.UserRepository.GetUserIdByUsernameAsync(User.GetUsername());
-            var results = await _unitOfWork.SeriesRepository.GetInProgress(userId, libraryId, userParams, filterDto);
+            var results = await _unitOfWork.SeriesRepository.GetOnDeck(userId, libraryId, userParams, filterDto);
 
             var listResults = results.DistinctBy(s => s.Name).Skip((userParams.PageNumber - 1) * userParams.PageSize)
                 .Take(userParams.PageSize).ToList();

API/Controllers/ServerController.cs

@@ -26,10 +26,11 @@ namespace API.Controllers
         private readonly IArchiveService _archiveService;
         private readonly ICacheService _cacheService;
         private readonly IVersionUpdaterService _versionUpdaterService;
+        private readonly IStatsService _statsService;
 
         public ServerController(IHostApplicationLifetime applicationLifetime, ILogger<ServerController> logger, IConfiguration config,
             IBackupService backupService, IArchiveService archiveService, ICacheService cacheService,
-            IVersionUpdaterService versionUpdaterService)
+            IVersionUpdaterService versionUpdaterService, IStatsService statsService)
         {
             _applicationLifetime = applicationLifetime;
             _logger = logger;
@@ -38,6 +39,7 @@ namespace API.Controllers
             _archiveService = archiveService;
             _cacheService = cacheService;
             _versionUpdaterService = versionUpdaterService;
+            _statsService = statsService;
         }
 
         /// <summary>
@@ -84,9 +86,9 @@ namespace API.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("server-info")]
-        public ActionResult<ServerInfoDto> GetVersion()
+        public async Task<ActionResult<ServerInfoDto>> GetVersion()
         {
-           return Ok(StatsService.GetServerInfo());
+           return Ok(await _statsService.GetServerInfo());
         }
 
         [HttpGet("logs")]

API/Controllers/StatsController.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using API.DTOs.Stats;
-using API.Interfaces.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-
-namespace API.Controllers
-{
-    public class StatsController : BaseApiController
-    {
-        private readonly ILogger<StatsController> _logger;
-        private readonly IStatsService _statsService;
-
-        public StatsController(ILogger<StatsController> logger, IStatsService statsService)
-        {
-            _logger = logger;
-            _statsService = statsService;
-        }
-
-        [AllowAnonymous]
-        [HttpPost("client-info")]
-        public async Task<IActionResult> AddClientInfo([FromBody] ClientInfoDto clientInfoDto)
-        {
-            try
-            {
-                await _statsService.RecordClientInfo(clientInfoDto);
-
-                return Ok();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error updating the usage statistics");
-                throw;
-            }
-        }
-    }
-}

API/DTOs/ChapterDto.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace API.DTOs
 {
@@ -45,5 +46,9 @@ namespace API.DTOs
         /// Volume Id this Chapter belongs to
         /// </summary>
         public int VolumeId { get; init; }
+        /// <summary>
+        /// When chapter was created
+        /// </summary>
+        public DateTime Created { get; init; }
     }
 }

API/DTOs/Stats/ClientInfoDto.cs

@@ -1,37 +0,0 @@
-using System;
-
-namespace API.DTOs.Stats
-{
-    public class ClientInfoDto
-    {
-        public ClientInfoDto()
-        {
-            CollectedAt = DateTime.UtcNow;
-        }
-
-        public string KavitaUiVersion { get; set; }
-        public string ScreenResolution { get; set; }
-        public string PlatformType { get; set; }
-        public DetailsVersion Browser { get; set; }
-        public DetailsVersion Os { get; set; }
-
-        public DateTime? CollectedAt { get; set; }
-        public bool UsingDarkTheme { get; set; }
-
-        public bool IsTheSameDevice(ClientInfoDto clientInfoDto)
-        {
-            return (clientInfoDto.ScreenResolution ?? string.Empty).Equals(ScreenResolution) &&
-                   (clientInfoDto.PlatformType ?? string.Empty).Equals(PlatformType) &&
-                   (clientInfoDto.Browser?.Name ?? string.Empty).Equals(Browser?.Name) &&
-                   (clientInfoDto.Os?.Name ?? string.Empty).Equals(Os?.Name) &&
-                   clientInfoDto.CollectedAt.GetValueOrDefault().ToString("yyyy-MM-dd")
-                       .Equals(CollectedAt.GetValueOrDefault().ToString("yyyy-MM-dd"));
-        }
-    }
-
-    public class DetailsVersion
-    {
-        public string Name { get; set; }
-        public string Version { get; set; }
-    }
-}

API/DTOs/Stats/ServerInfoDto.cs

@@ -2,13 +2,11 @@
 {
     public class ServerInfoDto
     {
+        public string InstallId { get; set; }
         public string Os { get; set; }
-        public string DotNetVersion { get; set; }
-        public string RunTimeVersion { get; set; }
-        public string KavitaVersion { get; set; }
-        public string BuildBranch { get; set; }
-        public string Culture { get; set; }
         public bool IsDocker { get; set; }
+        public string DotnetVersion { get; set; }
+        public string KavitaVersion { get; set; }
         public int NumOfCores { get; set; }
     }
 }

API/DTOs/Stats/UsageInfoDto.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using API.Entities.Enums;
-
-namespace API.DTOs.Stats
-{
-    public class UsageInfoDto
-    {
-        public UsageInfoDto()
-        {
-            FileTypes = new HashSet<string>();
-            LibraryTypesCreated = new HashSet<LibInfo>();
-        }
-
-        public int UsersCount { get; set; }
-        public IEnumerable<string> FileTypes { get; set; }
-        public IEnumerable<LibInfo> LibraryTypesCreated { get; set; }
-    }
-
-    public class LibInfo
-    {
-        public LibraryType Type { get; set; }
-        public int Count { get; set; }
-    }
-}

API/DTOs/Stats/UsageStatisticsDto.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace API.DTOs.Stats
-{
-    public class UsageStatisticsDto
-    {
-        public UsageStatisticsDto()
-        {
-            MarkAsUpdatedNow();
-            ClientsInfo = new List<ClientInfoDto>();
-        }
-
-        public string InstallId { get; set; }
-        public DateTime LastUpdate { get; set; }
-        public UsageInfoDto UsageInfo { get; set; }
-        public ServerInfoDto ServerInfo { get; set; }
-        public List<ClientInfoDto> ClientsInfo { get; set; }
-
-        public void MarkAsUpdatedNow()
-        {
-            LastUpdate = DateTime.UtcNow;
-        }
-
-        public void AddClientInfo(ClientInfoDto clientInfoDto)
-        {
-            if (ClientsInfo.Any(x => x.IsTheSameDevice(clientInfoDto))) return;
-
-            ClientsInfo.Add(clientInfoDto);
-        }
-    }
-}

API/DTOs/Update/UpdateNotificationDto.cs

@@ -1,4 +1,6 @@
-namespace API.DTOs.Update
+using System;
+
+namespace API.DTOs.Update
 {
     /// <summary>
     /// Update Notification denoting a new release available for user to update to
@@ -34,5 +36,9 @@
         /// Is this a pre-release
         /// </summary>
         public bool IsPrerelease { get; init; }
+        /// <summary>
+        /// Date of the publish
+        /// </summary>
+        public string PublishDate { get; init; }
     }
 }

API/Data/MigrateConfigFiles.cs

@@ -26,8 +26,6 @@ namespace API.Data
             "temp"
         };
 
-        private static readonly string ConfigDirectory = Path.Join(Directory.GetCurrentDirectory(), "config");
-
 
         /// <summary>
         /// In v0.4.8 we moved all config files to config/ to match with how docker was setup. This will move all config files from current directory
@@ -66,8 +64,8 @@ namespace API.Data
             Console.WriteLine(
                 "Migrating files from pre-v0.4.8. All Kavita config files are now located in config/");
 
-            Console.WriteLine($"Creating {ConfigDirectory}");
+            Console.WriteLine($"Creating {DirectoryService.ConfigDirectory}");
-            DirectoryService.ExistOrCreate(ConfigDirectory);
+            DirectoryService.ExistOrCreate(DirectoryService.ConfigDirectory);
 
             try
             {
@@ -116,13 +114,13 @@ namespace API.Data
 
                 foreach (var folderToMove in AppFolders)
                 {
-                    if (new DirectoryInfo(Path.Join(ConfigDirectory, folderToMove)).Exists) continue;
+                    if (new DirectoryInfo(Path.Join(DirectoryService.ConfigDirectory, folderToMove)).Exists) continue;
 
                     try
                     {
                         DirectoryService.CopyDirectoryToDirectory(
                             Path.Join(Directory.GetCurrentDirectory(), folderToMove),
-                            Path.Join(ConfigDirectory, folderToMove));
+                            Path.Join(DirectoryService.ConfigDirectory, folderToMove));
                     }
                     catch (Exception)
                     {
@@ -144,7 +142,7 @@ namespace API.Data
             {
                 try
                 {
-                    fileInfo.CopyTo(Path.Join(ConfigDirectory, fileInfo.Name));
+                    fileInfo.CopyTo(Path.Join(DirectoryService.ConfigDirectory, fileInfo.Name));
                 }
                 catch (Exception)
                 {

API/Data/Repositories/SeriesRepository.cs

@@ -7,6 +7,7 @@ using API.DTOs;
 using API.DTOs.CollectionTags;
 using API.DTOs.Filtering;
 using API.Entities;
+using API.Entities.Enums;
 using API.Extensions;
 using API.Helpers;
 using API.Interfaces.Repositories;
@@ -47,16 +48,22 @@ namespace API.Data.Repositories
             _context.Series.RemoveRange(series);
         }
 
-        public async Task<bool> DoesSeriesNameExistInLibrary(string name)
+        /// <summary>
+        /// Returns if a series name and format exists already in a library
+        /// </summary>
+        /// <param name="name">Name of series</param>
+        /// <param name="format">Format of series</param>
+        /// <returns></returns>
+        public async Task<bool> DoesSeriesNameExistInLibrary(string name, MangaFormat format)
         {
             var libraries = _context.Series
                 .AsNoTracking()
-                .Where(x => x.Name == name)
+                .Where(x => x.Name.Equals(name) && x.Format == format)
                 .Select(s => s.LibraryId);
 
             return await _context.Series
                 .AsNoTracking()
-                .Where(s => libraries.Contains(s.LibraryId) && s.Name == name)
+                .Where(s => libraries.Contains(s.LibraryId) && s.Name.Equals(name) && s.Format == format)
                 .CountAsync() > 1;
         }
 
@@ -312,14 +319,15 @@ namespace API.Data.Repositories
         }
 
         /// <summary>
-        /// Returns Series that the user has some partial progress on
+        /// Returns Series that the user has some partial progress on. Sorts based on activity. Sort first by User progress, but if a series
+        /// has been updated recently, bump it to the front.
         /// </summary>
         /// <param name="userId"></param>
         /// <param name="libraryId">Library to restrict to, if 0, will apply to all libraries</param>
         /// <param name="userParams">Pagination information</param>
         /// <param name="filter">Optional (default null) filter on query</param>
         /// <returns></returns>
-        public async Task<IEnumerable<SeriesDto>> GetInProgress(int userId, int libraryId, UserParams userParams, FilterDto filter)
+        public async Task<IEnumerable<SeriesDto>> GetOnDeck(int userId, int libraryId, UserParams userParams, FilterDto filter)
         {
             var formats = filter.GetSqlFilter();
             IList<int> userLibraries;
@@ -352,6 +360,7 @@ namespace API.Data.Repositories
                                               && s.PagesRead > 0
                                               && s.PagesRead < s.Series.Pages)
                             .OrderByDescending(s => s.LastModified)
+                            .ThenByDescending(s => s.Series.LastModified)
                             .Select(s => s.Series)
                             .ProjectTo<SeriesDto>(_mapper.ConfigurationProvider)
                             .AsSplitQuery()

API/Data/Seed.cs

@@ -41,7 +41,7 @@ namespace API.Data
 
             IList<ServerSetting> defaultSettings = new List<ServerSetting>()
             {
-                new() {Key = ServerSettingKey.CacheDirectory, Value = DirectoryService.CacheDirectory},
+                new () {Key = ServerSettingKey.CacheDirectory, Value = DirectoryService.CacheDirectory},
                 new () {Key = ServerSettingKey.TaskScan, Value = "daily"},
                 new () {Key = ServerSettingKey.LoggingLevel, Value = "Information"}, // Not used from DB, but DB is sync with appSettings.json
                 new () {Key = ServerSettingKey.TaskBackup, Value = "weekly"},
@@ -51,6 +51,7 @@ namespace API.Data
                 new () {Key = ServerSettingKey.EnableOpds, Value = "false"},
                 new () {Key = ServerSettingKey.EnableAuthentication, Value = "true"},
                 new () {Key = ServerSettingKey.BaseUrl, Value = "/"},
+                new () {Key = ServerSettingKey.InstallId, Value = HashUtil.AnonymousToken()},
             };
 
             foreach (var defaultSetting in defaultSettings)
@@ -71,6 +72,8 @@ namespace API.Data
                 Configuration.LogLevel + string.Empty;
             context.ServerSetting.First(s => s.Key == ServerSettingKey.CacheDirectory).Value =
                 DirectoryService.CacheDirectory + string.Empty;
+            context.ServerSetting.First(s => s.Key == ServerSettingKey.BackupDirectory).Value =
+                DirectoryService.BackupDirectory + string.Empty;
 
             await context.SaveChangesAsync();
 

API/Entities/AppUserPreferences.cs

@@ -16,7 +16,7 @@ namespace API.Entities
         /// <summary>
         /// Manga Reader Option: Which side of a split image should we show first
         /// </summary>
-        public PageSplitOption PageSplitOption { get; set; } = PageSplitOption.SplitRightToLeft;
+        public PageSplitOption PageSplitOption { get; set; } = PageSplitOption.FitSplit;
         /// <summary>
         /// Manga Reader Option: How the manga reader should perform paging or reading of the file
         /// <example>
@@ -25,14 +25,15 @@ namespace API.Entities
         /// </example>
         /// </summary>
         public ReaderMode ReaderMode { get; set; }
+
         /// <summary>
         /// Manga Reader Option: Allow the menu to close after 6 seconds without interaction
         /// </summary>
-        public bool AutoCloseMenu { get; set; }
+        public bool AutoCloseMenu { get; set; } = true;
         /// <summary>
         /// Book Reader Option: Should the background color be dark
         /// </summary>
-        public bool BookReaderDarkMode { get; set; } = false;
+        public bool BookReaderDarkMode { get; set; } = true;
         /// <summary>
         /// Book Reader Option: Override extra Margin
         /// </summary>

API/Entities/Enums/PageSplitOption.cs

@@ -4,6 +4,7 @@
     {
         SplitLeftToRight = 0,
         SplitRightToLeft = 1,
-        NoSplit = 2
+        NoSplit = 2,
+        FitSplit = 3
     }
 }

API/Entities/Enums/ServerSettingKey.cs

@@ -4,26 +4,61 @@ namespace API.Entities.Enums
 {
     public enum ServerSettingKey
     {
+        /// <summary>
+        /// Cron format for how often full library scans are performed.
+        /// </summary>
         [Description("TaskScan")]
         TaskScan = 0,
+        /// <summary>
+        /// Where files are cached. Not currently used.
+        /// </summary>
         [Description("CacheDirectory")]
         CacheDirectory = 1,
+        /// <summary>
+        /// Cron format for how often backups are taken.
+        /// </summary>
         [Description("TaskBackup")]
         TaskBackup = 2,
+        /// <summary>
+        /// Logging level for Server. Not managed in DB. Managed in appsettings.json and synced to DB.
+        /// </summary>
         [Description("LoggingLevel")]
         LoggingLevel = 3,
+        /// <summary>
+        /// Port server listens on. Not managed in DB. Managed in appsettings.json and synced to DB.
+        /// </summary>
         [Description("Port")]
         Port = 4,
+        /// <summary>
+        /// Where the backups are stored.
+        /// </summary>
         [Description("BackupDirectory")]
         BackupDirectory = 5,
+        /// <summary>
+        /// Allow anonymous data to be reported to KavitaStats
+        /// </summary>
         [Description("AllowStatCollection")]
         AllowStatCollection = 6,
+        /// <summary>
+        /// Is OPDS enabled for the server
+        /// </summary>
         [Description("EnableOpds")]
         EnableOpds = 7,
+        /// <summary>
+        /// Is Authentication needed for non-admin accounts
+        /// </summary>
         [Description("EnableAuthentication")]
         EnableAuthentication = 8,
+        /// <summary>
+        /// Base Url for the server. Not Implemented.
+        /// </summary>
         [Description("BaseUrl")]
-        BaseUrl = 9
+        BaseUrl = 9,
+        /// <summary>
+        /// Represents this installation of Kavita. Is tied to Stat reporting but has no information about user or files.
+        /// </summary>
+        [Description("InstallId")]
+        InstallId = 10
 
     }
 }

API/Entities/Series.cs

@@ -23,7 +23,7 @@ namespace API.Entities
         /// </summary>
         public string SortName { get; set; }
         /// <summary>
-        /// Name in Japanese. By default, will be same as Name.
+        /// Name in original language (Japanese for Manga). By default, will be same as Name.
         /// </summary>
         public string LocalizedName { get; set; }
         /// <summary>

API/Interfaces/ITaskScheduler.cs

@@ -17,6 +17,6 @@ namespace API.Interfaces
         void RefreshSeriesMetadata(int libraryId, int seriesId, bool forceUpdate = false);
         void ScanSeries(int libraryId, int seriesId, bool forceUpdate = false);
         void CancelStatsTasks();
-        void RunStatCollection();
+        Task RunStatCollection();
     }
 }

API/Interfaces/Repositories/ISeriesRepository.cs

@@ -4,6 +4,7 @@ using API.Data.Scanner;
 using API.DTOs;
 using API.DTOs.Filtering;
 using API.Entities;
+using API.Entities.Enums;
 using API.Helpers;
 
 namespace API.Interfaces.Repositories
@@ -14,7 +15,7 @@ namespace API.Interfaces.Repositories
         void Update(Series series);
         void Remove(Series series);
         void Remove(IEnumerable<Series> series);
-        Task<bool> DoesSeriesNameExistInLibrary(string name);
+        Task<bool> DoesSeriesNameExistInLibrary(string name, MangaFormat format);
         /// <summary>
         /// Adds user information like progress, ratings, etc
         /// </summary>
@@ -45,7 +46,7 @@ namespace API.Interfaces.Repositories
         /// <returns></returns>
         Task AddSeriesModifiers(int userId, List<SeriesDto> series);
         Task<string> GetSeriesCoverImageAsync(int seriesId);
-        Task<IEnumerable<SeriesDto>> GetInProgress(int userId, int libraryId, UserParams userParams, FilterDto filter);
+        Task<IEnumerable<SeriesDto>> GetOnDeck(int userId, int libraryId, UserParams userParams, FilterDto filter);
         Task<PagedList<SeriesDto>> GetRecentlyAdded(int libraryId, int userId, UserParams userParams, FilterDto filter); // NOTE: Probably put this in LibraryRepo
         Task<SeriesMetadataDto> GetSeriesMetadata(int seriesId);
         Task<PagedList<SeriesDto>> GetSeriesDtoForCollectionAsync(int collectionId, int userId, UserParams userParams);

API/Interfaces/Services/IStatsService.cs

@@ -5,7 +5,7 @@ namespace API.Interfaces.Services
 {
     public interface IStatsService
     {
-        Task RecordClientInfo(ClientInfoDto clientInfoDto);
         Task Send();
+        Task<ServerInfoDto> GetServerInfo();
     }
 }

API/Parser/Parser.cs

@@ -258,19 +258,19 @@ namespace API.Parser
                 MatchOptions, RegexTimeout),
             // Teen Titans v1 001 (1966-02) (digital) (OkC.O.M.P.U.T.O.-Novus)
             new Regex(
-                @"^(?<Series>.*)(?: |_)v\d+",
+                @"^(?<Series>.+?)(?: |_)v\d+",
                 MatchOptions, RegexTimeout),
             // Amazing Man Comics chapter 25
             new Regex(
-                @"^(?<Series>.*)(?: |_)c(hapter) \d+",
+                @"^(?<Series>.+?)(?: |_)c(hapter) \d+",
                 MatchOptions, RegexTimeout),
             // Amazing Man Comics issue #25
             new Regex(
-                @"^(?<Series>.*)(?: |_)i(ssue) #\d+",
+                @"^(?<Series>.+?)(?: |_)i(ssue) #\d+",
                 MatchOptions, RegexTimeout),
             // Batman Wayne Family Adventures - Ep. 001 - Moving In
             new Regex(
-                @"^(?<Series>.+?)(\s|_|-)?(?:Ep\.?)(\s|_|-)+\d+",
+                @"^(?<Series>.+?)(\s|_|-)(?:Ep\.?)(\s|_|-)+\d+",
                 MatchOptions, RegexTimeout),
             // Batgirl Vol.2000 #57 (December, 2004)
             new Regex(
@@ -286,7 +286,7 @@ namespace API.Parser
                 MatchOptions, RegexTimeout),
             // Scott Pilgrim 02 - Scott Pilgrim vs. The World (2005)
             new Regex(
-                @"^(?<Series>.*)(?: |_)(?<Volume>\d+)",
+                @"^(?<Series>.+?)(?: |_)(?<Chapter>\d+)",
                 MatchOptions, RegexTimeout),
             // The First Asterix Frieze (WebP by Doc MaKS)
             new Regex(
@@ -336,9 +336,13 @@ namespace API.Parser
             new Regex(
                 @"^(?<Series>.+?)(?:\s|_)#(?<Chapter>\d+)",
                 MatchOptions, RegexTimeout),
+            // Batman 2016 - Chapter 01, Batman 2016 - Issue 01, Batman 2016 - Issue #01
+            new Regex(
+                @"^(?<Series>.+?)((c(hapter)?)|issue)(_|\s)#?(?<Chapter>(\d+(\.\d)?)-?(\d+(\.\d)?)?)",
+                MatchOptions, RegexTimeout),
             // Invincible 070.5 - Invincible Returns 1 (2010) (digital) (Minutemen-InnerDemons).cbr
             new Regex(
-                @"^(?<Series>.+?)(?: |_)(c? ?)(?<Chapter>(\d+(\.\d)?)-?(\d+(\.\d)?)?)(c? ?)-",
+                @"^(?<Series>.+?)(?:\s|_)(c? ?(chapter)?)(?<Chapter>(\d+(\.\d)?)-?(\d+(\.\d)?)?)(c? ?)-",
                 MatchOptions, RegexTimeout),
             // Batgirl Vol.2000 #57 (December, 2004)
             new Regex(
@@ -883,7 +887,7 @@ namespace API.Parser
                 {
                     if (match.Success)
                     {
-                        title = title.Replace(match.Value, "").Trim();
+                        title = title.Replace(match.Value, string.Empty).Trim();
                     }
                 }
             }
@@ -900,7 +904,7 @@ namespace API.Parser
                 {
                     if (match.Success)
                     {
-                        title = title.Replace(match.Value, "").Trim();
+                        title = title.Replace(match.Value, string.Empty).Trim();
                     }
                 }
             }
@@ -946,7 +950,7 @@ namespace API.Parser
                 {
                     if (match.Success)
                     {
-                        title = title.Replace(match.Value, "");
+                        title = title.Replace(match.Value, string.Empty);
                     }
                 }
             }

API/Services/ArchiveService.cs

@@ -138,6 +138,22 @@ namespace API.Services
 
             if (!string.IsNullOrEmpty(nonNestedFile)) return nonNestedFile;
 
+            // Check the first folder and sort within that to see if we can find a file, else fallback to first file with basic sort.
+            // Get first folder, then sort within that
+            var firstDirectoryFile = fullNames.OrderBy(Path.GetDirectoryName, new NaturalSortComparer()).FirstOrDefault();
+            if (!string.IsNullOrEmpty(firstDirectoryFile))
+            {
+                var firstDirectory = Path.GetDirectoryName(firstDirectoryFile);
+                if (!string.IsNullOrEmpty(firstDirectory))
+                {
+                    var firstDirectoryResult = fullNames.Where(f => firstDirectory.Equals(Path.GetDirectoryName(f)))
+                        .OrderBy(Path.GetFileName, new NaturalSortComparer())
+                        .FirstOrDefault();
+
+                    if (!string.IsNullOrEmpty(firstDirectoryResult)) return firstDirectoryResult;
+                }
+            }
+
             var result = fullNames
                 .OrderBy(Path.GetFileName, new NaturalSortComparer())
                 .FirstOrDefault();
@@ -159,7 +175,7 @@ namespace API.Services
         /// <returns></returns>
         public string GetCoverImage(string archivePath, string fileName)
         {
-            if (archivePath == null || !IsValidArchive(archivePath)) return String.Empty;
+            if (archivePath == null || !IsValidArchive(archivePath)) return string.Empty;
             try
             {
                 var libraryHandler = CanOpen(archivePath);

API/Services/BookService.cs

@@ -30,6 +30,7 @@ namespace API.Services
         private readonly ILogger<BookService> _logger;
         private readonly StylesheetParser _cssParser = new ();
         private static readonly RecyclableMemoryStreamManager StreamManager = new ();
+        private const string CssScopeClass = ".book-content";
 
         public BookService(ILogger<BookService> logger)
         {
@@ -152,22 +153,23 @@ namespace API.Services
             EscapeCssImageReferences(ref stylesheetHtml, apiBase, book);
 
             var styleContent = RemoveWhiteSpaceFromStylesheets(stylesheetHtml);
-            styleContent = styleContent.Replace("body", ".reading-section");
+
+            styleContent = styleContent.Replace("body", CssScopeClass);
 
             if (string.IsNullOrEmpty(styleContent)) return string.Empty;
 
             var stylesheet = await _cssParser.ParseAsync(styleContent);
             foreach (var styleRule in stylesheet.StyleRules)
             {
-                if (styleRule.Selector.Text == ".reading-section") continue;
+                if (styleRule.Selector.Text == CssScopeClass) continue;
                 if (styleRule.Selector.Text.Contains(","))
                 {
                     styleRule.Text = styleRule.Text.Replace(styleRule.SelectorText,
                         string.Join(", ",
-                            styleRule.Selector.Text.Split(",").Select(s => ".reading-section " + s)));
+                            styleRule.Selector.Text.Split(",").Select(s => $"{CssScopeClass} " + s)));
                     continue;
                 }
-                styleRule.Text = ".reading-section " + styleRule.Text;
+                styleRule.Text = $"{CssScopeClass} " + styleRule.Text;
             }
             return RemoveWhiteSpaceFromStylesheets(stylesheet.ToCss());
         }
@@ -371,7 +373,7 @@ namespace API.Services
                             FullFilePath = filePath,
                             IsSpecial = false,
                             Series = series.Trim(),
-                            Volumes = seriesIndex.Split(".")[0]
+                            Volumes = seriesIndex
                         };
                     }
                 }

API/Services/DirectoryService.cs

@@ -21,7 +21,7 @@ namespace API.Services
        public static readonly string CacheDirectory = Path.Join(Directory.GetCurrentDirectory(), "config", "cache");
        public static readonly string CoverImageDirectory = Path.Join(Directory.GetCurrentDirectory(), "config", "covers");
        public static readonly string BackupDirectory = Path.Join(Directory.GetCurrentDirectory(), "config", "backups");
-       public static readonly string StatsDirectory = Path.Join(Directory.GetCurrentDirectory(), "config", "stats");
+       public static readonly string ConfigDirectory = Path.Join(Directory.GetCurrentDirectory(), "config");
 
        public DirectoryService(ILogger<DirectoryService> logger)
        {
@@ -173,7 +173,15 @@ namespace API.Services
          return true;
        }
 
-
+       /// <summary>
+       /// Checks if the root path of a path exists or not.
+       /// </summary>
+       /// <param name="path"></param>
+       /// <returns></returns>
+       public static bool IsDriveMounted(string path)
+       {
+           return new DirectoryInfo(Path.GetPathRoot(path) ?? string.Empty).Exists;
+       }
 
        public static string[] GetFilesWithExtension(string path, string searchPatternExpression = "")
        {
@@ -257,7 +265,7 @@ namespace API.Services
        /// <param name="directoryPath"></param>
        /// <param name="prepend">An optional string to prepend to the target file's name</param>
        /// <returns></returns>
-       public bool CopyFilesToDirectory(IEnumerable<string> filePaths, string directoryPath, string prepend = "")
+       public static bool CopyFilesToDirectory(IEnumerable<string> filePaths, string directoryPath, string prepend = "", ILogger logger = null)
        {
            ExistOrCreate(directoryPath);
            string currentFile = null;
@@ -273,19 +281,24 @@ namespace API.Services
                    }
                    else
                    {
-                       _logger.LogWarning("Tried to copy {File} but it doesn't exist", file);
+                       logger?.LogWarning("Tried to copy {File} but it doesn't exist", file);
                    }
                }
            }
            catch (Exception ex)
            {
-               _logger.LogError(ex, "Unable to copy {File} to {DirectoryPath}", currentFile, directoryPath);
+               logger?.LogError(ex, "Unable to copy {File} to {DirectoryPath}", currentFile, directoryPath);
                return false;
            }
 
            return true;
        }
 
+       public bool CopyFilesToDirectory(IEnumerable<string> filePaths, string directoryPath, string prepend = "")
+       {
+           return CopyFilesToDirectory(filePaths, directoryPath, prepend, _logger);
+       }
+
        public IEnumerable<string> ListDirectory(string rootPath)
         {
            if (!Directory.Exists(rootPath)) return ImmutableList<string>.Empty;

API/Services/HostedServices/StartupTasksHostedService.cs

@@ -29,7 +29,7 @@ namespace API.Services.HostedServices
                 // These methods will automatically check if stat collection is disabled to prevent sending any data regardless
                 // of when setting was changed
                 await taskScheduler.ScheduleStatsTasks();
-                taskScheduler.RunStatCollection();
+                await taskScheduler.RunStatCollection();
             }
             catch (Exception)
             {

API/Services/MetadataService.cs

@@ -218,14 +218,18 @@ namespace API.Services
             var stopwatch = Stopwatch.StartNew();
             var totalTime = 0L;
             _logger.LogInformation("[MetadataService] Refreshing Library {LibraryName}. Total Items: {TotalSize}. Total Chunks: {TotalChunks} with {ChunkSize} size", library.Name, chunkInfo.TotalSize, chunkInfo.TotalChunks, chunkInfo.ChunkSize);
+            await _messageHub.Clients.All.SendAsync(SignalREvents.RefreshMetadataProgress,
+                MessageFactory.RefreshMetadataProgressEvent(library.Id, 0F));
 
-            for (var chunk = 1; chunk <= chunkInfo.TotalChunks; chunk++)
+            var i = 0;
+            for (var chunk = 1; chunk <= chunkInfo.TotalChunks; chunk++, i++)
             {
                 if (chunkInfo.TotalChunks == 0) continue;
                 totalTime += stopwatch.ElapsedMilliseconds;
                 stopwatch.Restart();
                 _logger.LogInformation("[MetadataService] Processing chunk {ChunkNumber} / {TotalChunks} with size {ChunkSize}. Series ({SeriesStart} - {SeriesEnd}",
                     chunk, chunkInfo.TotalChunks, chunkInfo.ChunkSize, chunk * chunkInfo.ChunkSize, (chunk + 1) * chunkInfo.ChunkSize);
+
                 var nonLibrarySeries = await _unitOfWork.SeriesRepository.GetFullSeriesForLibraryIdAsync(library.Id,
                     new UserParams()
                     {
@@ -233,6 +237,7 @@ namespace API.Services
                         PageSize = chunkInfo.ChunkSize
                     });
                 _logger.LogDebug("[MetadataService] Fetched {SeriesCount} series for refresh", nonLibrarySeries.Count);
+
                 Parallel.ForEach(nonLibrarySeries, series =>
                 {
                     try
@@ -275,8 +280,14 @@ namespace API.Services
                         "[MetadataService] Processed {SeriesStart} - {SeriesEnd} out of {TotalSeries} series in {ElapsedScanTime} milliseconds for {LibraryName}",
                         chunk * chunkInfo.ChunkSize, (chunk * chunkInfo.ChunkSize) + nonLibrarySeries.Count, chunkInfo.TotalSize, stopwatch.ElapsedMilliseconds, library.Name);
                 }
+                var progress =  Math.Max(0F, Math.Min(1F, i * 1F / chunkInfo.TotalChunks));
+                await _messageHub.Clients.All.SendAsync(SignalREvents.RefreshMetadataProgress,
+                    MessageFactory.RefreshMetadataProgressEvent(library.Id, progress));
             }
 
+            await _messageHub.Clients.All.SendAsync(SignalREvents.RefreshMetadataProgress,
+                MessageFactory.RefreshMetadataProgressEvent(library.Id, 1F));
+
             _logger.LogInformation("[MetadataService] Updated metadata for {SeriesNumber} series in library {LibraryName} in {ElapsedMilliseconds} milliseconds total", chunkInfo.TotalSize, library.Name, totalTime);
         }
 

API/Services/TaskScheduler.cs

@@ -23,9 +23,9 @@ namespace API.Services
 
         private readonly IStatsService _statsService;
         private readonly IVersionUpdaterService _versionUpdaterService;
-        private const string SendDataTask = "finalize-stats";
 
         public static BackgroundJobServer Client => new BackgroundJobServer();
+        private static readonly Random Rnd = new Random();
 
 
         public TaskScheduler(ICacheService cacheService, ILogger<TaskScheduler> logger, IScannerService scannerService,
@@ -73,7 +73,6 @@ namespace API.Services
 
             RecurringJob.AddOrUpdate("cleanup", () => _cleanupService.Cleanup(), Cron.Daily, TimeZoneInfo.Local);
 
-            RecurringJob.AddOrUpdate("check-for-updates", () => _scannerService.ScanLibraries(), Cron.Daily, TimeZoneInfo.Local);
         }
 
         #region StatsTasks
@@ -89,19 +88,27 @@ namespace API.Services
             }
 
             _logger.LogDebug("Scheduling stat collection daily");
-            RecurringJob.AddOrUpdate(SendDataTask, () => _statsService.Send(), Cron.Daily, TimeZoneInfo.Local);
+            RecurringJob.AddOrUpdate("report-stats", () => _statsService.Send(), Cron.Daily(Rnd.Next(0, 22)), TimeZoneInfo.Local);
         }
 
         public void CancelStatsTasks()
         {
             _logger.LogDebug("Cancelling/Removing StatsTasks");
 
-            RecurringJob.RemoveIfExists(SendDataTask);
+            RecurringJob.RemoveIfExists("report-stats");
         }
 
-        public void RunStatCollection()
+        /// <summary>
+        /// First time run stat collection. Executes immediately on a background thread. Does not block.
+        /// </summary>
+        public async Task RunStatCollection()
         {
-            _logger.LogInformation("Enqueuing stat collection");
+            var allowStatCollection  = (await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).AllowStatCollection;
+            if (!allowStatCollection)
+            {
+                _logger.LogDebug("User has opted out of stat collection, not sending stats");
+                return;
+            }
             BackgroundJob.Enqueue(() => _statsService.Send());
         }
 
@@ -112,8 +119,8 @@ namespace API.Services
         public void ScheduleUpdaterTasks()
         {
             _logger.LogInformation("Scheduling Auto-Update tasks");
-            RecurringJob.AddOrUpdate("check-updates", () => CheckForUpdate(), Cron.Weekly, TimeZoneInfo.Local);
+            // Schedule update check between noon and 6pm local time
-
+            RecurringJob.AddOrUpdate("check-updates", () => _versionUpdaterService.CheckForUpdate(), Cron.Daily(Rnd.Next(12, 18)), TimeZoneInfo.Local);
         }
         #endregion
 

API/Services/Tasks/BackupService.cs

@@ -8,8 +8,9 @@ using API.Entities.Enums;
 using API.Extensions;
 using API.Interfaces;
 using API.Interfaces.Services;
+using API.SignalR;
 using Hangfire;
-using Kavita.Common.EnvironmentInfo;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
@@ -20,45 +21,32 @@ namespace API.Services.Tasks
         private readonly IUnitOfWork _unitOfWork;
         private readonly ILogger<BackupService> _logger;
         private readonly IDirectoryService _directoryService;
-        private readonly string _tempDirectory = DirectoryService.TempDirectory;
+        private readonly IHubContext<MessageHub> _messageHub;
-        private readonly string _logDirectory = DirectoryService.LogDirectory;
 
         private readonly IList<string> _backupFiles;
 
-        public BackupService(IUnitOfWork unitOfWork, ILogger<BackupService> logger, IDirectoryService directoryService, IConfiguration config)
+        public BackupService(IUnitOfWork unitOfWork, ILogger<BackupService> logger,
+            IDirectoryService directoryService, IConfiguration config, IHubContext<MessageHub> messageHub)
         {
             _unitOfWork = unitOfWork;
             _logger = logger;
             _directoryService = directoryService;
+            _messageHub = messageHub;
 
             var maxRollingFiles = config.GetMaxRollingFiles();
             var loggingSection = config.GetLoggingFileName();
             var files = LogFiles(maxRollingFiles, loggingSection);
 
-            if (new OsInfo(Array.Empty<IOsVersionAdapter>()).IsDocker)
+
+            _backupFiles = new List<string>()
             {
-                _backupFiles = new List<string>()
+                "appsettings.json",
-                {
+                "Hangfire.db", // This is not used atm
-                    "data/appsettings.json",
+                "Hangfire-log.db", // This is not used atm
-                    "data/Hangfire.db",
+                "kavita.db",
-                    "data/Hangfire-log.db",
+                "kavita.db-shm", // This wont always be there
-                    "data/kavita.db",
+                "kavita.db-wal" // This wont always be there
-                    "data/kavita.db-shm", // This wont always be there
+            };
-                    "data/kavita.db-wal" // This wont always be there
-                };
-            }
-            else
-            {
-                _backupFiles = new List<string>()
-                {
-                    "appsettings.json",
-                    "Hangfire.db",
-                    "Hangfire-log.db",
-                    "kavita.db",
-                    "kavita.db-shm", // This wont always be there
-                    "kavita.db-wal" // This wont always be there
-                };
-            }
 
             foreach (var file in files.Select(f => (new FileInfo(f)).Name).ToList())
             {
@@ -72,7 +60,7 @@ namespace API.Services.Tasks
             var fi = new FileInfo(logFileName);
 
             var files = maxRollingFiles > 0
-                ? DirectoryService.GetFiles(_logDirectory, $@"{Path.GetFileNameWithoutExtension(fi.Name)}{multipleFileRegex}\.log")
+                ? DirectoryService.GetFiles(DirectoryService.LogDirectory, $@"{Path.GetFileNameWithoutExtension(fi.Name)}{multipleFileRegex}\.log")
                 : new[] {"kavita.log"};
             return files;
         }
@@ -89,11 +77,13 @@ namespace API.Services.Tasks
             _logger.LogDebug("Backing up to {BackupDirectory}", backupDirectory);
             if (!DirectoryService.ExistOrCreate(backupDirectory))
             {
-                _logger.LogError("Could not write to {BackupDirectory}; aborting backup", backupDirectory);
+                _logger.LogCritical("Could not write to {BackupDirectory}; aborting backup", backupDirectory);
                 return;
             }
 
-            var dateString = DateTime.Now.ToShortDateString().Replace("/", "_");
+            await SendProgress(0F);
+
+            var dateString = $"{DateTime.Now.ToShortDateString()}_{DateTime.Now.ToLongTimeString()}".Replace("/", "_").Replace(":", "_");
             var zipPath = Path.Join(backupDirectory, $"kavita_backup_{dateString}.zip");
 
             if (File.Exists(zipPath))
@@ -102,15 +92,19 @@ namespace API.Services.Tasks
                 return;
             }
 
-            var tempDirectory = Path.Join(_tempDirectory, dateString);
+            var tempDirectory = Path.Join(DirectoryService.TempDirectory, dateString);
             DirectoryService.ExistOrCreate(tempDirectory);
             DirectoryService.ClearDirectory(tempDirectory);
 
             _directoryService.CopyFilesToDirectory(
-                _backupFiles.Select(file => Path.Join(Directory.GetCurrentDirectory(), file)).ToList(), tempDirectory);
+                _backupFiles.Select(file => Path.Join(DirectoryService.ConfigDirectory, file)).ToList(), tempDirectory);
+
+            await SendProgress(0.25F);
 
             await CopyCoverImagesToBackupDirectory(tempDirectory);
 
+            await SendProgress(0.75F);
+
             try
             {
                 ZipFile.CreateFromDirectory(tempDirectory, zipPath);
@@ -122,6 +116,7 @@ namespace API.Services.Tasks
 
             DirectoryService.ClearAndDeleteDirectory(tempDirectory);
             _logger.LogInformation("Database backup completed");
+            await SendProgress(1F);
         }
 
         private async Task CopyCoverImagesToBackupDirectory(string tempDirectory)
@@ -154,6 +149,12 @@ namespace API.Services.Tasks
             }
         }
 
+        private async Task SendProgress(float progress)
+        {
+            await _messageHub.Clients.All.SendAsync(SignalREvents.BackupDatabaseProgress,
+                MessageFactory.BackupDatabaseProgressEvent(progress));
+        }
+
         /// <summary>
         /// Removes Database backups older than 30 days. If all backups are older than 30 days, the latest is kept.
         /// </summary>

API/Services/Tasks/CleanupService.cs

@@ -2,7 +2,9 @@
 using System.Threading.Tasks;
 using API.Interfaces;
 using API.Interfaces.Services;
+using API.SignalR;
 using Hangfire;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
 
 namespace API.Services.Tasks
@@ -16,14 +18,16 @@ namespace API.Services.Tasks
         private readonly ILogger<CleanupService> _logger;
         private readonly IBackupService _backupService;
         private readonly IUnitOfWork _unitOfWork;
+        private readonly IHubContext<MessageHub> _messageHub;
 
         public CleanupService(ICacheService cacheService, ILogger<CleanupService> logger,
-            IBackupService backupService, IUnitOfWork unitOfWork)
+            IBackupService backupService, IUnitOfWork unitOfWork, IHubContext<MessageHub> messageHub)
         {
             _cacheService = cacheService;
             _logger = logger;
             _backupService = backupService;
             _unitOfWork = unitOfWork;
+            _messageHub = messageHub;
         }
 
         public void CleanupCacheDirectory()
@@ -39,19 +43,31 @@ namespace API.Services.Tasks
         public async Task Cleanup()
         {
             _logger.LogInformation("Starting Cleanup");
+            await SendProgress(0F);
             _logger.LogInformation("Cleaning temp directory");
-            var tempDirectory = DirectoryService.TempDirectory;
+            DirectoryService.ClearDirectory(DirectoryService.TempDirectory);
-            DirectoryService.ClearDirectory(tempDirectory);
+            await SendProgress(0.1F);
             CleanupCacheDirectory();
+            await SendProgress(0.25F);
             _logger.LogInformation("Cleaning old database backups");
             _backupService.CleanupBackups();
+            await SendProgress(0.50F);
             _logger.LogInformation("Cleaning deleted cover images");
             await DeleteSeriesCoverImages();
+            await SendProgress(0.6F);
             await DeleteChapterCoverImages();
+            await SendProgress(0.7F);
             await DeleteTagCoverImages();
+            await SendProgress(1F);
             _logger.LogInformation("Cleanup finished");
         }
 
+        private async Task SendProgress(float progress)
+        {
+            await _messageHub.Clients.All.SendAsync(SignalREvents.CleanupProgress,
+                MessageFactory.CleanupProgressEvent(progress));
+        }
+
         private async Task DeleteSeriesCoverImages()
         {
             var images = await _unitOfWork.SeriesRepository.GetAllCoverImagesAsync();

API/Services/Tasks/ScannerService.cs

@@ -56,6 +56,14 @@ namespace API.Services.Tasks
            var chapterIds = await _unitOfWork.SeriesRepository.GetChapterIdsForSeriesAsync(new[] {seriesId});
            var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(libraryId, LibraryIncludes.Folders);
            var folderPaths = library.Folders.Select(f => f.Path).ToList();
+
+           // Check if any of the folder roots are not available (ie disconnected from network, etc) and fail if any of them are
+           if (folderPaths.Any(f => !DirectoryService.IsDriveMounted(f)))
+           {
+               _logger.LogError("Some of the root folders for library are not accessible. Please check that drives are connected and rescan. Scan will be aborted");
+               return;
+           }
+
            var dirs = DirectoryService.FindHighestDirectoriesFromFiles(folderPaths, files.Select(f => f.FilePath).ToList());
 
            _logger.LogInformation("Beginning file scan on {SeriesName}", series.Name);
@@ -129,8 +137,7 @@ namespace API.Services.Tasks
                await _unitOfWork.RollbackAsync();
            }
            // Tell UI that this series is done
-           await _messageHub.Clients.All.SendAsync(SignalREvents.ScanSeries, MessageFactory.ScanSeriesEvent(seriesId, series.Name),
+           await _messageHub.Clients.All.SendAsync(SignalREvents.ScanSeries, MessageFactory.ScanSeriesEvent(seriesId, series.Name), token);
-               cancellationToken: token);
            await CleanupDbEntities();
            BackgroundJob.Enqueue(() => _cacheService.CleanupChapters(chapterIds));
            BackgroundJob.Enqueue(() => _metadataService.RefreshMetadataForSeries(libraryId, series.Id, false));
@@ -195,6 +202,14 @@ namespace API.Services.Tasks
                return;
            }
 
+           // Check if any of the folder roots are not available (ie disconnected from network, etc) and fail if any of them are
+           if (library.Folders.Any(f => !DirectoryService.IsDriveMounted(f.Path)))
+           {
+               _logger.LogError("Some of the root folders for library are not accessible. Please check that drives are connected and rescan. Scan will be aborted");
+               return;
+           }
+
+
            _logger.LogInformation("[ScannerService] Beginning file scan on {LibraryName}", library.Name);
            await _messageHub.Clients.All.SendAsync(SignalREvents.ScanLibraryProgress,
                MessageFactory.ScanLibraryProgressEvent(libraryId, 0));
@@ -228,7 +243,7 @@ namespace API.Services.Tasks
 
            BackgroundJob.Enqueue(() => _metadataService.RefreshMetadata(libraryId, false));
            await _messageHub.Clients.All.SendAsync(SignalREvents.ScanLibraryProgress,
-               MessageFactory.ScanLibraryProgressEvent(libraryId, 100));
+               MessageFactory.ScanLibraryProgressEvent(libraryId, 1F));
        }
 
        /// <summary>
@@ -326,7 +341,7 @@ namespace API.Services.Tasks
                   await _messageHub.Clients.All.SendAsync(SignalREvents.SeriesRemoved, MessageFactory.SeriesRemovedEvent(missing.Id, missing.Name, library.Id));
               }
 
-              var progress =  Math.Max(0, Math.Min(100, ((chunk + 1F) * chunkInfo.ChunkSize) / chunkInfo.TotalSize));
+              var progress =  Math.Max(0, Math.Min(1, ((chunk + 1F) * chunkInfo.ChunkSize) / chunkInfo.TotalSize));
               await _messageHub.Clients.All.SendAsync(SignalREvents.ScanLibraryProgress,
                   MessageFactory.ScanLibraryProgressEvent(library.Id, progress));
           }
@@ -343,15 +358,14 @@ namespace API.Services.Tasks
               // Key is normalized already
               Series existingSeries;
               try
-              {// NOTE: Maybe use .Equals() here
+              {
-                  existingSeries = allSeries.SingleOrDefault(s =>
+                  existingSeries = allSeries.SingleOrDefault(s => FindSeries(s, key));
-                      (s.NormalizedName == key.NormalizedName || Parser.Parser.Normalize(s.OriginalName) == key.NormalizedName)
-                      && (s.Format == key.Format || s.Format == MangaFormat.Unknown));
               }
               catch (Exception e)
               {
+                  // NOTE: If I ever want to put Duplicates table, this is where it can go
                   _logger.LogCritical(e, "[ScannerService] There are multiple series that map to normalized key {Key}. You can manually delete the entity via UI and rescan to fix it. This will be skipped", key.NormalizedName);
-                  var duplicateSeries = allSeries.Where(s => s.NormalizedName == key.NormalizedName || Parser.Parser.Normalize(s.OriginalName) == key.NormalizedName).ToList();
+                  var duplicateSeries = allSeries.Where(s => FindSeries(s, key));
                   foreach (var series in duplicateSeries)
                   {
                       _logger.LogCritical("[ScannerService] Duplicate Series Found: {Key} maps with {Series}", key.Name, series.OriginalName);
@@ -362,46 +376,38 @@ namespace API.Services.Tasks
 
               if (existingSeries != null) continue;
 
-              existingSeries = DbFactory.Series(infos[0].Series);
+              var s = DbFactory.Series(infos[0].Series);
-              existingSeries.Format = key.Format;
+              s.Format = key.Format;
-              newSeries.Add(existingSeries);
+              s.LibraryId = library.Id; // We have to manually set this since we aren't adding the series to the Library's series.
+              newSeries.Add(s);
           }
 
           var i = 0;
           foreach(var series in newSeries)
           {
+              _logger.LogDebug("[ScannerService] Processing series {SeriesName}", series.OriginalName);
+              UpdateSeries(series, parsedSeries);
+              _unitOfWork.SeriesRepository.Attach(series);
               try
               {
-                  _logger.LogDebug("[ScannerService] Processing series {SeriesName}", series.OriginalName);
+                  await _unitOfWork.CommitAsync();
-                  UpdateVolumes(series, ParseScannedFiles.GetInfosByName(parsedSeries, series).ToArray());
+                  _logger.LogInformation(
-                  series.Pages = series.Volumes.Sum(v => v.Pages);
+                      "[ScannerService] Added {NewSeries} series in {ElapsedScanTime} milliseconds for {LibraryName}",
-                  series.LibraryId = library.Id; // We have to manually set this since we aren't adding the series to the Library's series.
+                      newSeries.Count, stopwatch.ElapsedMilliseconds, library.Name);
-                  _unitOfWork.SeriesRepository.Attach(series);
-                  if (await _unitOfWork.CommitAsync())
-                  {
-                      _logger.LogInformation(
-                          "[ScannerService] Added {NewSeries} series in {ElapsedScanTime} milliseconds for {LibraryName}",
-                          newSeries.Count, stopwatch.ElapsedMilliseconds, library.Name);
 
-                      // Inform UI of new series added
+                  // Inform UI of new series added
-                      await _messageHub.Clients.All.SendAsync(SignalREvents.SeriesAdded, MessageFactory.SeriesAddedEvent(series.Id, series.Name, library.Id));
+                  await _messageHub.Clients.All.SendAsync(SignalREvents.SeriesAdded, MessageFactory.SeriesAddedEvent(series.Id, series.Name, library.Id));
-                      var progress =  Math.Max(0F, Math.Min(100F, i * 1F / newSeries.Count));
-                      await _messageHub.Clients.All.SendAsync(SignalREvents.ScanLibraryProgress,
-                          MessageFactory.ScanLibraryProgressEvent(library.Id, progress));
-                  }
-                  else
-                  {
-                      // This is probably not needed. Better to catch the exception.
-                      _logger.LogCritical(
-                          "[ScannerService] There was a critical error that resulted in a failed scan. Please check logs and rescan");
-                  }
-
-                  i++;
               }
               catch (Exception ex)
               {
-                  _logger.LogError(ex, "[ScannerService] There was an exception updating volumes for {SeriesName}", series.Name);
+                  _logger.LogCritical(ex, "[ScannerService] There was a critical exception adding new series entry for {SeriesName} with a duplicate index key: {IndexKey} ",
+                      series.Name, $"{series.Name}_{series.NormalizedName}_{series.LocalizedName}_{series.LibraryId}_{series.Format}");
               }
+
+              var progress =  Math.Max(0F, Math.Min(1F, i * 1F / newSeries.Count));
+              await _messageHub.Clients.All.SendAsync(SignalREvents.ScanLibraryProgress,
+                  MessageFactory.ScanLibraryProgressEvent(library.Id, progress));
+              i++;
           }
 
           _logger.LogInformation(
@@ -409,13 +415,19 @@ namespace API.Services.Tasks
               newSeries.Count, stopwatch.ElapsedMilliseconds, library.Name);
        }
 
+       private static bool FindSeries(Series series, ParsedSeries parsedInfoKey)
+       {
+           return (series.NormalizedName.Equals(parsedInfoKey.NormalizedName) || Parser.Parser.Normalize(series.OriginalName).Equals(parsedInfoKey.NormalizedName))
+                  && (series.Format == parsedInfoKey.Format || series.Format == MangaFormat.Unknown);
+       }
+
        private void UpdateSeries(Series series, Dictionary<ParsedSeries, List<ParserInfo>> parsedSeries)
        {
            try
            {
                _logger.LogInformation("[ScannerService] Processing series {SeriesName}", series.OriginalName);
 
-               var parsedInfos = ParseScannedFiles.GetInfosByName(parsedSeries, series).ToArray();
+               var parsedInfos = ParseScannedFiles.GetInfosByName(parsedSeries, series);
                UpdateVolumes(series, parsedInfos);
                series.Pages = series.Volumes.Sum(v => v.Pages);
 
@@ -482,7 +494,7 @@ namespace API.Services.Tasks
        /// <param name="missingSeries">Series not found on disk or can't be parsed</param>
        /// <param name="removeCount"></param>
        /// <returns>the updated existingSeries</returns>
-       public static IList<Series> RemoveMissingSeries(IList<Series> existingSeries, IEnumerable<Series> missingSeries, out int removeCount)
+       public static IEnumerable<Series> RemoveMissingSeries(IList<Series> existingSeries, IEnumerable<Series> missingSeries, out int removeCount)
        {
           var existingCount = existingSeries.Count;
           var missingList = missingSeries.ToList();
@@ -496,7 +508,7 @@ namespace API.Services.Tasks
           return existingSeries;
        }
 
-       private void UpdateVolumes(Series series, ParserInfo[] parsedInfos)
+       private void UpdateVolumes(Series series, IList<ParserInfo> parsedInfos)
        {
           var startingVolumeCount = series.Volumes.Count;
           // Add new volumes and update chapters per volume
@@ -550,7 +562,7 @@ namespace API.Services.Tasks
        /// </summary>
        /// <param name="volume"></param>
        /// <param name="parsedInfos"></param>
-       private void UpdateChapters(Volume volume, ParserInfo[] parsedInfos)
+       private void UpdateChapters(Volume volume, IList<ParserInfo> parsedInfos)
        {
           // Add new chapters
           foreach (var info in parsedInfos)

API/Services/Tasks/StatsService.cs

@@ -1,46 +1,31 @@
 using System;
-using System.IO;
-using System.Linq;
 using System.Net.Http;
 using System.Runtime.InteropServices;
-using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
-using API.Data;
 using API.DTOs.Stats;
+using API.Entities.Enums;
 using API.Interfaces;
 using API.Interfaces.Services;
 using Flurl.Http;
-using Hangfire;
-using Kavita.Common;
 using Kavita.Common.EnvironmentInfo;
 using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 namespace API.Services.Tasks
 {
     public class StatsService : IStatsService
     {
-        private const string StatFileName = "app_stats.json";
-
-        private readonly DataContext _dbContext;
         private readonly ILogger<StatsService> _logger;
         private readonly IUnitOfWork _unitOfWork;
+        private const string ApiUrl = "https://stats.kavitareader.com";
 
-#pragma warning disable S1075
+        public StatsService(ILogger<StatsService> logger, IUnitOfWork unitOfWork)
-        private const string ApiUrl = "http://stats.kavitareader.com";
-#pragma warning restore S1075
-        private static readonly string StatsFilePath = Path.Combine(DirectoryService.StatsDirectory, StatFileName);
-
-        private static bool FileExists => File.Exists(StatsFilePath);
-
-        public StatsService(DataContext dbContext, ILogger<StatsService> logger,
-            IUnitOfWork unitOfWork)
         {
-            _dbContext = dbContext;
             _logger = logger;
             _unitOfWork = unitOfWork;
+
+            FlurlHttp.ConfigureClient(ApiUrl, cli =>
+                cli.Settings.HttpClientFactory = new UntrustedCertClientFactory());
         }
 
         /// <summary>
@@ -55,17 +40,7 @@ namespace API.Services.Tasks
                 return;
             }
 
-            var rnd = new Random();
+            await SendData();
-            var offset = rnd.Next(0, 6);
-            if (offset == 0)
-            {
-                await SendData();
-            }
-            else
-            {
-                _logger.LogInformation("KavitaStats upload has been schedule to run in {Offset} hours", offset);
-                BackgroundJob.Schedule(() => SendData(), DateTimeOffset.Now.AddHours(offset));
-            }
         }
 
         /// <summary>
@@ -74,66 +49,30 @@ namespace API.Services.Tasks
         // ReSharper disable once MemberCanBePrivate.Global
         public async Task SendData()
         {
-            await CollectRelevantData();
+            var data = await GetServerInfo();
-            await FinalizeStats();
+            await SendDataToStatsServer(data);
         }
 
-        public async Task RecordClientInfo(ClientInfoDto clientInfoDto)
-        {
-            var statisticsDto = await GetData();
-            statisticsDto.AddClientInfo(clientInfoDto);
 
-            await SaveFile(statisticsDto);
+        private async Task SendDataToStatsServer(ServerInfoDto data)
-        }
-
-        private async Task CollectRelevantData()
-        {
-            var usageInfo = await GetUsageInfo();
-            var serverInfo = GetServerInfo();
-
-            await PathData(serverInfo, usageInfo);
-        }
-
-        private async Task FinalizeStats()
-        {
-            try
-            {
-                var data = await GetExistingData<UsageStatisticsDto>();
-                var successful = await SendDataToStatsServer(data);
-
-                if (successful)
-                {
-                    ResetStats();
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "There was an exception while sending data to KavitaStats");
-            }
-        }
-
-        private async Task<bool> SendDataToStatsServer(UsageStatisticsDto data)
         {
             var responseContent = string.Empty;
 
             try
             {
-                var response = await (ApiUrl + "/api/InstallationStats")
+                var response = await (ApiUrl + "/api/v2/stats")
                     .WithHeader("Accept", "application/json")
                     .WithHeader("User-Agent", "Kavita")
                     .WithHeader("x-api-key", "MsnvA2DfQqxSK5jh")
-                    .WithHeader("api-key", "MsnvA2DfQqxSK5jh")
                     .WithHeader("x-kavita-version", BuildInfo.Version)
+                    .WithHeader("Content-Type", "application/json")
                     .WithTimeout(TimeSpan.FromSeconds(30))
                     .PostJsonAsync(data);
 
                 if (response.StatusCode != StatusCodes.Status200OK)
                 {
                     _logger.LogError("KavitaStats did not respond successfully. {Content}", response);
-                    return false;
                 }
-
-                return true;
             }
             catch (HttpRequestException e)
             {
@@ -149,84 +88,22 @@ namespace API.Services.Tasks
             {
                 _logger.LogError(e, "An error happened during the request to KavitaStats");
             }
-
-            return false;
         }
 
-        private static void ResetStats()
+        public async Task<ServerInfoDto> GetServerInfo()
-        {
-            if (FileExists) File.Delete(StatsFilePath);
-        }
-
-        private async Task PathData(ServerInfoDto serverInfoDto, UsageInfoDto usageInfoDto)
-        {
-            var data = await GetData();
-
-            data.ServerInfo = serverInfoDto;
-            data.UsageInfo = usageInfoDto;
-
-            data.MarkAsUpdatedNow();
-
-            await SaveFile(data);
-        }
-
-        private static async ValueTask<UsageStatisticsDto> GetData()
-        {
-            if (!FileExists) return new UsageStatisticsDto {InstallId = HashUtil.AnonymousToken()};
-
-            return await GetExistingData<UsageStatisticsDto>();
-        }
-
-        private async Task<UsageInfoDto> GetUsageInfo()
-        {
-            var usersCount = await _dbContext.Users.CountAsync();
-
-            var libsCountByType = await _dbContext.Library
-                .AsNoTracking()
-                .GroupBy(x => x.Type)
-                .Select(x => new LibInfo {Type = x.Key, Count = x.Count()})
-                .ToArrayAsync();
-
-            var uniqueFileTypes = await _unitOfWork.FileRepository.GetFileExtensions();
-
-            var usageInfo = new UsageInfoDto
-            {
-                UsersCount = usersCount,
-                LibraryTypesCreated = libsCountByType,
-                FileTypes = uniqueFileTypes
-            };
-
-            return usageInfo;
-        }
-
-        public static ServerInfoDto GetServerInfo()
         {
+            var installId = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallId);
             var serverInfo = new ServerInfoDto
             {
+                InstallId = installId.Value,
                 Os = RuntimeInformation.OSDescription,
-                DotNetVersion = Environment.Version.ToString(),
-                RunTimeVersion = RuntimeInformation.FrameworkDescription,
                 KavitaVersion = BuildInfo.Version.ToString(),
-                Culture = Thread.CurrentThread.CurrentCulture.Name,
+                DotnetVersion = Environment.Version.ToString(),
-                BuildBranch = BuildInfo.Branch,
                 IsDocker = new OsInfo(Array.Empty<IOsVersionAdapter>()).IsDocker,
-                NumOfCores = Environment.ProcessorCount
+                NumOfCores = Math.Max(Environment.ProcessorCount, 1)
             };
 
             return serverInfo;
         }
-
-        private static async Task<T> GetExistingData<T>()
-        {
-            var json = await File.ReadAllTextAsync(StatsFilePath);
-            return JsonSerializer.Deserialize<T>(json);
-        }
-
-        private static async Task SaveFile(UsageStatisticsDto statisticsDto)
-        {
-            DirectoryService.ExistOrCreate(DirectoryService.StatsDirectory);
-
-            await File.WriteAllTextAsync(StatsFilePath, JsonSerializer.Serialize(statisticsDto));
-        }
     }
 }

API/Services/Tasks/VersionUpdaterService.cs

@@ -38,6 +38,11 @@ namespace API.Services.Tasks
         /// </summary>
         // ReSharper disable once InconsistentNaming
         public string Html_Url { get; init; }
+        /// <summary>
+        /// Date Release was Published
+        /// </summary>
+        // ReSharper disable once InconsistentNaming
+        public string Published_At { get; init; }
     }
 
     public class UntrustedCertClientFactory : DefaultHttpClientFactory
@@ -109,7 +114,8 @@ namespace API.Services.Tasks
                 UpdateBody = _markdown.Transform(update.Body.Trim()),
                 UpdateTitle = update.Name,
                 UpdateUrl = update.Html_Url,
-                IsDocker = new OsInfo(Array.Empty<IOsVersionAdapter>()).IsDocker
+                IsDocker = new OsInfo(Array.Empty<IOsVersionAdapter>()).IsDocker,
+                PublishDate = update.Published_At
             };
         }
 

API/SignalR/MessageFactory.cs

@@ -60,6 +60,20 @@ namespace API.SignalR
             };
         }
 
+        public static SignalRMessage RefreshMetadataProgressEvent(int libraryId, float progress)
+        {
+            return new SignalRMessage()
+            {
+                Name = SignalREvents.RefreshMetadataProgress,
+                Body = new
+                {
+                    LibraryId = libraryId,
+                    Progress = progress,
+                    EventTime = DateTime.Now
+                }
+            };
+        }
+
 
 
         public static SignalRMessage RefreshMetadataEvent(int libraryId, int seriesId)
@@ -75,6 +89,31 @@ namespace API.SignalR
             };
         }
 
+        public static SignalRMessage BackupDatabaseProgressEvent(float progress)
+        {
+            return new SignalRMessage()
+            {
+                Name = SignalREvents.BackupDatabaseProgress,
+                Body = new
+                {
+                    Progress = progress
+                }
+            };
+        }
+        public static SignalRMessage CleanupProgressEvent(float progress)
+        {
+            return new SignalRMessage()
+            {
+                Name = SignalREvents.CleanupProgress,
+                Body = new
+                {
+                    Progress = progress
+                }
+            };
+        }
+
+
+
         public static SignalRMessage UpdateVersionEvent(UpdateNotificationDto update)
         {
             return new SignalRMessage

API/SignalR/SignalREvents.cs

@@ -4,7 +4,14 @@
     {
         public const string UpdateVersion = "UpdateVersion";
         public const string ScanSeries = "ScanSeries";
+        /// <summary>
+        /// Event during Refresh Metadata for cover image change
+        /// </summary>
         public const string RefreshMetadata = "RefreshMetadata";
+        /// <summary>
+        /// Event sent out during Refresh Metadata for progress tracking
+        /// </summary>
+        public const string RefreshMetadataProgress = "RefreshMetadataProgress";
         public const string ScanLibrary = "ScanLibrary";
         public const string SeriesAdded = "SeriesAdded";
         public const string SeriesRemoved = "SeriesRemoved";
@@ -12,5 +19,13 @@
         public const string OnlineUsers = "OnlineUsers";
         public const string SeriesAddedToCollection = "SeriesAddedToCollection";
         public const string ScanLibraryError = "ScanLibraryError";
+        /// <summary>
+        /// Event sent out during backing up the database
+        /// </summary>
+        public const string BackupDatabaseProgress = "BackupDatabaseProgress";
+        /// <summary>
+        /// Event sent out during cleaning up temp and cache folders
+        /// </summary>
+        public const string CleanupProgress = "CleanupProgress";
     }
 }

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 We're always looking for people to help make Kavita even better, there are a number of ways to contribute.
 
 ## Documentation ##
-Setup guides, FAQ, the more information we have on the [wiki](https://github.com/Kareadita/Kavita/wiki) the better.
+Setup guides, FAQ, the more information we have on the [wiki](https://wiki.kavitareader.com/) the better.
 
 ## Development ##
 

Kavita.Common/Kavita.Common.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>net5.0</TargetFramework>
         <Company>kavitareader.com</Company>
         <Product>Kavita</Product>
-        <AssemblyVersion>0.4.8.1</AssemblyVersion>
+        <AssemblyVersion>0.4.9.0</AssemblyVersion>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>
 

README.md

@@ -80,15 +80,15 @@ services:
 **Note: Kavita is under heavy development and is being updated all the time, so the tag for current builds is `:nightly`. The `:latest` tag will be the latest stable release.**
 
 ## Feature Requests
-Got a great idea? Throw it up on the FeatHub or vote on another idea. Please check the [Project Board](https://github.com/Kareadita/Kavita/projects) first for a list of planned features.
+Got a great idea? Throw it up on our [Feature Request site](https://feats.kavitareader.com/) or vote on another idea. Please check the [Project Board](https://github.com/Kareadita/Kavita/projects) first for a list of planned features.
-
-[![Feature Requests](https://feathub.com/Kareadita/Kavita?format=svg)](https://feathub.com/Kareadita/Kavita)
 
 
 ## Contributors
 
 This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
-<a href="https://github.com/Kareadita/Kavita/graphs/contributors"><img src="https://opencollective.com/kavita/contributors.svg?width=890&button=false" /></a>
+<a href="https://github.com/Kareadita/Kavita/graphs/contributors">
+<img src="https://opencollective.com/kavita/contributors.svg?width=890&button=false&avatarHeight=42" />
+</a>
 
 
 ## Donate
@@ -99,7 +99,7 @@ expenses related to Kavita. Back us through [OpenCollective](https://opencollect
 
 Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/Kavita#backer)
 
-<img src="https://opencollective.com/Kavita/backers.svg?width=890"></a>
+<img src="https://opencollective.com/kavita/backers.svg?width=890&avatarHeight=42"></a>
 
 ## Sponsors
 
@@ -116,9 +116,6 @@ Thank you to [<img src="/Logo/jetbrains.svg" alt="" width="32"> JetBrains](http:
 * [<img src="/Logo/rider.svg" alt="" width="32"> Rider](http://www.jetbrains.com/rider/)
 * [<img src="/Logo/dottrace.svg" alt="" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
 
-## Sentry
-Thank you to [<img src="/Logo/sentry.svg" alt="" width="64">](https://sentry.io/welcome/) for providing us with free license to their software.
-
 ### License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)

UI/Web/angular.json

@@ -71,7 +71,7 @@
                 {
                   "type": "anyComponentStyle",
                   "maximumWarning": "2kb",
-                  "maximumError": "4kb"
+                  "maximumError": "5kb"
                 }
               ]
             }

UI/Web/package-lock.json

@@ -89,6 +89,36 @@
         "webpack-sources": "2.0.1",
         "webpack-subresource-integrity": "1.5.1",
         "worker-plugin": "5.0.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "7.0.32",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+          "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+              "dev": true
+            }
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@angular-devkit/build-optimizer": {
@@ -3252,9 +3282,9 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "5.0.0",
+      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -4591,9 +4621,9 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
-      "version": "1.5.4",
+      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
-      "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==",
+      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
       "dev": true,
       "requires": {
         "color-name": "^1.0.0",
@@ -6820,9 +6850,9 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
+      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
@@ -9620,9 +9650,9 @@
           }
         },
         "ws": {
-          "version": "7.4.3",
+          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-          "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==",
+          "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
           "dev": true
         }
       }
@@ -9710,9 +9740,9 @@
       }
     },
     "jszip": {
-      "version": "3.5.0",
+      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
-      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
       "dev": true,
       "requires": {
         "lie": "~3.3.0",
@@ -11269,20 +11299,6 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
           "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
           "dev": true
-        },
-        "tar": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-          "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
-          "dev": true,
-          "requires": {
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.0.0",
-            "minipass": "^3.0.0",
-            "minizlib": "^2.1.1",
-            "mkdirp": "^1.0.3",
-            "yallist": "^4.0.0"
-          }
         }
       }
     },
@@ -11416,9 +11432,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.6",
+      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -11451,6 +11467,12 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
+    "picocolors": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true
+    },
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -11534,14 +11556,13 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.32",
+      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2",
+        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1",
+        "source-map": "^0.6.1"
-        "supports-color": "^6.1.0"
       },
       "dependencies": {
         "source-map": {
@@ -11549,15 +11570,6 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -14752,9 +14764,9 @@
       "dev": true
     },
     "tar": {
-      "version": "6.0.5",
+      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dev": true,
       "requires": {
         "chownr": "^2.0.0",
@@ -14919,9 +14931,9 @@
       }
     },
     "tmpl": {
-      "version": "1.0.4",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "to-arraybuffer": {
@@ -15390,9 +15402,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.1",
+      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
+      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -16678,45 +16690,12 @@
       "dev": true
     },
     "wide-align": {
-      "version": "1.1.3",
+      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "string-width": "^1.0.2 || 2 || 3 || 4"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
       }
     },
     "wildcard": {

UI/Web/src/app/_interceptors/error.interceptor.ts

@@ -46,10 +46,10 @@ export class ErrorInterceptor implements HttpInterceptor {
             }
 
             // If we are not on no-connection, redirect there and save current url so when we refersh, we redirect back there
-            if (this.router.url !== '/no-connection') {
+            // if (this.router.url !== '/no-connection') {
-              localStorage.setItem(this.urlKey, this.router.url);
+            //   localStorage.setItem(this.urlKey, this.router.url);
-              this.router.navigateByUrl('/no-connection');
+            //   this.router.navigateByUrl('/no-connection');
-            }
+            // }
             break;
         }
         return throwError(error);

UI/Web/src/app/_models/chapter.ts

@@ -15,4 +15,5 @@ export interface Chapter {
     pagesRead: number; // Attached for the given user when requesting from API
     isSpecial: boolean;
     title: string;
+    created: string;
 }

UI/Web/src/app/_models/events/scan-library-progress-event.ts

@@ -1,4 +1,4 @@
-export interface ScanLibraryProgressEvent {
+export interface ProgressEvent {
     libraryId: number;
     progress: number;
     eventTime: string;

UI/Web/src/app/_models/events/series-removed-event.ts

@@ -0,0 +1,5 @@
+export interface SeriesRemovedEvent {
+    libraryId: number;
+    seriesId: number;
+    seriesName: string;
+}

UI/Web/src/app/_models/events/update-version-event.ts

@@ -5,4 +5,5 @@ export interface UpdateVersionEvent {
     updateTitle: string;
     updateUrl: string;
     isDocker: boolean;
+    publishDate: string;
 }

UI/Web/src/app/_models/preferences/page-split-option.ts

@@ -1,5 +1,18 @@
 export enum PageSplitOption {
+    /**
+     * Renders the left side of the image then the right side
+     */
     SplitLeftToRight = 0,
+    /**
+     * Renders the right side of the image then the left side
+     */
     SplitRightToLeft = 1,
-    NoSplit = 2
+    /**
+     * Don't split and show the image in original size
+     */
+    NoSplit = 2,
+    /**
+     * Don't split and scale the image to fit screen space
+     */
+    FitSplit = 3
 }

UI/Web/src/app/_models/preferences/preferences.ts

@@ -26,5 +26,5 @@ export interface Preferences {
 
 export const readingDirections = [{text: 'Left to Right', value: ReadingDirection.LeftToRight}, {text: 'Right to Left', value: ReadingDirection.RightToLeft}];
 export const scalingOptions = [{text: 'Automatic', value: ScalingOption.Automatic}, {text: 'Fit to Height', value: ScalingOption.FitToHeight}, {text: 'Fit to Width', value: ScalingOption.FitToWidth}, {text: 'Original', value: ScalingOption.Original}];
-export const pageSplitOptions = [{text: 'Right to Left', value: PageSplitOption.SplitRightToLeft}, {text: 'Left to Right', value: PageSplitOption.SplitLeftToRight}, {text: 'No Split', value: PageSplitOption.NoSplit}];
+export const pageSplitOptions = [{text: 'Fit to Screen', value: PageSplitOption.FitSplit}, {text: 'Right to Left', value: PageSplitOption.SplitRightToLeft}, {text: 'Left to Right', value: PageSplitOption.SplitLeftToRight}, {text: 'No Split', value: PageSplitOption.NoSplit}];
 export const readingModes = [{text: 'Left to Right', value: READER_MODE.MANGA_LR}, {text: 'Up to Down', value: READER_MODE.MANGA_UD}, {text: 'Webtoon', value: READER_MODE.WEBTOON}];

UI/Web/src/app/_services/message-hub.service.ts

@@ -1,4 +1,5 @@
 import { EventEmitter, Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { HubConnection, HubConnectionBuilder } from '@microsoft/signalr';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ToastrService } from 'ngx-toastr';
@@ -6,7 +7,7 @@ import { BehaviorSubject, ReplaySubject } from 'rxjs';
 import { environment } from 'src/environments/environment';
 import { UpdateNotificationModalComponent } from '../shared/update-notification/update-notification-modal.component';
 import { RefreshMetadataEvent } from '../_models/events/refresh-metadata-event';
-import { ScanLibraryProgressEvent } from '../_models/events/scan-library-progress-event';
+import { ProgressEvent } from '../_models/events/scan-library-progress-event';
 import { ScanSeriesEvent } from '../_models/events/scan-series-event';
 import { SeriesAddedEvent } from '../_models/events/series-added-event';
 import { User } from '../_models/user';
@@ -15,11 +16,15 @@ export enum EVENTS {
   UpdateAvailable = 'UpdateAvailable',
   ScanSeries = 'ScanSeries',
   RefreshMetadata = 'RefreshMetadata',
+  RefreshMetadataProgress = 'RefreshMetadataProgress',
   SeriesAdded = 'SeriesAdded',
+  SeriesRemoved = 'SeriesRemoved',
   ScanLibraryProgress = 'ScanLibraryProgress',
   OnlineUsers = 'OnlineUsers',
   SeriesAddedToCollection = 'SeriesAddedToCollection',
-  ScanLibraryError = 'ScanLibraryError'
+  ScanLibraryError = 'ScanLibraryError',
+  BackupDatabaseProgress = 'BackupDatabaseProgress',
+  CleanupProgress = 'CleanupProgress'
 }
 
 export interface Message<T> {
@@ -42,13 +47,13 @@ export class MessageHubService {
   onlineUsers$ = this.onlineUsersSource.asObservable();
 
   public scanSeries: EventEmitter<ScanSeriesEvent> = new EventEmitter<ScanSeriesEvent>();
-  public scanLibrary: EventEmitter<ScanLibraryProgressEvent> = new EventEmitter<ScanLibraryProgressEvent>();
+  public scanLibrary: EventEmitter<ProgressEvent> = new EventEmitter<ProgressEvent>(); // TODO: Refactor this name to be generic
   public seriesAdded: EventEmitter<SeriesAddedEvent> = new EventEmitter<SeriesAddedEvent>();
   public refreshMetadata: EventEmitter<RefreshMetadataEvent> = new EventEmitter<RefreshMetadataEvent>();
 
   isAdmin: boolean = false;
 
-  constructor(private modalService: NgbModal, private toastr: ToastrService) {
+  constructor(private modalService: NgbModal, private toastr: ToastrService, private router: Router) {
     
   }
 
@@ -87,6 +92,27 @@ export class MessageHubService {
       this.scanLibrary.emit(resp.body);
     });
 
+    this.hubConnection.on(EVENTS.BackupDatabaseProgress, resp => {
+      this.messagesSource.next({
+        event: EVENTS.BackupDatabaseProgress,
+        payload: resp.body
+      });
+    });
+
+    this.hubConnection.on(EVENTS.CleanupProgress, resp => {
+      this.messagesSource.next({
+        event: EVENTS.CleanupProgress,
+        payload: resp.body
+      });
+    });
+
+    this.hubConnection.on(EVENTS.RefreshMetadataProgress, resp => {
+      this.messagesSource.next({
+        event: EVENTS.RefreshMetadataProgress,
+        payload: resp.body
+      });
+    });
+
     this.hubConnection.on(EVENTS.SeriesAddedToCollection, resp => {
       this.messagesSource.next({
         event: EVENTS.SeriesAddedToCollection,
@@ -110,11 +136,19 @@ export class MessageHubService {
         payload: resp.body
       });
       this.seriesAdded.emit(resp.body);
-      if (this.isAdmin) {
+      // Don't show the toast when user has reader open
+      if (this.isAdmin && this.router.url.match(/\d+\/manga|book\/\d+/gi) !== null) {
         this.toastr.info('Series ' + (resp.body as SeriesAddedEvent).seriesName + ' added');
       }
     });
 
+    this.hubConnection.on(EVENTS.SeriesRemoved, resp => {
+      this.messagesSource.next({
+        event: EVENTS.SeriesRemoved,
+        payload: resp.body
+      });
+    });
+
     this.hubConnection.on(EVENTS.RefreshMetadata, resp => {
       this.messagesSource.next({
         event: EVENTS.RefreshMetadata,

UI/Web/src/app/_services/series.service.ts

@@ -6,7 +6,6 @@ import { environment } from 'src/environments/environment';
 import { Chapter } from '../_models/chapter';
 import { CollectionTag } from '../_models/collection-tag';
 import { InProgressChapter } from '../_models/in-progress-chapter';
-import { MangaFormat } from '../_models/manga-format';
 import { PaginatedResult } from '../_models/pagination';
 import { Series } from '../_models/series';
 import { SeriesFilter } from '../_models/series-filter';
@@ -112,13 +111,13 @@ export class SeriesService {
     );
   }
 
-  getInProgress(libraryId: number = 0, pageNum?: number, itemsPerPage?: number, filter?: SeriesFilter) {
+  getOnDeck(libraryId: number = 0, pageNum?: number, itemsPerPage?: number, filter?: SeriesFilter) {
     const data = this.createSeriesFilter(filter);
 
     let params = new HttpParams();
     params = this._addPaginationIfExists(params, pageNum, itemsPerPage);
 
-    return this.httpClient.post<Series[]>(this.baseUrl + 'series/in-progress?libraryId=' + libraryId, data, {observe: 'response', params}).pipe(
+    return this.httpClient.post<Series[]>(this.baseUrl + 'series/on-deck?libraryId=' + libraryId, data, {observe: 'response', params}).pipe(
       map(response => {
         return this._cachePaginatedResults(response, new PaginatedResult<Series[]>());
     }));

UI/Web/src/app/_services/stats.service.ts

@@ -1,41 +0,0 @@
-import { HttpClient } from "@angular/common/http";
-import { Injectable } from "@angular/core";
-import * as Bowser from "bowser";
-import { take } from "rxjs/operators";
-import { environment } from "src/environments/environment";
-import { ClientInfo } from "../_models/stats/client-info";
-import { DetailsVersion } from "../_models/stats/details-version";
-import { NavService } from "./nav.service";
-import { version } from '../../../package.json';
-
-
-@Injectable({
-    providedIn: 'root'
-})
-export class StatsService {
-
-    baseUrl = environment.apiUrl;
-
-    constructor(private httpClient: HttpClient, private navService: NavService) { }
-
-    public sendClientInfo(data: ClientInfo) {
-        return this.httpClient.post(this.baseUrl + 'stats/client-info', data);
-    }
-
-    public async getInfo(): Promise<ClientInfo> {
-        const screenResolution = `${window.screen.width} x ${window.screen.height}`;
-
-        const browser = Bowser.getParser(window.navigator.userAgent);
-
-        const usingDarkTheme = await this.navService.darkMode$.pipe(take(1)).toPromise();
-
-        return {
-            os: browser.getOS() as DetailsVersion,
-            browser: browser.getBrowser() as DetailsVersion,
-            platformType: browser.getPlatformType(),
-            kavitaUiVersion: version,
-            screenResolution,
-            usingDarkTheme
-        };
-    }
-}

UI/Web/src/app/admin/_modals/library-access-modal/library-access-modal.component.html

@@ -6,17 +6,24 @@
     </button>
 </div>
 <div class="modal-body">
-    <div class="list-group">
+    <div class="list-group" *ngIf="!isLoading">
-        <li class="list-group-item" *ngFor="let library of selectedLibraries; let i = index">
+        <div class="form-check">
-            <div class="form-check">
+            <input id="selectall" type="checkbox" class="form-check-input" 
-                <input id="library-{{i}}" type="checkbox" attr.aria-label="Library {{library.data.name}}" class="form-check-input" 
+                [ngModel]="selectAll" (change)="toggleAll()" [indeterminate]="hasSomeSelected">
-                     [(ngModel)]="library.selected" name="library">
+            <label for="selectall" class="form-check-label">{{selectAll ? 'Deselect' : 'Select'}} All</label>
-                <label attr.for="library-{{i}}" class="form-check-label">{{library.data.name}}</label>
+        </div>
-            </div>
+        <ul>
-        </li>
+            <li class="list-group-item" *ngFor="let library of allLibraries; let i = index">
-        <li class="list-group-item" *ngIf="selectedLibraries.length === 0">
+                <div class="form-check">
-            There are no libraries setup yet.
+                    <input id="library-{{i}}" type="checkbox" class="form-check-input" attr.aria-label="Library {{library.name}}"
-        </li>
+                        [ngModel]="selections.isSelected(library)" (change)="handleSelection(library)">
+                    <label attr.for="library-{{i}}" class="form-check-label">{{library.name}}</label>
+                </div>
+            </li>
+            <li class="list-group-item" *ngIf="allLibraries.length === 0">
+                There are no libraries setup yet.
+            </li>
+        </ul>
     </div>
 </div>
 <div class="modal-footer">

UI/Web/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { SelectionModel } from 'src/app/typeahead/typeahead.component';
 import { Library } from 'src/app/_models/library';
 import { Member } from 'src/app/_models/member';
 import { LibraryService } from 'src/app/_services/library.service';
@@ -15,24 +16,21 @@ export class LibraryAccessModalComponent implements OnInit {
   @Input() member: Member | undefined;
   allLibraries: Library[] = [];
   selectedLibraries: Array<{selected: boolean, data: Library}> = [];
+  selections!: SelectionModel<Library>;
+  selectAll: boolean = false;
+  isLoading: boolean = false;
+
+  get hasSomeSelected() {
+    console.log(this.selections != null && this.selections.hasSomeSelected());
+    return this.selections != null && this.selections.hasSomeSelected();
+  }
 
   constructor(public modal: NgbActiveModal, private libraryService: LibraryService, private fb: FormBuilder) { }
 
   ngOnInit(): void {
     this.libraryService.getLibraries().subscribe(libs => {
       this.allLibraries = libs;
-      this.selectedLibraries = libs.map(item => {
+      this.setupSelections();
-        return {selected: false, data: item};
-      });
-
-      if (this.member !== undefined) {
-        this.member.libraries.forEach(lib => {
-          const foundLibrary = this.selectedLibraries.filter(item => item.data.name === lib.name);
-          if (foundLibrary.length > 0) {
-            foundLibrary[0].selected = true;
-          }
-        });
-      }
     });
   }
 
@@ -45,25 +43,41 @@ export class LibraryAccessModalComponent implements OnInit {
       return;
     }
 
-    const selectedLibraries = this.selectedLibraries.filter(item => item.selected).map(item => item.data);
+    const selectedLibraries = this.selections.selected();
     this.libraryService.updateLibrariesForMember(this.member?.username, selectedLibraries).subscribe(() => {
       this.modal.close(true);
     });
   }
 
-  reset() {
+  setupSelections() {
-    this.selectedLibraries = this.allLibraries.map(item => {
+    this.selections = new SelectionModel<Library>(false, this.allLibraries);
-      return {selected: false, data: item};
+    this.isLoading = false;
-    });
-
       
+    // If a member is passed in, then auto-select their libraries
     if (this.member !== undefined) {
       this.member.libraries.forEach(lib => {
-        const foundLibrary = this.selectedLibraries.filter(item => item.data.name === lib.name);
+        this.selections.toggle(lib, true, (a, b) => a.name === b.name);
-        if (foundLibrary.length > 0) {
-          foundLibrary[0].selected = true;
-        }
       });
+      this.selectAll = this.selections.selected().length === this.allLibraries.length;
+    }
+  }
+
+  reset() {
+    this.setupSelections();
+  }
+
+  toggleAll() {
+    this.selectAll = !this.selectAll;
+    this.allLibraries.forEach(s => this.selections.toggle(s, this.selectAll));
+  }
+
+  handleSelection(item: Library) {
+    this.selections.toggle(item);
+    const numberOfSelected = this.selections.selected().length;
+    if (numberOfSelected == 0) {
+      this.selectAll = false;
+    } else if (numberOfSelected == this.selectedLibraries.length) {
+      this.selectAll = true;
     }
   }
 

UI/Web/src/app/admin/_models/server-info.ts

@@ -1,8 +1,9 @@
 export interface ServerInfo {
     os: string;
-    dotNetVersion: string;
+    dotnetVersion: string;
     runTimeVersion: string;
     kavitaVersion: string;
-    buildBranch: string;
+    NumOfCores: number;
-    culture: string;
+    installId: string;
+    isDocker: boolean;
 }

UI/Web/src/app/admin/changelog/changelog.component.html

@@ -1,15 +1,19 @@
-<ng-container *ngFor="let update of updates; let indx = index;">
+<div class="changelog">
+  <ng-container *ngFor="let update of updates; let indx = index;">
     <div class="card w-100 mb-2" style="width: 18rem;">
         <div class="card-body">
-          <h5 class="card-title">{{update.updateTitle}}&nbsp;
+          <h4 class="card-title">{{update.updateTitle}}&nbsp;
               <span class="badge badge-secondary" *ngIf="update.updateVersion === update.currentVersion">Installed</span>
               <span class="badge badge-secondary" *ngIf="update.updateVersion > update.currentVersion">Available</span>
-          </h5>
+          </h4>
+          <h6 class="card-subtitle mb-2 text-muted">Published: {{update.publishDate | date: 'short'}}</h6>
+          
           <pre class="card-text update-body" [innerHtml]="update.updateBody | safeHtml"></pre>
           <a *ngIf="!update.isDocker" href="{{update.updateUrl}}" class="btn btn-{{indx === 0 ? 'primary' : 'secondary'}} float-right" target="_blank">Download</a>
         </div>
       </div>
-</ng-container>
+  </ng-container>
+</div>
 
 
 <div class="spinner-border text-secondary" *ngIf="isLoading" role="status">

UI/Web/src/app/admin/changelog/changelog.component.scss

@@ -3,3 +3,19 @@
     word-wrap: break-word;
     white-space: pre-wrap;
 }
+
+
+
+::ng-deep .changelog  {
+
+    h1 {
+        font-size: 26px;    
+    }
+
+    p, ul {
+        margin-bottom: 0px;
+    }
+    
+    
+}
+

UI/Web/src/app/admin/manage-library/manage-library.component.ts

@@ -4,7 +4,7 @@ import { ToastrService } from 'ngx-toastr';
 import { Subject } from 'rxjs';
 import { take, takeUntil } from 'rxjs/operators';
 import { ConfirmService } from 'src/app/shared/confirm.service';
-import { ScanLibraryProgressEvent } from 'src/app/_models/events/scan-library-progress-event';
+import { ProgressEvent } from 'src/app/_models/events/scan-library-progress-event';
 import { Library, LibraryType } from 'src/app/_models/library';
 import { LibraryService } from 'src/app/_services/library.service';
 import { EVENTS, MessageHubService } from 'src/app/_services/message-hub.service';
@@ -38,9 +38,9 @@ export class ManageLibraryComponent implements OnInit, OnDestroy {
 
     // when a progress event comes in, show it on the UI next to library
     this.hubService.messages$.pipe(takeUntil(this.onDestroy)).subscribe((event) => {
-      if (event.event != EVENTS.ScanLibraryProgress) return;
+      if (event.event !== EVENTS.ScanLibraryProgress) return;
       
-      const scanEvent = event.payload as ScanLibraryProgressEvent;
+      const scanEvent = event.payload as ProgressEvent;
       this.scanInProgress[scanEvent.libraryId] = {progress: scanEvent.progress !== 100};
       if (scanEvent.progress === 0) {
         this.scanInProgress[scanEvent.libraryId].timestamp = scanEvent.eventTime;
@@ -55,6 +55,7 @@ export class ManageLibraryComponent implements OnInit, OnDestroy {
           }
         });
       }
+
     });
   }
 

UI/Web/src/app/admin/manage-system/manage-system.component.html

@@ -33,8 +33,8 @@
             <dt>Version</dt>
             <dd>{{serverInfo.kavitaVersion}}</dd>
 
-            <dt>.NET Version</dt>
+            <dt>Install ID</dt>
-            <dd>{{serverInfo.dotNetVersion}}</dd>
+            <dd>{{serverInfo.installId}}</dd>
         </dl>
     </div>
 
@@ -43,7 +43,7 @@
     <div>
         <div class="row">
             <div class="col-4">Home page:</div> 
-            <div class="col"><a href="https://kavitareader.com" target="_blank">kavitareader.com</a></div>
+            <div class="col"><a href="https://www.kavitareader.com" target="_blank">kavitareader.com</a></div>
         </div>
         <div class="row">
             <div class="col-4">Wiki:</div> 
@@ -63,7 +63,6 @@
         </div>
         <div class="row">
             <div class="col-4">Feature Requests:</div> 
-            <div class="col"><a href="https://feathub.com/Kareadita/Kavita" target="_blank">Feathub</a><br/>
+            <div class="col"><a href="https://feats.kavitareader.com" target="_blank">https://feats.kavitareader.com</a><br/>
-                <a href="https://github.com/Kareadita/Kavita/issues" target="_blank">Github issues</a></div>
         </div>      
 </div>

UI/Web/src/app/app-routing.module.ts

@@ -7,7 +7,7 @@ import { RecentlyAddedComponent } from './recently-added/recently-added.componen
 import { UserLoginComponent } from './user-login/user-login.component';
 import { AuthGuard } from './_guards/auth.guard';
 import { LibraryAccessGuard } from './_guards/library-access.guard';
-import { InProgressComponent } from './in-progress/in-progress.component';
+import { OnDeckComponent } from './on-deck/on-deck.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 
 // TODO: Once we modularize the components, use this and measure performance impact: https://angular.io/guide/lazy-loading-ngmodules#preloading-modules
@@ -54,7 +54,7 @@ const routes: Routes = [
     children: [
       {path: 'library', component: DashboardComponent},
       {path: 'recently-added', component: RecentlyAddedComponent},
-      {path: 'in-progress', component: InProgressComponent},
+      {path: 'on-deck', component: OnDeckComponent},
     ]
   },
   {path: 'login', component: UserLoginComponent},

UI/Web/src/app/app.component.ts

@@ -5,7 +5,6 @@ import { AccountService } from './_services/account.service';
 import { LibraryService } from './_services/library.service';
 import { MessageHubService } from './_services/message-hub.service';
 import { NavService } from './_services/nav.service';
-import { StatsService } from './_services/stats.service';
 import { filter } from 'rxjs/operators';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
@@ -17,8 +16,8 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 export class AppComponent implements OnInit {
 
   constructor(private accountService: AccountService, public navService: NavService, 
-    private statsService: StatsService, private messageHub: MessageHubService, 
+    private messageHub: MessageHubService, private libraryService: LibraryService, 
-    private libraryService: LibraryService, private router: Router, private ngbModal: NgbModal) {
+    private router: Router, private ngbModal: NgbModal) {
     
     // Close any open modals when a route change occurs
     router.events
@@ -32,10 +31,6 @@ export class AppComponent implements OnInit {
 
   ngOnInit(): void {
     this.setCurrentUser();
-
-    this.statsService.getInfo().then(data => {
-      this.statsService.sendClientInfo(data).subscribe(() => {/* No Operation */});
-    });
   }
 
 

UI/Web/src/app/app.module.ts

@@ -1,13 +1,13 @@
 import { BrowserModule, Title } from '@angular/platform-browser';
-import { APP_INITIALIZER, ErrorHandler, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { APP_BASE_HREF } from '@angular/common';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { NgbCollapseModule, NgbDropdownModule, NgbNavModule, NgbPaginationModule, NgbRatingModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbCollapseModule, NgbDropdownModule, NgbNavModule, NgbPaginationModule, NgbPopoverModule, NgbRatingModule } from '@ng-bootstrap/ng-bootstrap';
 import { NavHeaderComponent } from './nav-header/nav-header.component';
 import { JwtInterceptor } from './_interceptors/jwt.interceptor';
 import { UserLoginComponent } from './user-login/user-login.component';
@@ -25,13 +25,14 @@ import { CarouselModule } from './carousel/carousel.module';
 import { PersonBadgeComponent } from './person-badge/person-badge.component';
 import { TypeaheadModule } from './typeahead/typeahead.module';
 import { RecentlyAddedComponent } from './recently-added/recently-added.component';
-import { InProgressComponent } from './in-progress/in-progress.component';
+import { OnDeckComponent } from './on-deck/on-deck.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { CardsModule } from './cards/cards.module';
 import { CollectionsModule } from './collections/collections.module';
 import { ReadingListModule } from './reading-list/reading-list.module';
 import { SAVER, getSaver } from './shared/_providers/saver.provider';
 import { ConfigData } from './_models/config-data';
+import { NavEventsToggleComponent } from './nav-events-toggle/nav-events-toggle.component';
 
 
 @NgModule({
@@ -46,8 +47,9 @@ import { ConfigData } from './_models/config-data';
     ReviewSeriesModalComponent,
     PersonBadgeComponent,
     RecentlyAddedComponent,
-    InProgressComponent,
+    OnDeckComponent,
     DashboardComponent,
+    NavEventsToggleComponent,
   ],
   imports: [
     HttpClientModule,
@@ -59,6 +61,7 @@ import { ConfigData } from './_models/config-data';
 
     NgbDropdownModule, // Nav
     AutocompleteLibModule, // Nav
+    NgbPopoverModule, // Nav Events toggle
     NgbRatingModule, // Series Detail
     NgbNavModule,
     NgbPaginationModule,

UI/Web/src/app/book-reader/book-reader/book-reader.component.html

@@ -2,7 +2,7 @@
     <div class="fixed-top" #stickyTop>
         <a class="sr-only sr-only-focusable focus-visible" href="javascript:void(0);" (click)="moveFocus()">Skip to main content</a>
         <ng-container [ngTemplateOutlet]="actionBar"></ng-container>
-        <app-drawer #commentDrawer="drawer" [isOpen]="drawerOpen" [style.--drawer-width]="'300px'" [options]="{topOffset: topOffset}" [style.--drawer-background-color]="backgroundColor" (drawerClosed)="closeDrawer()">
+        <app-drawer #commentDrawer="drawer" [isOpen]="drawerOpen" [style.--drawer-width]="'300px'" [options]="{topOffset: topOffset}" [style.--drawer-background-color]="drawerBackgroundColor" (drawerClosed)="closeDrawer()">
             <div header>
                 <h2 style="margin-top: 0.5rem">Book Settings
                     <button type="button" class="close" aria-label="Close" (click)="commentDrawer.close()">
@@ -100,7 +100,7 @@
     </div>
 
     <div #readingSection class="reading-section" [ngStyle]="{'padding-top': topOffset + 20 + 'px'}" [@isLoading]="isLoading ? true : false" (click)="handleReaderClick($event)">
-        <div #readingHtml class="book-content" [ngStyle]="{'padding-bottom': topOffset + 20 + 'px'}" [innerHtml]="page" *ngIf="page !== undefined"></div>
+        <div #readingHtml class="book-content" [ngStyle]="{'padding-bottom': topOffset + 20 + 'px', 'margin': '0px 0px'}" [innerHtml]="page" *ngIf="page !== undefined"></div>
 
         <div class="left {{clickOverlayClass('left')}} no-observe" (click)="prevPage()" *ngIf="clickToPaginate">
         </div>

UI/Web/src/app/book-reader/book-reader/book-reader.component.ts

@@ -229,6 +229,10 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
+  get drawerBackgroundColor() {
+    return this.darkMode ? '#010409': '#fff';
+  }
+
   constructor(private route: ActivatedRoute, private router: Router, private accountService: AccountService,
     private seriesService: SeriesService, private readerService: ReaderService, private location: Location,
     private renderer: Renderer2, private navService: NavService, private toastr: ToastrService, 
@@ -887,7 +891,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   getDarkModeBackgroundColor() {
-    return this.darkMode ? '#010409' : '#fff';
+    return this.darkMode ? '#292929' : '#fff';
   }
 
   setOverrideStyles() {

UI/Web/src/app/cards/_modals/card-details-modal/card-details-modal.component.html

@@ -17,11 +17,12 @@
                 <div class="col">
                     Id: {{data.id}}
                 </div>
-                <div class="col">
+                <div class="col" *ngIf="series !== undefined">
+                    Format: <span class="badge badge-secondary">{{utilityService.mangaFormat(series.format) | sentenceCase}}</span>
                 </div>
             </div>
             <div class="row no-gutters">
-                <div class="col" *ngIf="utilityService.isVolume(data)">
+                <div class="col" *ngIf="data.hasOwnProperty('created')">
                     Added: {{(data.created | date: 'short') || '-'}}
                 </div>
                 <div class="col">
@@ -58,8 +59,8 @@
                                 <div class="col">
                                     Pages: {{file.pages}}
                                 </div>
-                                <div class="col">
+                                <div class="col" *ngIf="data.hasOwnProperty('created')">
-                                    Format: <span class="badge badge-secondary">{{utilityService.mangaFormatToText(file.format)}}</span>
+                                    Added: {{(data.created | date: 'short') || '-'}}
                                 </div>
                             </div>
                         </li>

UI/Web/src/app/cards/_modals/card-details-modal/card-details-modal.component.ts

@@ -15,6 +15,8 @@ import { UploadService } from 'src/app/_services/upload.service';
 import { ChangeCoverImageModalComponent } from '../change-cover-image/change-cover-image-modal.component';
 import { LibraryType } from '../../../_models/library';
 import { LibraryService } from '../../../_services/library.service';
+import { SeriesService } from 'src/app/_services/series.service';
+import { Series } from 'src/app/_models/series';
 
 
 
@@ -42,6 +44,7 @@ export class CardDetailsModalComponent implements OnInit {
   actions: ActionItem<any>[] = [];
   chapterActions: ActionItem<Chapter>[] = [];
   libraryType: LibraryType = LibraryType.Manga; 
+  series: Series | undefined = undefined;
 
   get LibraryType(): typeof LibraryType {
     return LibraryType;
@@ -50,7 +53,8 @@ export class CardDetailsModalComponent implements OnInit {
   constructor(private modalService: NgbModal, public modal: NgbActiveModal, public utilityService: UtilityService, 
     public imageService: ImageService, private uploadService: UploadService, private toastr: ToastrService, 
     private accountService: AccountService, private actionFactoryService: ActionFactoryService, 
-    private actionService: ActionService, private router: Router, private libraryService: LibraryService) { }
+    private actionService: ActionService, private router: Router, private libraryService: LibraryService,
+    private seriesService: SeriesService) { }
 
   ngOnInit(): void {
     this.isChapter = this.utilityService.isChapter(this.data);
@@ -79,6 +83,10 @@ export class CardDetailsModalComponent implements OnInit {
     this.chapters.forEach((c: Chapter) => {
       c.files.sort((a: MangaFile, b: MangaFile) => collator.compare(a.filePath, b.filePath));
     });
+
+    this.seriesService.getSeries(this.seriesId).subscribe(series => {
+      this.series = series;
+    })
   }
 
   close() {

UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.html

@@ -26,7 +26,7 @@
                     <h6>Applies to Series</h6>
                     <div class="form-check">
                         <input id="selectall" type="checkbox" class="form-check-input" 
-                            [ngModel]="selectAll" (change)="toggleAll()" [indeterminate]="someSelected">
+                            [ngModel]="selectAll" (change)="toggleAll()" [indeterminate]="hasSomeSelected">
                         <label for="selectall" class="form-check-label">{{selectAll ? 'Deselect' : 'Select'}} All</label>
                     </div>
                     <ul>

UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.ts

@@ -35,6 +35,11 @@ export class EditCollectionTagsComponent implements OnInit {
   imageUrls: Array<string> = [];
   selectedCover: string = '';
 
+  get hasSomeSelected() {
+    return this.selections != null && this.selections.hasSomeSelected();
+  }
+
+
   constructor(public modal: NgbActiveModal, private seriesService: SeriesService, 
     private collectionService: CollectionTagService, private toastr: ToastrService,
     private confirmSerivce: ConfirmService, private libraryService: LibraryService,
@@ -133,11 +138,6 @@ export class EditCollectionTagsComponent implements OnInit {
     });
   }
 
-  get someSelected() {
-    const selected = this.selections.selected();
-    return (selected.length !== this.series.length && selected.length !== 0);
-  }
-
   updateSelectedIndex(index: number) {
     this.collectionTagForm.patchValue({
       coverImageIndex: index

UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.html

@@ -110,7 +110,7 @@
                                   <div>
                                       <div class="row no-gutters">
                                           <div class="col">
-                                              Created: {{volume.created | date: 'short'}}
+                                              Added: {{volume.created | date: 'short'}}
                                           </div>
                                           <div class="col">
                                               Last Modified: {{volume.lastModified | date: 'short'}}

UI/Web/src/app/cards/bulk-operations/bulk-operations.component.scss

@@ -1,9 +1,8 @@
-@import "../../../theme/colors";
+@use "../../../theme/colors";
-@import "../../../assets/themes/dark.scss";
 
 .bulk-select {
-    background-color: $dark-form-background-no-opacity;
+    background-color: colors.$dark-form-background-no-opacity;
-    border-bottom: 2px solid $primary-color;
+    border-bottom: 2px solid colors.$primary-color;
     color: white;
 }
 
@@ -12,5 +11,5 @@
 }
 
 .highlight {
-    color: $primary-color !important;
+    color: colors.$primary-color !important;
 }

UI/Web/src/app/cards/cover-image-chooser/cover-image-chooser.component.scss

@@ -1,4 +1,4 @@
-@import '../../../theme/colors';
+@use '../../../theme/colors';
 $image-height: 230px;
 $image-width: 160px;
 
@@ -14,7 +14,7 @@ $image-width: 160px;
 }
 
 .selected {
-    outline: 5px solid $primary-color;
+    outline: 5px solid colors.$primary-color;
     outline-width: medium;
     outline-offset: -1px;
 }
@@ -22,7 +22,7 @@ $image-width: 160px;
 ngx-file-drop ::ng-deep > div {
     // styling for the outer drop box
     width: 100%;
-    border: 2px solid $primary-color;
+    border: 2px solid colors.$primary-color;
     border-radius: 5px;
     height: 100px;
     margin: auto;

UI/Web/src/app/collections/collection-detail/collection-detail.component.ts

@@ -11,6 +11,7 @@ import { EditCollectionTagsComponent } from 'src/app/cards/_modals/edit-collecti
 import { KEY_CODES } from 'src/app/shared/_services/utility.service';
 import { CollectionTag } from 'src/app/_models/collection-tag';
 import { SeriesAddedToCollectionEvent } from 'src/app/_models/events/series-added-to-collection-event';
+import { SeriesRemovedEvent } from 'src/app/_models/events/series-removed-event';
 import { Pagination } from 'src/app/_models/pagination';
 import { Series } from 'src/app/_models/series';
 import { FilterItem, mangaFormatFilters, SeriesFilter } from 'src/app/_models/series-filter';
@@ -106,8 +107,12 @@ export class CollectionDetailComponent implements OnInit, OnDestroy {
     this.collectionTagActions = this.actionFactoryService.getCollectionTagActions(this.handleCollectionActionCallback.bind(this));
 
     this.messageHub.messages$.pipe(takeWhile(event => event.event === EVENTS.SeriesAddedToCollection), takeUntil(this.onDestory), debounceTime(2000)).subscribe(event => {
-      const collectionEvent = event.payload as SeriesAddedToCollectionEvent;
+      if (event.event == EVENTS.SeriesAddedToCollection) {
-      if (collectionEvent.tagId === this.collectionTag.id) {
+        const collectionEvent = event.payload as SeriesAddedToCollectionEvent;
+        if (collectionEvent.tagId === this.collectionTag.id) {
+          this.loadPage();
+        }
+      } else if (event.event === EVENTS.SeriesRemoved) {
         this.loadPage();
       }
     });

UI/Web/src/app/library/library.component.html

@@ -5,7 +5,7 @@
     <p>You haven't been granted access to any libraries.</p>
 </div>
 
-<app-carousel-reel [items]="inProgress" title="In Progress" (sectionClick)="handleSectionClick($event)">
+<app-carousel-reel [items]="inProgress" title="On Deck" (sectionClick)="handleSectionClick($event)">
     <ng-template #carouselItem let-item let-position="idx">
         <app-series-card [data]="item" [libraryId]="item.libraryId" (reload)="reloadInProgress($event)" (dataChanged)="reloadInProgress($event)"></app-series-card>
     </ng-template>

UI/Web/src/app/library/library.component.ts

@@ -1,19 +1,15 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { Router } from '@angular/router';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Subject } from 'rxjs';
 import { take, takeUntil } from 'rxjs/operators';
-import { EditCollectionTagsComponent } from '../cards/_modals/edit-collection-tags/edit-collection-tags.component';
-import { CollectionTag } from '../_models/collection-tag';
 import { SeriesAddedEvent } from '../_models/events/series-added-event';
+import { SeriesRemovedEvent } from '../_models/events/series-removed-event';
 import { InProgressChapter } from '../_models/in-progress-chapter';
 import { Library } from '../_models/library';
 import { Series } from '../_models/series';
 import { User } from '../_models/user';
 import { AccountService } from '../_services/account.service';
-import { Action, ActionFactoryService, ActionItem } from '../_services/action-factory.service';
-import { CollectionTagService } from '../_services/collection-tag.service';
 import { ImageService } from '../_services/image.service';
 import { LibraryService } from '../_services/library.service';
 import { EVENTS, MessageHubService } from '../_services/message-hub.service';
@@ -44,14 +40,18 @@ export class LibraryComponent implements OnInit, OnDestroy {
     private titleService: Title, public imageService: ImageService, 
     private messageHub: MessageHubService) {
       this.messageHub.messages$.pipe(takeUntil(this.onDestroy)).subscribe(res => {
-        if (res.event == EVENTS.SeriesAdded) {
+        if (res.event === EVENTS.SeriesAdded) {
           const seriesAddedEvent = res.payload as SeriesAddedEvent;
           this.seriesService.getSeries(seriesAddedEvent.seriesId).subscribe(series => {
             this.recentlyAdded.unshift(series);
           });
+        } else if (res.event === EVENTS.SeriesRemoved) {
+          const seriesRemovedEvent = res.payload as SeriesRemovedEvent;
+          this.recentlyAdded = this.recentlyAdded.filter(item => item.id != seriesRemovedEvent.seriesId);
+          this.inProgress = this.inProgress.filter(item => item.id != seriesRemovedEvent.seriesId);
         }
       });
-    }
+  }
 
   ngOnInit(): void {
     this.titleService.setTitle('Kavita - Dashboard');
@@ -75,7 +75,7 @@ export class LibraryComponent implements OnInit, OnDestroy {
 
   reloadSeries() {
     this.loadRecentlyAdded();
-    this.loadInProgress();
+    this.loadOnDeck();
   }
 
   reloadInProgress(series: Series | boolean) {
@@ -88,11 +88,11 @@ export class LibraryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    this.loadInProgress();
+    this.loadOnDeck();
   }
 
-  loadInProgress() {
+  loadOnDeck() {
-    this.seriesService.getInProgress().pipe(takeUntil(this.onDestroy)).subscribe((updatedSeries) => {
+    this.seriesService.getOnDeck().pipe(takeUntil(this.onDestroy)).subscribe((updatedSeries) => {
       this.inProgress = updatedSeries.result;
     });
   }
@@ -108,8 +108,15 @@ export class LibraryComponent implements OnInit, OnDestroy {
       this.router.navigate(['collections']);
     } else if (sectionTitle.toLowerCase() === 'recently added') {
       this.router.navigate(['recently-added']);
-    } else if (sectionTitle.toLowerCase() === 'in progress') {
+    } else if (sectionTitle.toLowerCase() === 'on deck') {
-      this.router.navigate(['in-progress']);
+      this.router.navigate(['on-deck']);
+    } 
+  }
+
+  removeFromArray(arr: Array<any>, element: any) {
+    const index = arr.indexOf(element);
+    if (index >= 0) {
+      arr.splice(index);
     }
   }
 }

UI/Web/src/app/manga-reader/infinite-scroller/infinite-scroller.component.html

@@ -26,9 +26,9 @@
     </div>
 </div>
 <ng-container *ngFor="let item of webtoonImages | async; let index = index;">
-    <img src="{{item.src}}" style="display: block" class="mx-auto {{pageNum === item.page && showDebugOutline() ? 'active': ''}}" *ngIf="pageNum >= pageNum - bufferPages && pageNum <= pageNum + bufferPages" rel="nofollow" alt="image" (load)="onImageLoad($event)" id="page-{{item.page}}" [attr.page]="item.page" ondragstart="return false;" onselectstart="return false;">
+    <img src="{{item.src}}" style="display: block" class="mx-auto {{pageNum === item.page && showDebugOutline() ? 'active': ''}} {{areImagesWiderThanWindow ? 'full-width' : ''}}" *ngIf="pageNum >= pageNum - bufferPages && pageNum <= pageNum + bufferPages" rel="nofollow" alt="image" (load)="onImageLoad($event)" id="page-{{item.page}}" [attr.page]="item.page" ondragstart="return false;" onselectstart="return false;">
 </ng-container>
-<div *ngIf="atBottom" class="spacer bottom" role="alert" (click)="loadPrevChapter.emit()">
+<div *ngIf="atBottom" class="spacer bottom" role="alert" (click)="loadNextChapter.emit()">
     <div>
         <button class="btn btn-icon mx-auto">
             <i class="fa fa-angle-double-down animate" aria-hidden="true"></i>

UI/Web/src/app/manga-reader/infinite-scroller/infinite-scroller.component.scss

@@ -21,6 +21,11 @@
     }
 }
 
+.full-width {
+    width: 100% !important;
+}
+
+
 @keyframes move-up-down {
     0%, 100% {
       transform: translateY(0);
@@ -29,3 +34,16 @@
       transform: translateY(-10px);
     }
 }
+
+.bookmark-effect {
+    animation: bookmark 1s cubic-bezier(0.165, 0.84, 0.44, 1);
+}
+
+@keyframes bookmark {
+    0%, 100% {
+        filter: opacity(1);
+    }
+    50% {
+        filter: opacity(0.25);
+    }
+}

UI/Web/src/app/manga-reader/infinite-scroller/infinite-scroller.component.ts

@@ -1,5 +1,4 @@
 import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, Renderer2, SimpleChanges } from '@angular/core';
-import { ToastrService } from 'ngx-toastr';
 import { BehaviorSubject, fromEvent, ReplaySubject, Subject } from 'rxjs';
 import { debounceTime, takeUntil } from 'rxjs/operators';
 import { ReaderService } from '../../_services/reader.service';
@@ -63,6 +62,7 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
   @Output() loadPrevChapter: EventEmitter<void> = new EventEmitter<void>();
 
   @Input() goToPage: ReplaySubject<number> = new ReplaySubject<number>();
+  @Input() bookmarkPage: ReplaySubject<number> = new ReplaySubject<number>();
   
   /**
    * Stores and emits all the src urls
@@ -127,12 +127,16 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
     return Math.max(...Object.values(this.imagesLoaded));
   }
 
+  get areImagesWiderThanWindow() {
+    return this.webtoonImageWidth > (window.innerWidth || document.documentElement.clientWidth);
+  }
+
 
 
 
   private readonly onDestroy = new Subject<void>();
 
-  constructor(private readerService: ReaderService, private renderer: Renderer2, private toastr: ToastrService) {}
+  constructor(private readerService: ReaderService, private renderer: Renderer2) {}
 
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.hasOwnProperty('totalPages') && changes['totalPages'].previousValue != changes['totalPages'].currentValue) {
@@ -167,11 +171,23 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
         this.setPageNum(page, true);
       });
     }
+
+    if (this.bookmarkPage) {
+      this.bookmarkPage.pipe(takeUntil(this.onDestroy)).subscribe(page => {
+        const image = document.querySelector('img[id^="page-' + page + '"]');
+        if (image) {
+          this.renderer.addClass(image, 'bookmark-effect');
+          setTimeout(() => {
+            this.renderer.removeClass(image, 'bookmark-effect');
+          }, 1000);
+        }
+      });
+    }
   }
 
   /**
    * On scroll in document, calculate if the user/javascript has scrolled to the current image element (and it's visible), update that scrolling has ended completely, 
-   * and calculate the direction the scrolling is occuring. This is used for prefetching.
+   * and calculate the direction the scrolling is occuring. This is not used for prefetching.
    * @param event Scroll Event
    */
   handleScrollEvent(event?: any) {
@@ -179,11 +195,6 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
       || document.documentElement.scrollTop 
       || document.body.scrollTop || 0);
 
-    if (this.isScrolling && this.currentPageElem != null && this.isElementVisible(this.currentPageElem)) {
-      this.debugLog('[Scroll] Image is visible from scroll, isScrolling is now false');
-      this.isScrolling = false;
-    }
-
     if (verticalOffset > this.prevScrollPosition) {
       this.scrollingDirection = PAGING_DIRECTION.FORWARD;
     } else {
@@ -191,6 +202,23 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
     }
     this.prevScrollPosition = verticalOffset;
 
+    if (this.isScrolling && this.currentPageElem != null && this.isElementVisible(this.currentPageElem)) {
+      this.debugLog('[Scroll] Image is visible from scroll, isScrolling is now false');
+      this.isScrolling = false;
+    }
+
+    if (!this.isScrolling) {
+      // Use offset of the image against the scroll container to test if the most of the image is visible on the screen. We can use this
+      // to mark the current page and separate the prefetching code. 
+      const midlineImages = Array.from(document.querySelectorAll('img[id^="page-"]'))
+      .filter(entry => this.shouldElementCountAsCurrentPage(entry));
+
+      if (midlineImages.length > 0) {
+        this.setPageNum(parseInt(midlineImages[0].getAttribute('page') || this.pageNum + '', 10));
+      }
+    }
+    
+
     // Check if we hit the last page
     this.checkIfShouldTriggerContinuousReader();
 
@@ -219,12 +247,13 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
       if (this.atTop && this.pageNum > 0) {
         this.atTop = false;
       }
-      // debug mode will add an extra pixel from the image border + (this.debug ? 1 : 0) 
+      
       if (totalScroll === totalHeight && !this.atBottom) {
         this.atBottom = true;
         this.setPageNum(this.totalPages);
+
         // Scroll user back to original location
-        this.previousScrollHeightMinusTop = document.documentElement.scrollTop;
+        this.previousScrollHeightMinusTop = this.getScrollTop();
         requestAnimationFrame(() => document.documentElement.scrollTop = this.previousScrollHeightMinusTop + (SPACER_SCROLL_INTO_PX / 2));
       } else if (totalScroll >= totalHeight + SPACER_SCROLL_INTO_PX && this.atBottom) { 
         // This if statement will fire once we scroll into the spacer at all
@@ -266,6 +295,28 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
           );
   }
 
+  /**
+   * Is any part of the element visible in the scrollport and is it above the midline trigger.
+   * The midline trigger does not mean it is half of the screen. It may be top 25%. 
+   * @param elem HTML Element
+   * @returns If above midline
+   */
+   shouldElementCountAsCurrentPage(elem: Element) {
+    if (elem === null || elem === undefined) { return false; }
+
+    var rect = elem.getBoundingClientRect();
+
+    if (rect.bottom >= 0 && 
+            rect.right >= 0 && 
+            rect.top <= (window.innerHeight || document.documentElement.clientHeight) &&
+            rect.left <= (window.innerWidth || document.documentElement.clientWidth)
+          ) {
+            const topX = (window.innerHeight || document.documentElement.clientHeight);
+            return Math.abs(rect.top / topX) <= 0.25;
+          }
+    return false;
+  }
+
 
   initWebtoonReader() {
     this.imagesLoaded = {};
@@ -327,7 +378,7 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
       this.debugLog('[Intersection] Page ' + imagePage + ' is visible: ', entry.isIntersecting);
       if (entry.isIntersecting) {
         this.debugLog('[Intersection] ! Page ' + imagePage + ' just entered screen');
-        this.setPageNum(imagePage);
+        this.prefetchWebtoonImages(imagePage);
       }
     });
   }
@@ -350,10 +401,9 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
 
     if (scrollToPage) {
       const currentImage = document.querySelector('img#page-' + this.pageNum);
-      if (currentImage !== null && !this.isElementVisible(currentImage)) {
+      if (currentImage === null) return;
-        this.debugLog('[GoToPage] Scrolling to page', this.pageNum);
+      this.debugLog('[GoToPage] Scrolling to page', this.pageNum);
-        this.scrollToCurrentPage();
+      this.scrollToCurrentPage();
-      }
     }
   }
 
@@ -365,6 +415,7 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
    * Performs the scroll for the current page element. Updates any state variables needed.
    */
   scrollToCurrentPage() {
+    this.debugLog('Scrolling to ', this.pageNum);
     this.currentPageElem = document.querySelector('img#page-' + this.pageNum);
     if (!this.currentPageElem) { return; }
     
@@ -414,19 +465,29 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
     }
   }
 
-  calculatePrefetchIndecies() {
+  /**
+   * Finds the ranges of indecies to load from backend. totalPages - 1 is due to backend will automatically return last page for any page number
+   * above totalPages. Webtoon reader might ask for that which results in duplicate last pages. 
+   * @param pageNum 
+   * @returns 
+   */
+  calculatePrefetchIndecies(pageNum: number = -1) {
+    if (pageNum == -1) {
+      pageNum = this.pageNum;
+    }
+
     let startingIndex = 0;
     let endingIndex = 0;
     if (this.isScrollingForwards()) {
-      startingIndex = Math.min(Math.max(this.pageNum - this.bufferPages, 0), this.totalPages);
+      startingIndex = Math.min(Math.max(pageNum - this.bufferPages, 0), this.totalPages - 1);
-      endingIndex = Math.min(Math.max(this.pageNum + this.bufferPages, 0), this.totalPages);
+      endingIndex = Math.min(Math.max(pageNum + this.bufferPages, 0), this.totalPages - 1);
 
       if (startingIndex === this.totalPages) {
         return [0, 0];
       }
     } else {
-      startingIndex = Math.min(Math.max(this.pageNum - this.bufferPages, 0), this.totalPages);
+      startingIndex = Math.min(Math.max(pageNum - this.bufferPages, 0), this.totalPages - 1);
-      endingIndex = Math.min(Math.max(this.pageNum + this.bufferPages, 0), this.totalPages);
+      endingIndex = Math.min(Math.max(pageNum + this.bufferPages, 0), this.totalPages - 1);
     }
 
 
@@ -443,8 +504,13 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy {
     return [...Array(size).keys()].map(i => i + startAt);
   }
 
-  prefetchWebtoonImages() {
+  prefetchWebtoonImages(pageNum: number = -1) {
-    const [startingIndex, endingIndex] = this.calculatePrefetchIndecies();
+
+    if (pageNum === -1) {
+      pageNum = this.pageNum;
+    }
+
+    const [startingIndex, endingIndex] = this.calculatePrefetchIndecies(pageNum);
     if (startingIndex === 0 && endingIndex === 0) { return; }
 
     this.debugLog('\t[PREFETCH] prefetching pages: ' + startingIndex + ' to ' + endingIndex);

UI/Web/src/app/manga-reader/manga-reader.component.html

@@ -24,11 +24,19 @@
     </ng-container>
 
     <div (click)="toggleMenu()" class="reading-area">
-        <canvas #content class="{{getFittingOptionClass()}} {{this.colorMode}} {{readerMode === READER_MODE.MANGA_LR || readerMode === READER_MODE.MANGA_UD ? '' : 'd-none'}}" 
+        <canvas #content class="{{getFittingOptionClass()}} {{this.colorMode}} {{readerMode === READER_MODE.MANGA_LR || readerMode === READER_MODE.MANGA_UD ? '' : 'd-none'}} " 
                 ondragstart="return false;" onselectstart="return false;">
         </canvas>
         <div class="webtoon-images" *ngIf="readerMode === READER_MODE.WEBTOON && !isLoading">
-            <app-infinite-scroller [pageNum]="pageNum" [bufferPages]="5" [goToPage]="goToPageEvent" (pageNumberChange)="handleWebtoonPageChange($event)" [totalPages]="maxPages - 1" [urlProvider]="getPageUrl" (loadNextChapter)="loadNextChapter()" (loadPrevChapter)="loadPrevChapter()"></app-infinite-scroller>
+            <app-infinite-scroller [pageNum]="pageNum" 
+            [bufferPages]="5" 
+            [goToPage]="goToPageEvent" 
+            (pageNumberChange)="handleWebtoonPageChange($event)" 
+            [totalPages]="maxPages" 
+            [urlProvider]="getPageUrl" 
+            (loadNextChapter)="loadNextChapter()" 
+            (loadPrevChapter)="loadPrevChapter()"
+            [bookmarkPage]="showBookmarkEffectEvent"></app-infinite-scroller>
         </div>
         <ng-container *ngIf="readerMode === READER_MODE.MANGA_LR || readerMode === READER_MODE.MANGA_UD">
             <div class="{{readerMode === READER_MODE.MANGA_LR ? 'right' : 'bottom'}} {{clickOverlayClass('right')}}" (click)="handlePageChange($event, 'right')"></div>
@@ -43,7 +51,7 @@
                 <button class="btn btn-small btn-icon col-1" [disabled]="prevChapterDisabled" (click)="loadPrevChapter();resetMenuCloseTimer();" title="Prev Chapter/Volume"><i class="fa fa-fast-backward" aria-hidden="true"></i></button>
                 <button class="btn btn-small btn-icon col-1" [disabled]="prevPageDisabled || pageNum === 0" (click)="goToPage(0);resetMenuCloseTimer();" title="First Page"><i class="fa fa-step-backward" aria-hidden="true"></i></button>
                 <div class="col custom-slider" *ngIf="pageOptions.ceil > 0; else noSlider">
-                    <ngx-slider [options]="pageOptions" [value]="pageNum" aria-describedby="slider-info" [manualRefresh]="refreshSlider" (userChangeEnd)="sliderPageUpdate($event);startMenuCloseTimer()" (userChangeStart)="cancelMenuCloseTimer();"></ngx-slider>
+                    <ngx-slider [options]="pageOptions" [value]="pageNum" aria-describedby="slider-info" [manualRefresh]="refreshSlider" (userChangeEnd)="sliderPageUpdate($event);startMenuCloseTimer()" (userChange)="sliderDragUpdate($event)" (userChangeStart)="cancelMenuCloseTimer();"></ngx-slider>
                 </div>
                 <ng-template #noSlider>
                     <div class="col custom-slider">
@@ -94,9 +102,7 @@
                     <div class="col-6">
                         <div class="form-group">
                             <select class="form-control" id="page-splitting" formControlName="pageSplitOption">
-                                <option [value]="1">Right to Left</option>
+                                <option *ngFor="let opt of pageSplitOptions" [value]="opt.value">{{opt.text}}</option>
-                                <option [value]="0">Left to Right</option>
-                                <option [value]="2">None</option>
                             </select>
                         </div>
                     </div>

UI/Web/src/app/manga-reader/manga-reader.component.scss

@@ -1,4 +1,4 @@
-@import '../../theme/colors';
+@use '../../theme/colors';
 
 $center-width: 50%;
 $side-width: 25%;
@@ -178,7 +178,7 @@ canvas {
       height: 2px;
     }
     .custom-slider .ngx-slider .ngx-slider-selection {
-      background: $primary-color;
+      background: colors.$primary-color;
     }
   
     .custom-slider .ngx-slider .ngx-slider-pointer {
@@ -186,7 +186,7 @@ canvas {
       height: 16px;
       top: auto; /* to remove the default positioning */
       bottom: 0;
-      background-color: $primary-color; // #333;
+      background-color: colors.$primary-color; // #333;
       border-top-left-radius: 3px;
       border-top-right-radius: 3px;
     }
@@ -217,12 +217,13 @@ canvas {
     }
   
     .custom-slider .ngx-slider .ngx-slider-tick.ngx-slider-selected {
-      background: $primary-color;
+      background: colors.$primary-color;
     }
   }
 
   .webtoon-images {
       text-align: center;
+      width: 100%;
   }
 
   .highlight {
@@ -234,7 +235,16 @@ canvas {
     animation: fadein .5s both;
   }
 
-  // DEBUG
+  
-  .active-image {
+.bookmark-effect {
-      border: 5px solid red;
+    animation: bookmark 0.7s cubic-bezier(0.165, 0.84, 0.44, 1);
-  }
+}
+
+@keyframes bookmark {
+    0%, 100% {
+        border: 0px;
+    }
+    50% {
+        border: 5px solid colors.$primary-color;
+    }
+}

UI/Web/src/app/manga-reader/manga-reader.component.ts

@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, ElementRef, EventEmitter, HostListener, OnDestroy, OnInit, SimpleChanges, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, EventEmitter, HostListener, OnDestroy, OnInit, Renderer2, SimpleChanges, ViewChild } from '@angular/core';
 import { Location } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
 import { take, takeUntil } from 'rxjs/operators';
@@ -12,7 +12,7 @@ import { ScalingOption } from '../_models/preferences/scaling-option';
 import { PageSplitOption } from '../_models/preferences/page-split-option';
 import { forkJoin, ReplaySubject, Subject } from 'rxjs';
 import { ToastrService } from 'ngx-toastr';
-import { KEY_CODES, UtilityService } from '../shared/_services/utility.service';
+import { KEY_CODES, UtilityService, Breakpoint } from '../shared/_services/utility.service';
 import { CircularArray } from '../shared/data-structures/circular-array';
 import { MemberService } from '../_services/member.service';
 import { Stack } from '../shared/data-structures/stack';
@@ -20,7 +20,7 @@ import { ChangeContext, LabelType, Options } from '@angular-slider/ngx-slider';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import { ChapterInfo } from './_models/chapter-info';
 import { COLOR_FILTER, FITTING_OPTION, PAGING_DIRECTION, SPLIT_PAGE_PART } from './_models/reader-enums';
-import { Preferences, scalingOptions } from '../_models/preferences/preferences';
+import { pageSplitOptions, scalingOptions } from '../_models/preferences/preferences';
 import { READER_MODE } from '../_models/preferences/reader-mode';
 import { MangaFormat } from '../_models/manga-format';
 import { LibraryService } from '../_services/library.service';
@@ -96,13 +96,15 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   scalingOptions = scalingOptions;
   readingDirection = ReadingDirection.LeftToRight;
   scalingOption = ScalingOption.FitToHeight;
-  pageSplitOption = PageSplitOption.SplitRightToLeft;
+  pageSplitOption = PageSplitOption.FitSplit;
   currentImageSplitPart: SPLIT_PAGE_PART = SPLIT_PAGE_PART.NO_SPLIT;
   pagingDirection: PAGING_DIRECTION = PAGING_DIRECTION.FORWARD;
   colorMode: COLOR_FILTER = COLOR_FILTER.NONE;
   autoCloseMenu: boolean = true;
   readerMode: READER_MODE = READER_MODE.MANGA_LR;
 
+  pageSplitOptions = pageSplitOptions;
+  
   isLoading = true; 
 
   @ViewChild('content') canvas: ElementRef | undefined;
@@ -124,7 +126,10 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
    * An event emiter when a page change occurs. Used soley by the webtoon reader.
    */
    goToPageEvent: ReplaySubject<number> = new ReplaySubject<number>();
-
+   /**
+   * An event emiter when a bookmark on a page change occurs. Used soley by the webtoon reader.
+   */
+   showBookmarkEffectEvent: ReplaySubject<number> = new ReplaySubject<number>();
   /**
    * If the menu is open/visible.
    */
@@ -263,11 +268,16 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     return ReadingDirection;
   }
 
+  get PageSplitOption(): typeof PageSplitOption {
+    return PageSplitOption;
+  }
+
   constructor(private route: ActivatedRoute, private router: Router, private accountService: AccountService,
               public readerService: ReaderService, private location: Location,
               private formBuilder: FormBuilder, private navService: NavService, 
               private toastr: ToastrService, private memberService: MemberService,
-              private libraryService: LibraryService, private utilityService: UtilityService) {
+              private libraryService: LibraryService, private utilityService: UtilityService, 
+              private renderer: Renderer2) {
                 this.navService.hideNavBar();
   }
 
@@ -309,7 +319,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
 
         this.generalSettingsForm = this.formBuilder.group({
           autoCloseMenu: this.autoCloseMenu,
-          pageSplitOption: this.pageSplitOption + '',
+          pageSplitOption: this.pageSplitOption,
           fittingOption: this.translateScalingOption(this.scalingOption)
         });
 
@@ -317,8 +327,8 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
 
         this.generalSettingsForm.valueChanges.pipe(takeUntil(this.onDestroy)).subscribe((changes: SimpleChanges) => {
           this.autoCloseMenu = this.generalSettingsForm.get('autoCloseMenu')?.value;
-          // On change of splitting, re-render the page if the page is already split
+          const needsSplitting = this.isCoverImage();
-          const needsSplitting = this.canvasImage.width > this.canvasImage.height;
+          // If we need to split on a menu change, then we need to re-render. 
           if (needsSplitting) {
             this.loadPage();
           }
@@ -354,6 +364,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     this.onDestroy.next();
     this.onDestroy.complete();
     this.goToPageEvent.complete();
+    this.showBookmarkEffectEvent.complete();
   }
 
   @HostListener('window:keyup', ['$event'])
@@ -421,7 +432,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
       this.maxPages = results.chapterInfo.pages;
       let page = results.progress.pageNum;
       if (page > this.maxPages) {
-        page = this.maxPages - 1;
+        page = this.maxPages;
       }
       this.setPageNum(page);
       
@@ -614,15 +625,20 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   isSplitLeftToRight() {
-    return (this.generalSettingsForm?.get('pageSplitOption')?.value + '') === (PageSplitOption.SplitLeftToRight + '');
+    return parseInt(this.generalSettingsForm?.get('pageSplitOption')?.value, 10) === PageSplitOption.SplitLeftToRight;
   }
 
+  /**
+   * 
+   * @returns If the current model reflects no split of fit split
+   */
   isNoSplit() {
-    return (this.generalSettingsForm?.get('pageSplitOption')?.value + '') === (PageSplitOption.NoSplit + '');
+    const splitValue = parseInt(this.generalSettingsForm?.get('pageSplitOption')?.value, 10);
+    return  splitValue === PageSplitOption.NoSplit || splitValue === PageSplitOption.FitSplit;
   }
 
   updateSplitPage() {
-    const needsSplitting = this.canvasImage.width > this.canvasImage.height;
+    const needsSplitting = this.isCoverImage();
     if (!needsSplitting || this.isNoSplit()) {
       this.currentImageSplitPart = SPLIT_PAGE_PART.NO_SPLIT;
       return;
@@ -734,6 +750,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
 
   loadNextChapter() {
     if (this.nextPageDisabled) { return; }
+    if (this.nextChapterDisabled) { return; }
     this.isLoading = true;
     if (this.nextChapterId === CHAPTER_ID_NOT_FETCHED || this.nextChapterId === this.chapterId) {
       this.readerService.getNextChapter(this.seriesId, this.volumeId, this.chapterId, this.readingListId).pipe(take(1)).subscribe(chapterId => {
@@ -747,6 +764,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
 
   loadPrevChapter() {
     if (this.prevPageDisabled) { return; }
+    if (this.prevChapterDisabled) { return; }
     this.isLoading = true;
     this.continuousChaptersStack.pop();
     const prevChapter = this.continuousChaptersStack.peek();
@@ -814,21 +832,23 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
       if (needsScaling) {
         this.canvas.nativeElement.width = isSafari ? 4_096 : 16_384;
         this.canvas.nativeElement.height = isSafari ? 4_096 : 16_384;
+      } else if (this.isCoverImage()) {
+        //this.canvas.nativeElement.width = this.canvasImage.width / 2;
+        //this.canvas.nativeElement.height = this.canvasImage.height;
       } else {
         this.canvas.nativeElement.width = this.canvasImage.width;
         this.canvas.nativeElement.height = this.canvasImage.height;
       }
     }
-    return true;
   }
 
   renderPage() {
     if (this.ctx && this.canvas) {
       this.canvasImage.onload = null;
 
-      if (!this.setCanvasSize()) return;
+      this.setCanvasSize();
 
-      const needsSplitting = this.canvasImage.width > this.canvasImage.height;
+      const needsSplitting = this.isCoverImage();
       this.updateSplitPage();
 
       if (needsSplitting && this.currentImageSplitPart === SPLIT_PAGE_PART.LEFT_PART) {
@@ -839,31 +859,39 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
         this.ctx.drawImage(this.canvasImage, 0, 0, this.canvasImage.width, this.canvasImage.height, -this.canvasImage.width / 2, 0, this.canvasImage.width, this.canvasImage.height);
       } else {
         if (!this.firstPageRendered && this.scalingOption === ScalingOption.Automatic) {
+          this.updateScalingForFirstPageRender();
+        }
 
-          let newScale = this.generalSettingsForm.get('fittingOption')?.value;
+        // Fit Split on a page that needs splitting
+        if (this.shouldRenderAsFitSplit()) {
           const windowWidth = window.innerWidth
                   || document.documentElement.clientWidth
                   || document.body.clientWidth;
           const windowHeight = window.innerHeight
-                    || document.documentElement.clientHeight
+                  || document.documentElement.clientHeight
-                    || document.body.clientHeight;
+                  || document.body.clientHeight;
-
+          // If the user's screen is wider than the image, just pretend this is no split, as it will render nicer
-          const widthRatio = windowWidth / this.canvasImage.width;
+          this.canvas.nativeElement.width = windowWidth;
-          const heightRatio = windowHeight / this.canvasImage.height;
+          this.canvas.nativeElement.height = windowHeight;
-
+          const ratio = this.canvasImage.width / this.canvasImage.height;
-          // Given that we now have image dimensions, assuming this isn't a split image, 
+          let newWidth = windowWidth;
-          // Try to reset one time based on who's dimension (width/height) is smaller
+          let newHeight = newWidth / ratio;
-          if (widthRatio < heightRatio) {
+          if (newHeight > windowHeight) {
-            newScale = FITTING_OPTION.WIDTH;
+            newHeight = windowHeight; 
-          } else if (widthRatio > heightRatio) {
+            newWidth = newHeight * ratio;
-            newScale = FITTING_OPTION.HEIGHT;
           }
 
-          this.generalSettingsForm.get('fittingOption')?.setValue(newScale);
+          // Optimization: When the screen is larger than newWidth, allow no split rendering to occur for a better fit
-          this.firstPageRendered = true;
+          if (windowWidth > newWidth) {
+            this.ctx.drawImage(this.canvasImage, 0, 0);  
+          } else {
+            this.ctx.drawImage(this.canvasImage, 0, 0, newWidth, newHeight);
+          }
+        } else {
+          this.ctx.drawImage(this.canvasImage, 0, 0);
         }
-        this.ctx.drawImage(this.canvasImage, 0, 0);
       }
+      
       // Reset scroll on non HEIGHT Fits
       if (this.getFit() !== FITTING_OPTION.HEIGHT) {
         window.scrollTo(0, 0);
@@ -873,6 +901,41 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     this.isLoading = false;
   }
 
+  updateScalingForFirstPageRender() {
+    const windowWidth = window.innerWidth
+                  || document.documentElement.clientWidth
+                  || document.body.clientWidth;
+    const windowHeight = window.innerHeight
+              || document.documentElement.clientHeight
+              || document.body.clientHeight;
+      
+      const needsSplitting = this.isCoverImage();
+      let newScale = this.generalSettingsForm.get('fittingOption')?.value;
+      const widthRatio = windowWidth / (this.canvasImage.width / (needsSplitting ? 2 : 1));
+      const heightRatio = windowHeight / (this.canvasImage.height);
+
+      // Given that we now have image dimensions, assuming this isn't a split image, 
+      // Try to reset one time based on who's dimension (width/height) is smaller
+      if (widthRatio < heightRatio) {
+        newScale = FITTING_OPTION.WIDTH;
+      } else if (widthRatio > heightRatio) {
+        newScale = FITTING_OPTION.HEIGHT;
+      }
+
+      this.firstPageRendered = true;
+      this.generalSettingsForm.get('fittingOption')?.setValue(newScale, {emitEvent: false});
+  }
+
+  isCoverImage() {
+    return this.canvasImage.width > this.canvasImage.height;
+  }
+
+
+  shouldRenderAsFitSplit() {
+    if (!this.isCoverImage() || parseInt(this.generalSettingsForm?.get('pageSplitOption')?.value, 10) !== PageSplitOption.FitSplit) return false;
+    return true;
+  }
+
 
   prefetch() {
     let index = 1;
@@ -895,16 +958,6 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   loadPage() {
     if (!this.canvas || !this.ctx) { return; }
 
-    // Due to the fact that we start at image 0, but page 1, we need the last page to have progress as page + 1 to be completed
-    let pageNum = this.pageNum;
-    if (this.pageNum == this.maxPages - 1) {
-      pageNum = this.pageNum + 1;
-    }
-
-    if (!this.incognitoMode) {
-      this.readerService.saveProgress(this.seriesId, this.volumeId, this.chapterId, pageNum).pipe(take(1)).subscribe(() => {/* No operation */});
-    }
-
     this.isLoading = true;
     this.canvasImage = this.cachedImages.current();
     if (this.readerService.imageUrlToPageNum(this.canvasImage.src) !== this.pageNum || this.canvasImage.src === '' || !this.canvasImage.complete) {
@@ -942,6 +995,14 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     return side === 'right' ? 'highlight-2' : 'highlight';
   }
 
+  sliderDragUpdate(context: ChangeContext) {
+    // This will update the value for value except when in webtoon due to how the webtoon reader 
+    // responds to page changes
+    if (this.readerMode !== READER_MODE.WEBTOON) {
+      this.setPageNum(context.value);
+    }
+  }
+
   sliderPageUpdate(context: ChangeContext) {
     const page = context.value;
     
@@ -974,6 +1035,16 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
         });
       }
     }
+
+    // Due to the fact that we start at image 0, but page 1, we need the last page to have progress as page + 1 to be completed
+    let tempPageNum = this.pageNum;
+    if (this.pageNum == this.maxPages - 1) {
+      tempPageNum = this.pageNum + 1;
+    }
+
+    if (!this.incognitoMode) {
+      this.readerService.saveProgress(this.seriesId, this.volumeId, this.chapterId, tempPageNum).pipe(take(1)).subscribe(() => {/* No operation */});
+    }
   }
 
   goToPage(pageNum: number) {
@@ -1053,54 +1124,12 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
 
   handleWebtoonPageChange(updatedPageNum: number) {
     this.setPageNum(updatedPageNum);
-    if (this.incognitoMode) return;
-    this.readerService.saveProgress(this.seriesId, this.volumeId, this.chapterId, this.pageNum).pipe(take(1)).subscribe(() => {/* No operation */});
-  }
-
-  saveSettings() {
-    // NOTE: This is not called anywhere
-    if (this.user === undefined) return;
-
-    const data: Preferences = {
-      readingDirection: this.readingDirection, 
-      scalingOption: this.scalingOption, 
-      pageSplitOption: this.pageSplitOption,
-      autoCloseMenu: this.autoCloseMenu,
-      readerMode: this.readerMode,
-
-      bookReaderDarkMode: this.user.preferences.bookReaderDarkMode,
-      bookReaderFontFamily: this.user.preferences.bookReaderFontFamily,
-      bookReaderFontSize: this.user.preferences.bookReaderFontSize,
-      bookReaderLineSpacing: this.user.preferences.bookReaderLineSpacing,
-      bookReaderMargin: this.user.preferences.bookReaderMargin,
-      bookReaderTapToPaginate: this.user.preferences.bookReaderTapToPaginate,
-      bookReaderReadingDirection: this.readingDirection,
-
-      siteDarkMode: this.user.preferences.siteDarkMode,
-    };
-    this.accountService.updatePreferences(data).pipe(take(1)).subscribe((updatedPrefs) => {
-      this.toastr.success('User settings updated');
-      if (this.user) {
-        this.user.preferences = updatedPrefs;
-      }
-      this.resetSettings();
-    });
-
-  }
-
-  resetSettings() {
-    this.generalSettingsForm.get('fittingOption')?.value.get('fittingOption')?.setValue(this.translateScalingOption(this.user.preferences.scalingOption));
-    this.generalSettingsForm.get('pageSplitOption')?.setValue(this.user.preferences.pageSplitOption + '');
-    this.generalSettingsForm.get('autoCloseMenu')?.setValue(this.autoCloseMenu);
-
-    this.updateForm();
   }
 
   /**
    * Bookmarks the current page for the chapter
    */
   bookmarkPage() {
-    // TODO: Show some sort of UI visual to show that a page was bookmarked
     const pageNum = this.pageNum;
     if (this.pageBookmarked) {
       this.readerService.unbookmark(this.seriesId, this.volumeId, this.chapterId, pageNum).pipe(take(1)).subscribe(() => {
@@ -1112,6 +1141,16 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
       });
     }
 
+    // Show an effect on the image to show that it was bookmarked
+    this.showBookmarkEffectEvent.next(pageNum);
+    if (this.readerMode != READER_MODE.WEBTOON) {
+      if (this.canvas) {
+        this.renderer.addClass(this.canvas?.nativeElement, 'bookmark-effect');
+        setTimeout(() => {
+          this.renderer.removeClass(this.canvas?.nativeElement, 'bookmark-effect');
+        }, 1000);
+      }
+    }
   }
 
   /**

UI/Web/src/app/nav-events-toggle/nav-events-toggle.component.html

@@ -0,0 +1,22 @@
+<ng-container>
+    
+    <button type="button" class="btn btn-icon {{progressEventsSource.getValue().length > 0 ? 'colored' : ''}}" 
+        [ngbPopover]="popContent" title="Activity" placement="bottom" [popoverClass]="'nav-events'">
+        <i aria-hidden="true" class="fa fa-wave-square"></i>
+    </button>
+
+    <ng-template #popContent>
+        <ul class="list-group list-group-flush dark-menu">
+            <li class="list-group-item dark-menu-item" *ngFor="let event of progressEvents$ | async">
+                <div class="spinner-border text-primary small-spinner"
+                role="status" title="Started at {{event.timestamp | date: 'short'}}" 
+                attr.aria-valuetext="{{prettyPrintProgress(event.progress)}}%" [attr.aria-valuenow]="prettyPrintProgress(event.progress)">
+                    <span class="sr-only">Scan for {{event.libraryName}} in progress</span>
+                </div>
+                {{prettyPrintProgress(event.progress)}}%
+                {{prettyPrintEvent(event.eventType)}} {{event.libraryName}}
+            </li>
+            <li class="list-group-item dark-menu-item" *ngIf="progressEventsSource.getValue().length === 0">Not much going on here</li>
+        </ul>
+    </ng-template>
+</ng-container>

UI/Web/src/app/nav-events-toggle/nav-events-toggle.component.scss

@@ -0,0 +1,23 @@
+@import "../../theme/colors";
+
+.small-spinner {
+    width: 1rem;
+    height: 1rem;
+}
+
+.nav-events {
+    background-color: white;
+}
+
+.nav-events .popover-body {
+    padding: 0px;
+}
+
+.btn-icon {
+    color: white;
+}
+
+.colored {
+    background-color: $primary-color;
+    border-radius: 60px;
+}

UI/Web/src/app/nav-events-toggle/nav-events-toggle.component.ts

@@ -0,0 +1,90 @@
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { ProgressEvent } from '../_models/events/scan-library-progress-event';
+import { User } from '../_models/user';
+import { LibraryService } from '../_services/library.service';
+import { EVENTS, Message, MessageHubService } from '../_services/message-hub.service';
+
+interface ProcessedEvent {
+  eventType: string;
+  timestamp?: string;
+  progress: number;
+  libraryId: number;
+  libraryName: string;
+}
+
+type ProgressType = EVENTS.ScanLibraryProgress | EVENTS.RefreshMetadataProgress | EVENTS.BackupDatabaseProgress | EVENTS.CleanupProgress;
+
+@Component({
+  selector: 'app-nav-events-toggle',
+  templateUrl: './nav-events-toggle.component.html',
+  styleUrls: ['./nav-events-toggle.component.scss']
+})
+export class NavEventsToggleComponent implements OnInit, OnDestroy {
+
+  @Input() user!: User;
+
+  private readonly onDestroy = new Subject<void>();
+
+  /**
+   * Events that come through and are merged (ie progress event gets merged into a progress event)
+   */
+  progressEventsSource = new BehaviorSubject<ProcessedEvent[]>([]);
+  progressEvents$ = this.progressEventsSource.asObservable();
+
+  constructor(private messageHub: MessageHubService, private libraryService: LibraryService) { }
+  
+  ngOnDestroy(): void {
+    this.onDestroy.next();
+    this.onDestroy.complete();
+    this.progressEventsSource.complete();
+  }
+
+  ngOnInit(): void {
+    this.messageHub.messages$.pipe(takeUntil(this.onDestroy)).subscribe(event => {
+      if (event.event === EVENTS.ScanLibraryProgress || event.event === EVENTS.RefreshMetadataProgress || event.event === EVENTS.BackupDatabaseProgress  || event.event === EVENTS.CleanupProgress) {
+        this.processProgressEvent(event, event.event);
+      }
+    });
+  }
+
+
+  processProgressEvent(event: Message<ProgressEvent>, eventType: string) {
+    const scanEvent = event.payload as ProgressEvent;
+    console.log(event.event, event.payload);
+
+
+    this.libraryService.getLibraryNames().subscribe(names => {
+      const data = this.progressEventsSource.getValue();
+      const index = data.findIndex(item => item.eventType === eventType && item.libraryId === event.payload.libraryId);
+      if (index >= 0) {
+        data.splice(index, 1);
+      }
+
+      if (scanEvent.progress !== 1) {
+        const libraryName = names[scanEvent.libraryId] || '';
+        const newEvent = {eventType: eventType, timestamp: scanEvent.eventTime, progress: scanEvent.progress, libraryId: scanEvent.libraryId, libraryName};
+        data.push(newEvent);
+      }
+
+      
+      this.progressEventsSource.next(data);
+    });
+  }
+
+  prettyPrintProgress(progress: number) {
+    return Math.trunc(progress * 100);
+  }
+
+  prettyPrintEvent(eventType: string) {
+    switch(eventType) {
+      case (EVENTS.ScanLibraryProgress): return 'Scanning ';
+      case (EVENTS.RefreshMetadataProgress): return 'Refreshing ';
+      case (EVENTS.CleanupProgress): return 'Clearing Cache';
+      case (EVENTS.BackupDatabaseProgress): return 'Backing up Database';
+      default: return eventType;
+    }
+  }
+
+}

UI/Web/src/app/nav-header/nav-header.component.html

@@ -62,6 +62,10 @@
         </button>
       </div>
 
+      <div class="nav-item" *ngIf="(accountService.currentUser$ | async) as user">
+        <app-nav-events-toggle [user]="user"></app-nav-events-toggle>
+      </div>
+
       <div ngbDropdown class="nav-item dropdown" display="dynamic" placement="bottom-right" *ngIf="(accountService.currentUser$ | async) as user" dropdown>
         <button class="btn btn-outline-secondary primary-text" ngbDropdownToggle>
           {{user.username | sentenceCase}}

UI/Web/src/app/nav-header/nav-header.component.scss

@@ -1,4 +1,4 @@
-@import '~bootstrap/scss/mixins/_breakpoints.scss';
+@import '~bootstrap/scss/mixins/_breakpoints.scss'; // TODO: Use @forwards for this?
 
 $primary-color: white;
 $bg-color: rgb(22, 27, 34);

UI/Web/src/app/not-connected/not-connected.component.ts

@@ -11,6 +11,7 @@ export class NotConnectedComponent implements OnInit {
   constructor(private memberService: MemberService, private router: Router) { }
 
   ngOnInit(): void {
+    // BUG: TODO: This causes an infinite reload loop on the UI when the API on backend doesn't exist
     // We make a call to backend on refresh so that if it's up, we can redirect to /home
     this.memberService.adminExists().subscribe((exists) => {
       const pageResume = localStorage.getItem('kavita--no-connection-url');

UI/Web/src/app/on-deck/on-deck.component.html

@@ -1,5 +1,5 @@
 <app-bulk-operations [actionCallback]="bulkActionCallback"></app-bulk-operations>
-<app-card-detail-layout header="In Progress" 
+<app-card-detail-layout header="On Deck" 
     [isLoading]="isLoading"
     [items]="series"
     [filters]="filters"

UI/Web/src/app/on-deck/on-deck.component.ts

@@ -13,11 +13,11 @@ import { ActionService } from '../_services/action.service';
 import { SeriesService } from '../_services/series.service';
 
 @Component({
-  selector: 'app-in-progress',
+  selector: 'app-on-deck',
-  templateUrl: './in-progress.component.html',
+  templateUrl: './on-deck.component.html',
-  styleUrls: ['./in-progress.component.scss']
+  styleUrls: ['./on-deck.component.scss']
 })
-export class InProgressComponent implements OnInit {
+export class OnDeckComponent implements OnInit {
 
   isLoading: boolean = true;
   series: Series[] = [];
@@ -31,7 +31,7 @@ export class InProgressComponent implements OnInit {
   constructor(private router: Router, private route: ActivatedRoute, private seriesService: SeriesService, private titleService: Title,
     private actionService: ActionService, public bulkSelectionService: BulkSelectionService) {
     this.router.routeReuseStrategy.shouldReuseRoute = () => false;
-    this.titleService.setTitle('Kavita - In Progress');
+    this.titleService.setTitle('Kavita - On Deck');
     if (this.pagination === undefined || this.pagination === null) {
       this.pagination = {currentPage: 0, itemsPerPage: 30, totalItems: 0, totalPages: 1};
     }
@@ -79,7 +79,7 @@ export class InProgressComponent implements OnInit {
       this.pagination.currentPage = parseInt(page, 10);
     }
     this.isLoading = true;
-    this.seriesService.getInProgress(this.libraryId, this.pagination?.currentPage, this.pagination?.itemsPerPage, this.filter).pipe(take(1)).subscribe(series => {
+    this.seriesService.getOnDeck(this.libraryId, this.pagination?.currentPage, this.pagination?.itemsPerPage, this.filter).pipe(take(1)).subscribe(series => {
       this.series = series.result;
       this.pagination = series.pagination;
       this.isLoading = false;

UI/Web/src/app/reading-list/reading-list-detail/reading-list-detail.component.ts

@@ -136,7 +136,12 @@ export class ReadingListDetailComponent implements OnInit {
       return 'Volume ' + this.utilityService.cleanSpecialTitle(item.chapterNumber);
     }
 
-    return this.utilityService.formatChapterName(this.libraryTypes[item.libraryId], true, true) + item.chapterNumber;
+    let chapterNum = item.chapterNumber;
+    if (!item.chapterNumber.match(/^\d+$/)) {
+      chapterNum = this.utilityService.cleanSpecialTitle(item.chapterNumber);
+    }
+
+    return this.utilityService.formatChapterName(this.libraryTypes[item.libraryId], true, true) + chapterNum;
   }
 
   orderUpdated(event: IndexUpdateEvent) {

UI/Web/src/app/recently-added/recently-added.component.ts

@@ -10,13 +10,13 @@ import { SeriesAddedEvent } from '../_models/events/series-added-event';
 import { Pagination } from '../_models/pagination';
 import { Series } from '../_models/series';
 import { FilterItem, mangaFormatFilters, SeriesFilter } from '../_models/series-filter';
-import { Action, ActionFactoryService } from '../_services/action-factory.service';
+import { Action } from '../_services/action-factory.service';
 import { ActionService } from '../_services/action.service';
 import { MessageHubService } from '../_services/message-hub.service';
 import { SeriesService } from '../_services/series.service';
 
 /**
- * This component is used as a standard layout for any card detail. ie) series, in-progress, collections, etc.
+ * This component is used as a standard layout for any card detail. ie) series, on-deck, collections, etc.
  */
 @Component({
   selector: 'app-recently-added',

UI/Web/src/app/register-member/register-member.component.scss

@@ -14,4 +14,5 @@
 
 input {
     background-color: #fff !important;
+    color: black !important;
 }

UI/Web/src/app/series-detail/series-detail.component.ts

@@ -16,6 +16,7 @@ import { KEY_CODES, UtilityService } from '../shared/_services/utility.service';
 import { ReviewSeriesModalComponent } from '../_modals/review-series-modal/review-series-modal.component';
 import { Chapter } from '../_models/chapter';
 import { ScanSeriesEvent } from '../_models/events/scan-series-event';
+import { SeriesRemovedEvent } from '../_models/events/series-removed-event';
 import { LibraryType } from '../_models/library';
 import { MangaFormat } from '../_models/manga-format';
 import { Series } from '../_models/series';
@@ -26,7 +27,7 @@ import { ActionItem, ActionFactoryService, Action } from '../_services/action-fa
 import { ActionService } from '../_services/action.service';
 import { ImageService } from '../_services/image.service';
 import { LibraryService } from '../_services/library.service';
-import { MessageHubService } from '../_services/message-hub.service';
+import { EVENTS, MessageHubService } from '../_services/message-hub.service';
 import { ReaderService } from '../_services/reader.service';
 import { SeriesService } from '../_services/series.service';
 
@@ -180,6 +181,16 @@ export class SeriesDetailComponent implements OnInit, OnDestroy {
       this.toastr.success('Scan series completed');
     });
 
+    this.messageHub.messages$.pipe(takeUntil(this.onDestroy)).subscribe(event => {
+      if (event.event === EVENTS.SeriesRemoved) {
+        const seriesRemovedEvent = event.payload as SeriesRemovedEvent;
+        if (seriesRemovedEvent.seriesId === this.series.id) {
+          this.toastr.info('This series no longer exists');
+          this.router.navigateByUrl('/libraries');
+        }
+      }
+    });
+
     const seriesId = parseInt(routeId, 10);
     this.libraryId = parseInt(libraryId, 10);
     this.seriesImage = this.imageService.getSeriesCoverImage(seriesId);

UI/Web/src/app/shared/_services/utility.service.ts

@@ -158,5 +158,4 @@ export class UtilityService {
         rect.right <= (window.innerWidth || document.documentElement.clientWidth)
     );
   }
-
 }

UI/Web/src/app/shared/tag-badge/tag-badge.component.scss

@@ -1,5 +1,3 @@
-@import '../../../theme/colors';
-
 $bg-color: #c9c9c9;
 $bdr-color: #f2f2f2;
 

UI/Web/src/app/typeahead/typeahead.component.scss

@@ -1,4 +1,4 @@
-@import '../../assets/themes/dark.scss';
+@import "../../theme/colors";
 
 input {
     width: 15px;

UI/Web/src/app/typeahead/typeahead.component.ts

@@ -5,6 +5,8 @@ import { debounceTime, filter, map, shareReplay, switchMap, take, takeUntil, tap
 import { KEY_CODES } from '../shared/_services/utility.service';
 import { TypeaheadSettings } from './typeahead-settings';
 
+export type SelectionCompareFn<T> = (a: T, b: T) => boolean;
+
 /**
    * SelectionModel<T> is used for keeping track of multiple selections. Simple interface with ability to toggle. 
    * @param selectedState Optional state to set selectedOptions to. If not passed, defaults to false.
@@ -30,10 +32,16 @@ export class SelectionModel<T> {
   /**
    * Will toggle if the data item is selected or not. If data option is not tracked, will add it and set state to true.
    * @param data Item to toggle
+   * @param selectedState Force the state
+   * @param compareFn An optional function to use for the lookup, else will use shallowEqual implementation
    */
-  toggle(data: T, selectedState?: boolean) {
+  toggle(data: T, selectedState?: boolean, compareFn?: SelectionCompareFn<T>) {
-    //const dataItem = this._data.filter(d => d.value == data);
+    let lookupMethod = this.shallowEqual;
-    const dataItem = this._data.filter(d => this.shallowEqual(d.value, data));
+    if (compareFn != undefined || compareFn != null) {
+      lookupMethod = compareFn;
+    }
+    
+    const dataItem = this._data.filter(d => lookupMethod(d.value, data));
     if (dataItem.length > 0) {
       if (selectedState != undefined) {
         dataItem[0].selected = selectedState;
@@ -45,6 +53,7 @@ export class SelectionModel<T> {
     }
   }
 
+
   /**
    * Is the passed item selected
    * @param data item to check against
@@ -65,6 +74,15 @@ export class SelectionModel<T> {
     return false;
   }
 
+  /**
+   * 
+   * @returns If some of the items are selected, but not all
+   */
+  hasSomeSelected(): boolean {
+    const selectedCount = this._data.filter(d => d.selected).length;
+    return (selectedCount !== this._data.length && selectedCount !== 0)
+  }
+
   /**
    * 
    * @returns All Selected items

UI/Web/src/app/user-login/user-login.component.scss

@@ -1,4 +1,4 @@
-@import "../../theme/_colors.scss";
+@use "../../theme/colors";
 
 .login {
     display: flex;
@@ -36,7 +36,7 @@
     }
 
     .card {
-        background-color: $primary-color;
+        background-color: colors.$primary-color;
         color: #fff;
         cursor: pointer;
         min-width: 300px;