mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Took care of some notes in the code * Fixed an issue where Extra might get flagged as special too early, if in a word like Extraordinary * Moved Tag cleanup code into Scanner service. Added a SplitQuery to another heavy API. Refactored Scan loop to remove parallelism and use async instead. * Lots of rework on the codebase to support detailed messages and easier management of message sending. Need to take a break on this work. * Progress is being made, but slowly. Code is broken in this commit. * Progress is being made, but slowly. Code is broken in this commit. * Fixed merge issue * Fixed unit tests * CoverUpdate is now hooked into new ProgressEvent structure * Refactored code to remove custom observables and have everything use standard messages$ * Refactored a ton of instances to NotificationProgressEvent style and tons of the UI to respect that too. UI is still a bit buggy, but wholistically the work is done. * Working much better. Sometimes events come in too fast. Currently cover update progress doesn't display on UI * Fixed unit tests * Removed SignalREvent to minimize internal event types. Updated the UI to use progress bars. Finished SiteThemeService. * Merged metadata refresh progress events and changed library scan events to merge cleaner in the UI * Changed RefreshMetadataProgress to CoverUpdateProgress to reflect the event better. * Theme Cleanup (#1089) * Fixed e-ink theme not properly applying correctly * Fixed some seed changes. Changed card checkboxes to use our themed ones * Fixed recently added carousel not going to recently-added page * Fixed an issue where no results found would show when searching for a library name * Cleaned up list a bit, typeahead dropdown still needs work * Added a TODO to streamline series-card component * Removed ng-lazyload-image module since we don't use it. We use lazysizes * Darken card on hover * Fixing accordion focus style * ux pass updates - Fixed typeahead width - Fixed changelog download buttons - Fixed a select - Fixed various input box-shadows - Fixed all anchors to only have underline on hover - Added navtab hover and active effects * more ux pass - Fixed spacing on theme cards - Fixed some light theme issues - Exposed text-muted-color for theme card subtitle color * UX pass fixes - Changed back to bright green for primary on dark theme - Changed fa icon to black on e-ink * Merged changelog component * Fixed anchor buttons text decoration * Changed nav tabs to have a background color instead of open active state * When user is not authenticated, make sure we set default theme (dark) * Cleanup on carousel * Updated Users tab to use small buttons with icons to align with Library tab * Cleaned up brand to not underline, removed default link underline on hover in dropdown and pill tabs * Fixed collection detail posters not rendering Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> * Bump versions by dotnet-bump-version. * Tweaked some of the emitting code * Some css, but pretty bad. Robbie please save me * Removed a todo * styling update * Only send filename on FileScanProgress * Some console.log spam cleanup * Various updates * Show events widget activity based on activeEvents * progress bar color updates * Code cleanup Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
192 lines
7.2 KiB
C#
192 lines
7.2 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
using API.DTOs.CollectionTags;
|
|
using API.Entities.Metadata;
|
|
using API.Extensions;
|
|
using API.SignalR;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.AspNetCore.SignalR;
|
|
|
|
namespace API.Controllers
|
|
{
|
|
/// <summary>
|
|
/// APIs for Collections
|
|
/// </summary>
|
|
public class CollectionController : BaseApiController
|
|
{
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly IEventHub _eventHub;
|
|
|
|
/// <inheritdoc />
|
|
public CollectionController(IUnitOfWork unitOfWork, IEventHub eventHub)
|
|
{
|
|
_unitOfWork = unitOfWork;
|
|
_eventHub = eventHub;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Return a list of all collection tags on the server
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
[HttpGet]
|
|
public async Task<IEnumerable<CollectionTagDto>> GetAllTags()
|
|
{
|
|
var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername());
|
|
var isAdmin = await _unitOfWork.UserRepository.IsUserAdminAsync(user);
|
|
if (isAdmin)
|
|
{
|
|
return await _unitOfWork.CollectionTagRepository.GetAllTagDtosAsync();
|
|
}
|
|
return await _unitOfWork.CollectionTagRepository.GetAllPromotedTagDtosAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Searches against the collection tags on the DB and returns matches that meet the search criteria.
|
|
/// <remarks>Search strings will be cleaned of certain fields, like %</remarks>
|
|
/// </summary>
|
|
/// <param name="queryString">Search term</param>
|
|
/// <returns></returns>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
[HttpGet("search")]
|
|
public async Task<IEnumerable<CollectionTagDto>> SearchTags(string queryString)
|
|
{
|
|
queryString ??= "";
|
|
queryString = queryString.Replace(@"%", string.Empty);
|
|
if (queryString.Length == 0) return await _unitOfWork.CollectionTagRepository.GetAllTagDtosAsync();
|
|
|
|
return await _unitOfWork.CollectionTagRepository.SearchTagDtosAsync(queryString);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Updates an existing tag with a new title, promotion status, and summary.
|
|
/// <remarks>UI does not contain controls to update title</remarks>
|
|
/// </summary>
|
|
/// <param name="updatedTag"></param>
|
|
/// <returns></returns>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
[HttpPost("update")]
|
|
public async Task<ActionResult> UpdateTagPromotion(CollectionTagDto updatedTag)
|
|
{
|
|
var existingTag = await _unitOfWork.CollectionTagRepository.GetTagAsync(updatedTag.Id);
|
|
if (existingTag == null) return BadRequest("This tag does not exist");
|
|
|
|
existingTag.Promoted = updatedTag.Promoted;
|
|
existingTag.Title = updatedTag.Title.Trim();
|
|
existingTag.NormalizedTitle = Parser.Parser.Normalize(updatedTag.Title).ToUpper();
|
|
existingTag.Summary = updatedTag.Summary.Trim();
|
|
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
if (await _unitOfWork.CommitAsync())
|
|
{
|
|
return Ok("Tag updated successfully");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
return Ok("Tag updated successfully");
|
|
}
|
|
|
|
return BadRequest("Something went wrong, please try again");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds a collection tag onto multiple Series. If tag id is 0, this will create a new tag.
|
|
/// </summary>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
[HttpPost("update-for-series")]
|
|
public async Task<ActionResult> AddToMultipleSeries(CollectionTagBulkAddDto dto)
|
|
{
|
|
var tag = await _unitOfWork.CollectionTagRepository.GetFullTagAsync(dto.CollectionTagId);
|
|
if (tag == null)
|
|
{
|
|
tag = DbFactory.CollectionTag(0, dto.CollectionTagTitle, String.Empty, false);
|
|
_unitOfWork.CollectionTagRepository.Add(tag);
|
|
}
|
|
|
|
|
|
var seriesMetadatas = await _unitOfWork.SeriesRepository.GetSeriesMetadataForIdsAsync(dto.SeriesIds);
|
|
foreach (var metadata in seriesMetadatas)
|
|
{
|
|
if (!metadata.CollectionTags.Any(t => t.Title.Equals(tag.Title, StringComparison.InvariantCulture)))
|
|
{
|
|
metadata.CollectionTags.Add(tag);
|
|
_unitOfWork.SeriesMetadataRepository.Update(metadata);
|
|
}
|
|
}
|
|
|
|
if (!_unitOfWork.HasChanges()) return Ok();
|
|
if (await _unitOfWork.CommitAsync())
|
|
{
|
|
return Ok();
|
|
}
|
|
return BadRequest("There was an issue updating series with collection tag");
|
|
}
|
|
|
|
/// <summary>
|
|
/// For a given tag, update the summary if summary has changed and remove a set of series from the tag.
|
|
/// </summary>
|
|
/// <param name="updateSeriesForTagDto"></param>
|
|
/// <returns></returns>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
[HttpPost("update-series")]
|
|
public async Task<ActionResult> UpdateSeriesForTag(UpdateSeriesForTagDto updateSeriesForTagDto)
|
|
{
|
|
try
|
|
{
|
|
var tag = await _unitOfWork.CollectionTagRepository.GetFullTagAsync(updateSeriesForTagDto.Tag.Id);
|
|
if (tag == null) return BadRequest("Not a valid Tag");
|
|
tag.SeriesMetadatas ??= new List<SeriesMetadata>();
|
|
|
|
// Check if Tag has updated (Summary)
|
|
if (tag.Summary == null || !tag.Summary.Equals(updateSeriesForTagDto.Tag.Summary))
|
|
{
|
|
tag.Summary = updateSeriesForTagDto.Tag.Summary;
|
|
_unitOfWork.CollectionTagRepository.Update(tag);
|
|
}
|
|
|
|
tag.CoverImageLocked = updateSeriesForTagDto.Tag.CoverImageLocked;
|
|
|
|
if (!updateSeriesForTagDto.Tag.CoverImageLocked)
|
|
{
|
|
tag.CoverImageLocked = false;
|
|
tag.CoverImage = string.Empty;
|
|
await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate,
|
|
MessageFactory.CoverUpdateEvent(tag.Id, "collectionTag"), false);
|
|
_unitOfWork.CollectionTagRepository.Update(tag);
|
|
}
|
|
|
|
foreach (var seriesIdToRemove in updateSeriesForTagDto.SeriesIdsToRemove)
|
|
{
|
|
tag.SeriesMetadatas.Remove(tag.SeriesMetadatas.Single(sm => sm.SeriesId == seriesIdToRemove));
|
|
}
|
|
|
|
|
|
if (tag.SeriesMetadatas.Count == 0)
|
|
{
|
|
_unitOfWork.CollectionTagRepository.Remove(tag);
|
|
}
|
|
|
|
if (!_unitOfWork.HasChanges()) return Ok("No updates");
|
|
|
|
if (await _unitOfWork.CommitAsync())
|
|
{
|
|
return Ok("Tag updated");
|
|
}
|
|
}
|
|
catch (Exception)
|
|
{
|
|
await _unitOfWork.RollbackAsync();
|
|
}
|
|
|
|
|
|
return BadRequest("Something went wrong. Please try again.");
|
|
}
|
|
}
|
|
}
|