mirror of
				https://github.com/Kareadita/Kavita.git
				synced 2025-11-03 19:17:05 -05:00 
			
		
		
		
	* Bump loader-utils from 2.0.3 to 2.0.4 in /UI/Web Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v2.0.3...v2.0.4) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Fixed want to read button on series detail not performing the correct action * Started the library settings. Added ability to update a cover image for a library. Updated backup db to also copy reading list (and now library) cover images. * Integrated Edit Library into new settings (not tested) and hooked up a wizard-like flow for new library. * Fixed a missing update event in backend when updating a library. * Disable Save when form invalid. Do inline validation on Library name when user types to ensure the name is valid. * Trim library names before you check anything * General code cleanup * Implemented advanced settings for library (include in dashboard, search, recommended) and ability to turn off folder watching for individual libraries. Refactored some code to streamline perf in some flows. * Removed old components replaced with new modal * Code smells Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
		
			
				
	
	
		
			190 lines
		
	
	
		
			6.3 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
			
		
		
	
	
			190 lines
		
	
	
		
			6.3 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
using System.Linq;
 | 
						|
using System.Threading.Tasks;
 | 
						|
using API.Data.Misc;
 | 
						|
using API.Data.Repositories;
 | 
						|
using API.Entities;
 | 
						|
using API.Entities.Enums;
 | 
						|
using Microsoft.EntityFrameworkCore;
 | 
						|
 | 
						|
namespace API.Extensions;
 | 
						|
 | 
						|
