Bugfixes and Cover Chooser Upgrades (#1146)

* Fixed a bug where GetNextChapter would return a loose leaf chapter from a special when it should return nothing.

* Fixed a bug in events widget when an update comes in after a user refreshes, the active event counter could get out of sync, thus showing "Nothing going on here"

Refactored the events widget to be named appropriately.

* Refactored code to have errors during threaded tasks propagate to the UI via events widget (css still needed).

Removed ScanLibraryError in favor of generic Error event.

* Fixed up some code and added ability to remove the event from events widget

* Fixed a bug where modifiying certain fields, like summary, wouldn't lock the field

* Fixed a few bugs where lock state was not being set in the DB correctly nor were certain combinations of locking fields and editing fields.

* Removed debug code

* Updated the discord alert to tag new group

* Refactored cover upload to actually handle uploading a temp file via url on the backend so that users can user change cover by url. Fixed up some bugs that occured when chaning the image container in a previous PR.

* Code cleanup

* Cleaned up the css on the error items

* Code cleanup

API/Controllers/ImageController.cs

@@ -4,6 +4,7 @@ using API.Data;
 using API.Entities.Enums;
 using API.Extensions;
 using API.Services;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace API.Controllers
@@ -110,5 +111,22 @@ namespace API.Controllers
             Response.AddCacheHeader(file.FullName);
             return PhysicalFile(file.FullName, "image/" + format, Path.GetFileName(file.FullName));
         }
+
+        /// <summary>
+        /// Returns a temp coverupload image
+        /// </summary>
+        /// <param name="filename">Filename of file. This is used with upload/upload-by-url</param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpGet("cover-upload")]
+        public ActionResult GetCoverUploadImage(string filename)
+        {
+            var path = Path.Join(_directoryService.TempDirectory, filename);
+            if (string.IsNullOrEmpty(path) || !_directoryService.FileSystem.File.Exists(path)) return BadRequest($"File does not exist");
+            var format = _directoryService.FileSystem.Path.GetExtension(path).Replace(".", "");
+
+            Response.AddCacheHeader(path);
+            return PhysicalFile(path, "image/" + format, _directoryService.FileSystem.Path.GetFileName(path));
+        }
     }
 }

API/Controllers/SeriesController.cs

@@ -150,26 +150,14 @@ namespace API.Controllers
                 return BadRequest("A series already exists in this library with this name. Series Names must be unique to a library.");
             }
 
-            if (!series.Name.Equals(updateSeries.Name.Trim()))
-            {
-                series.Name = updateSeries.Name.Trim();
-                series.NameLocked = true;
-            }
-            if (!series.SortName.Equals(updateSeries.SortName.Trim()))
-            {
-                series.SortName = updateSeries.SortName.Trim();
-                series.SortNameLocked = true;
-            }
-            if (!series.LocalizedName.Equals(updateSeries.LocalizedName.Trim()))
-            {
-                series.LocalizedName = updateSeries.LocalizedName.Trim();
-                series.LocalizedNameLocked = true;
-            }
+            series.Name = updateSeries.Name.Trim();
+            series.SortName = updateSeries.SortName.Trim();
+            series.LocalizedName = updateSeries.LocalizedName.Trim();
 
+            series.NameLocked = updateSeries.NameLocked;
+            series.SortNameLocked = updateSeries.SortNameLocked;
+            series.LocalizedNameLocked = updateSeries.LocalizedNameLocked;
 
-            if (!series.NameLocked) series.NameLocked = false;
-            if (!series.SortNameLocked) series.SortNameLocked = false;
-            if (!series.LocalizedNameLocked) series.LocalizedNameLocked = false;
 
             var needsRefreshMetadata = false;
             // This is when you hit Reset

API/Controllers/ServerController.cs

@@ -7,6 +7,7 @@ using API.DTOs.Update;
 using API.Extensions;
 using API.Services;
 using API.Services.Tasks;
+using Hangfire;
 using Kavita.Common;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

API/Controllers/UploadController.cs

@@ -1,8 +1,11 @@
 using System;
+using System.IO;
 using System.Threading.Tasks;
 using API.Data;
 using API.DTOs.Uploads;
+using API.Extensions;
 using API.Services;
+using Flurl.Http;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -19,14 +22,37 @@ namespace API.Controllers
         private readonly IImageService _imageService;
         private readonly ILogger<UploadController> _logger;
         private readonly ITaskScheduler _taskScheduler;
+        private readonly IDirectoryService _directoryService;
 
         /// <inheritdoc />
-        public UploadController(IUnitOfWork unitOfWork, IImageService imageService, ILogger<UploadController> logger, ITaskScheduler taskScheduler)
+        public UploadController(IUnitOfWork unitOfWork, IImageService imageService, ILogger<UploadController> logger,
+            ITaskScheduler taskScheduler, IDirectoryService directoryService)
         {
             _unitOfWork = unitOfWork;
             _imageService = imageService;
             _logger = logger;
             _taskScheduler = taskScheduler;
+            _directoryService = directoryService;
+        }
+
+        /// <summary>
+        /// This stores a file (image) in temp directory for use in a cover image replacement flow.
+        /// This is automatically cleaned up.
+        /// </summary>
+        /// <param name="dto">Escaped url to download from</param>
+        /// <returns>filename</returns>
+        [Authorize(Policy = "RequireAdminRole")]
+        [HttpPost("upload-by-url")]
+        public async Task<ActionResult<string>> GetImageFromFile(UploadUrlDto dto)
+        {
+            var dateString = $"{DateTime.Now.ToShortDateString()}_{DateTime.Now.ToLongTimeString()}".Replace("/", "_").Replace(":", "_");
+            var format = _directoryService.FileSystem.Path.GetExtension(dto.Url).Replace(".", "");
+            var path = await dto.Url
+                .DownloadFileAsync(_directoryService.TempDirectory, $"coverupload_{dateString}.{format}");
+
+            if (string.IsNullOrEmpty(path) || !_directoryService.FileSystem.File.Exists(path)) return BadRequest($"Could not download file");
+
+            return $"coverupload_{dateString}.{format}";
         }
 
         /// <summary>