public static class QueryableExtensions
 | 
						|
{
 | 
						|
    public static IQueryable<Series> RestrictAgainstAgeRestriction(this IQueryable<Series> queryable, AgeRestriction restriction)
 | 
						|
    {
 | 
						|
        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
 | 
						|
        var q = queryable.Where(s => s.Metadata.AgeRating <= restriction.AgeRating);
 | 
						|
        if (!restriction.IncludeUnknowns)
 | 
						|
        {
 | 
						|
            return q.Where(s => s.Metadata.AgeRating != AgeRating.Unknown);
 | 
						|
        }
 | 
						|
 | 
						|
        return q;
 | 
						|
    }
 | 
						|
 | 
						|
    public static IQueryable<CollectionTag> RestrictAgainstAgeRestriction(this IQueryable<CollectionTag> queryable, AgeRestriction restriction)
 | 
						|
    {
 | 
						|
        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
 | 
						|
 | 
						|
        if (restriction.IncludeUnknowns)
 | 
						|
        {
 | 
						|
            return queryable.Where(c => c.SeriesMetadatas.All(sm =>
 | 
						|
                sm.AgeRating <= restriction.AgeRating));
 | 
						|
        }
 | 
						|
 | 
						|
        return queryable.Where(c => c.SeriesMetadatas.All(sm =>
 | 
						|
            sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown));
 | 
						|
    }
 | 
						|
 | 
						|
    public static IQueryable<Genre> RestrictAgainstAgeRestriction(this IQueryable<Genre> queryable, AgeRestriction restriction)
 | 
						|
    {
 | 
						|
        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
 | 
						|
 | 
						|
        if (restriction.IncludeUnknowns)
 | 
						|
        {
 | 
						|
            return queryable.Where(c => c.SeriesMetadatas.All(sm =>
 | 
						|
                sm.AgeRating <= restriction.AgeRating));
 | 
						|
        }
 | 
						|
 | 
						|
        return queryable.Where(c => c.SeriesMetadatas.All(sm =>
 | 
						|
            sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown));
 | 
						|
    }
 | 
						|
 | 
						|
    public static IQueryable<Tag> RestrictAgainstAgeRestriction(this IQueryable<Tag> queryable, AgeRestriction restriction)
 | 
						|
    {
 | 
						|
        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
 | 
						|
 | 
						|
        if (restriction.IncludeUnknowns)
 | 
						|
        {
 | 
						|
            return queryable.Where(c => c.SeriesMetadatas.All(sm =>
 | 
						|
                sm.AgeRating <= restriction.AgeRating));
 | 
						|
        }
 | 
						|
 | 
						|
        return queryable.Where(c => c.SeriesMetadatas.All(sm =>
 | 
						|
            sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown));
 | 
						|
    }
 | 
						|
 | 
						|
    public static IQueryable<Person> RestrictAgainstAgeRestriction(this IQueryable<Person> queryable, AgeRestriction restriction)
 | 
						|
    {
 | 
						|
        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
 | 
						|
 | 
						|
        if (restriction.IncludeUnknowns)
 | 
						|
        {
 | 
						|
            return queryable.Where(c => c.SeriesMetadatas.All(sm =>
 | 
						|
                sm.AgeRating <= restriction.AgeRating));
 | 
						|
        }
 | 
						|
 | 
						|
        return queryable.Where(c => c.SeriesMetadatas.All(sm =>
 | 
						|
            sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown));
 | 
						|
    }
 | 
						|
 | 
						|
    public static IQueryable<ReadingList> RestrictAgainstAgeRestriction(this IQueryable<ReadingList> queryable, AgeRestriction restriction)
 | 
						|
    {
 | 
						|
        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
 | 
						|
        var q = queryable.Where(rl => rl.AgeRating <= restriction.AgeRating);
 | 
						|
 | 
						|
        if (!restriction.IncludeUnknowns)
 | 
						|
        {
 | 
						|
            return q.Where(rl => rl.AgeRating != AgeRating.Unknown);
 | 
						|
        }
 | 
						|
 | 
						|
        return q;
 | 
						|
    }
 | 
						|
 | 
						|
    public static Task<AgeRestriction> GetUserAgeRestriction(this DbSet<AppUser> queryable, int userId)
 | 
						|
    {
 | 
						|
        if (userId < 1)
 | 
						|
        {
 | 
						|
            return Task.FromResult(new AgeRestriction()
 | 
						|
            {
 | 
						|
                AgeRating = AgeRating.NotApplicable,
 | 
						|
                IncludeUnknowns = true
 | 
						|
            });
 | 
						|
        }
 | 
						|
        return queryable
 | 
						|
            .AsNoTracking()
 | 
						|
            .Where(u => u.Id == userId)
 | 
						|
            .Select(u =>
 | 
						|
                new AgeRestriction(){
 | 
						|
                    AgeRating = u.AgeRestriction,
 | 
						|
                    IncludeUnknowns = u.AgeRestrictionIncludeUnknowns
 | 
						|
                })
 | 
						|
            .SingleAsync();
 | 
						|
    }
 | 
						|
 | 
						|
    public static IQueryable<CollectionTag> Includes(this IQueryable<CollectionTag> queryable,
 | 
						|
        CollectionTagIncludes includes)
 | 
						|
    {
 | 
						|
        if (includes.HasFlag(CollectionTagIncludes.SeriesMetadata))
 | 
						|
        {
 | 
						|
            queryable = queryable.Include(c => c.SeriesMetadatas);
 | 
						|
        }
 | 
						|
 | 
						|
        return queryable.AsSplitQuery();
 | 
						|
    }
 | 
						|
 | 
						|
    public static IQueryable<Series> Includes(this IQueryable<Series> query,
 | 
						|
        SeriesIncludes includeFlags)
 | 
						|
    {
 | 
						|
        if (includeFlags.HasFlag(SeriesIncludes.Library))
 | 
						|
        {
 | 
						|
            query = query.Include(u => u.Library);
 | 
						|
        }
 | 
						|
 | 
						|
        if (includeFlags.HasFlag(SeriesIncludes.Volumes))
 | 
						|
        {
 | 
						|
            query = query.Include(s => s.Volumes);
 | 
						|
        }
 | 
						|
 | 
						|
        if (includeFlags.HasFlag(SeriesIncludes.Related))
 | 
						|
        {
 | 
						|
            query = query.Include(s => s.Relations)
 | 
						|
                .ThenInclude(r => r.TargetSeries)
 | 
						|
                .Include(s => s.RelationOf);
 | 
						|
        }
 | 
						|
 | 
						|
        if (includeFlags.HasFlag(SeriesIncludes.Metadata))
 | 
						|
        {
 | 
						|
            query = query.Include(s => s.Metadata)
 | 
						|
                .ThenInclude(m => m.CollectionTags.OrderBy(g => g.NormalizedTitle))
 | 
						|
                .Include(s => s.Metadata)
 | 
						|
                .ThenInclude(m => m.Genres.OrderBy(g => g.NormalizedTitle))
 | 
						|
                .Include(s => s.Metadata)
 | 
						|
                .ThenInclude(m => m.People)
 | 
						|
                .Include(s => s.Metadata)
 | 
						|
                .ThenInclude(m => m.Tags.OrderBy(g => g.NormalizedTitle));
 | 
						|
        }
 | 
						|
 | 
						|
 | 
						|
        return query.AsSplitQuery();
 | 
						|
    }
 | 
						|
 | 
						|
    /// <summary>
 | 
						|
    /// Applies restriction based on if the Library has restrictions (like include in search)
 | 
						|
    /// </summary>
 | 
						|
    /// <param name="query"></param>
 | 
						|
    /// <param name="context"></param>
 | 
						|
    /// <returns></returns>
 | 
						|
    public static IQueryable<Library> IsRestricted(this IQueryable<Library> query, QueryContext context)
 | 
						|
    {
 | 
						|
        if (context.HasFlag(QueryContext.None)) return query;
 | 
						|
 | 
						|
        if (context.HasFlag(QueryContext.Dashboard))
 | 
						|
        {
 | 
						|
            query = query.Where(l => l.IncludeInDashboard);
 | 
						|
        }
 | 
						|
 | 
						|
        if (context.HasFlag(QueryContext.Recommended))
 | 
						|
        {
 | 
						|
            query = query.Where(l => l.IncludeInRecommended);
 | 
						|
        }
 | 
						|
 | 
						|
        if (context.HasFlag(QueryContext.Search))
 | 
						|
        {
 | 
						|
            query = query.Where(l => l.IncludeInSearch);
 | 
						|
        }
 | 
						|
 | 
						|
        return query;
 | 
						|
    }
 | 
						|
}
 |