.NET 8 Update (Kareadita#2496)

therobbiedavis · Dec 14, 2023 · b838fd5 · b838fd5
1 parent 6d4d2d4
commit b838fd5
Show file tree

Hide file tree

Showing 75 changed files with 590 additions and 405 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3
         with:
-            dotnet-version: 7.0.x
+            dotnet-version: 8.0.x
 
       - name: Install Swashbuckle CLI
         shell: powershell

diff --git a/.github/workflows/canary-workflow.yml b/.github/workflows/canary-workflow.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3
         with:
-            dotnet-version: 7.0.x
+            dotnet-version: 8.0.x
 
       - name: Bump versions
         uses: SiqiLu/[email protected]
@@ -98,7 +98,7 @@ jobs:
           - name: Compile dotnet app
             uses: actions/setup-dotnet@v3
             with:
-                dotnet-version: 7.0.x
+                dotnet-version: 8.0.x
 
           - name: Install Swashbuckle CLI
             run: dotnet tool install -g --version 6.5.0 Swashbuckle.AspNetCore.Cli

diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3
         with:
-            dotnet-version: 7.0.x
+            dotnet-version: 8.0.x
 
       - name: Bump versions
         uses: majora2007/[email protected]
@@ -131,7 +131,7 @@ jobs:
       - name: Compile dotnet app
         uses: actions/setup-dotnet@v3
         with:
-            dotnet-version: 7.0.x
+            dotnet-version: 8.0.x
 
       - name: Install Swashbuckle CLI
         run: dotnet tool install -g --version 6.5.0 Swashbuckle.AspNetCore.Cli

diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
@@ -119,7 +119,7 @@ jobs:
       - name: Compile dotnet app
         uses: actions/setup-dotnet@v3
         with:
-            dotnet-version: 7.0.x
+            dotnet-version: 8.0.x
       - name: Install Swashbuckle CLI
         run: dotnet tool install -g --version 6.5.0 Swashbuckle.AspNetCore.Cli
 

diff --git a/API.Benchmark/API.Benchmark.csproj b/API.Benchmark/API.Benchmark.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 
@@ -10,8 +10,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
-      <PackageReference Include="BenchmarkDotNet.Annotations" Version="0.13.10" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
+      <PackageReference Include="BenchmarkDotNet.Annotations" Version="0.13.11" />
       <PackageReference Include="NSubstitute" Version="5.1.0" />
     </ItemGroup>
 

diff --git a/API.Tests/API.Tests.csproj b/API.Tests/API.Tests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.13" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="NSubstitute" Version="5.1.0" />
-        <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="19.2.69" />
-        <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="19.2.69" />
-        <PackageReference Include="xunit" Version="2.6.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+        <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="20.0.4" />
+        <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="20.0.4" />
+        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/API/API.csproj b/API/API.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AnalysisMode>Default</AnalysisMode>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <TieredPGO>true</TieredPGO>
@@ -53,7 +53,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.13">
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
@@ -72,38 +72,37 @@
     <PackageReference Include="MarkdownDeep.NET.Core" Version="1.5.0.4" />
     <PackageReference Include="Hangfire.AspNetCore" Version="1.8.6" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
     <PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
     <PackageReference Include="Nager.ArticleNumber" Version="1.0.7" />
-    <PackageReference Include="NetVips" Version="2.3.1" />
-    <PackageReference Include="NetVips.Native" Version="8.14.5" />
+    <PackageReference Include="NetVips" Version="2.4.0" />
+    <PackageReference Include="NetVips.Native" Version="8.15.0" />
     <PackageReference Include="NReco.Logging.File" Version="1.1.7" />
-    <PackageReference Include="Serilog" Version="3.1.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.2.0-dev-00752" />
-    <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.AspNetCore.SignalR" Version="0.4.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.SignalR.Core" Version="0.1.2" />
-    <PackageReference Include="SharpCompress" Version="0.34.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
+    <PackageReference Include="SharpCompress" Version="0.34.2" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.12" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
-    <PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+    <PackageReference Include="System.IO.Abstractions" Version="20.0.4" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
     <PackageReference Include="VersOne.Epub" Version="3.3.1" />
   </ItemGroup>
 

diff --git a/API/Controllers/LibraryController.cs b/API/Controllers/LibraryController.cs
@@ -40,15 +40,13 @@ public class LibraryController : BaseApiController
     private readonly IEventHub _eventHub;
     private readonly ILibraryWatcher _libraryWatcher;
     private readonly ILocalizationService _localizationService;
-    private readonly IStreamService _streamService;
     private readonly IEasyCachingProvider _libraryCacheProvider;
     private const string CacheKey = "library_";
 
     public LibraryController(IDirectoryService directoryService,
         ILogger<LibraryController> logger, IMapper mapper, ITaskScheduler taskScheduler,
         IUnitOfWork unitOfWork, IEventHub eventHub, ILibraryWatcher libraryWatcher,
-        IEasyCachingProviderFactory cachingProviderFactory, ILocalizationService localizationService,
-        IStreamService streamService)
+        IEasyCachingProviderFactory cachingProviderFactory, ILocalizationService localizationService)
     {
         _directoryService = directoryService;
         _logger = logger;
@@ -58,7 +56,6 @@ public LibraryController(IDirectoryService directoryService,
         _eventHub = eventHub;
         _libraryWatcher = libraryWatcher;
         _localizationService = localizationService;
-        _streamService = streamService;
 
         _libraryCacheProvider = cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.Library);
     }
@@ -157,7 +154,7 @@ public ActionResult<IEnumerable<DirectoryDto>> GetDirectories(string? path)
             }));
         }
 
-        if (!Directory.Exists(path)) return Ok(_directoryService.ListDirectory(Path.GetDirectoryName(path)));
+        if (!Directory.Exists(path)) return Ok(_directoryService.ListDirectory(Path.GetDirectoryName(path)!));
 
         return Ok(_directoryService.ListDirectory(path));
     }

diff --git a/API/Controllers/OPDSController.cs b/API/Controllers/OPDSController.cs
@@ -99,7 +99,7 @@ public async Task<IActionResult> Get(string apiKey)
         if (!(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).EnableOpds)
             return BadRequest(await _localizationService.Translate(userId, "opds-disabled"));
 
-        var (baseUrl, prefix) = await GetPrefix();
+        var (_, prefix) = await GetPrefix();
 
         var feed = CreateFeed("Kavita", string.Empty, apiKey, prefix);
         SetFeedId(feed, "root");
@@ -141,10 +141,37 @@ public async Task<IActionResult> Get(string apiKey)
                     });
                     break;
                 case DashboardStreamType.RecentlyUpdated:
-                    // TODO: See if we can implement this and use (count) on series name for number of updates
+                    feed.Entries.Add(new FeedEntry()
+                    {
+                        Id = "recentlyUpdated",
+                        Title = await _localizationService.Translate(userId, "recently-updated"),
+                        Content = new FeedEntryContent()
+                        {
+                            Text = await _localizationService.Translate(userId, "browse-recently-updated")
+                        },
+                        Links = new List<FeedLink>()
+                        {
+                            CreateLink(FeedLinkRelation.SubSection, FeedLinkType.AtomNavigation, $"{prefix}{apiKey}/recently-updated"),
+                        }
+                    });
                     break;
                 case DashboardStreamType.MoreInGenre:
-                    // TODO: See if we can implement this
+                    var randomGenre = await _unitOfWork.GenreRepository.GetRandomGenre();
+                    if (randomGenre == null) break;
+
+                    feed.Entries.Add(new FeedEntry()
+                    {
+                        Id = "moreInGenre",
+                        Title = await _localizationService.Translate(userId, "more-in-genre", randomGenre.Title),
+                        Content = new FeedEntryContent()
+                        {
+                            Text = await _localizationService.Translate(userId, "browse-more-in-genre", randomGenre.Title)
+                        },
+                        Links = new List<FeedLink>()
+                        {
+                            CreateLink(FeedLinkRelation.SubSection, FeedLinkType.AtomNavigation, $"{prefix}{apiKey}/more-in-genre?genreId={randomGenre.Id}"),
+                        }
+                    });
                     break;
                 case DashboardStreamType.SmartFilter:
 
@@ -632,6 +659,61 @@ public async Task<IActionResult> GetRecentlyAdded(string apiKey, [FromQuery] int
         return CreateXmlResult(SerializeXml(feed));
     }
 
+    [HttpGet("{apiKey}/more-in-genre")]
+    [Produces("application/xml")]
+    public async Task<IActionResult> GetMoreInGenre(string apiKey, [FromQuery] int genreId, [FromQuery] int pageNumber = 1)
+    {
+        var userId = await GetUser(apiKey);
+        if (!(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).EnableOpds)
+            return BadRequest(await _localizationService.Translate(userId, "opds-disabled"));
+        var (baseUrl, prefix) = await GetPrefix();
+        var genre = await _unitOfWork.GenreRepository.GetGenreById(genreId);
+        var seriesDtos = await _unitOfWork.SeriesRepository.GetMoreIn(userId, 0, genreId, GetUserParams(pageNumber));
+        var seriesMetadatas = await _unitOfWork.SeriesRepository.GetSeriesMetadataForIds(seriesDtos.Select(s => s.Id));
+
+        var feed = CreateFeed(await _localizationService.Translate(userId, "more-in-genre", genre.Title), $"{prefix}{apiKey}/more-in-genre", apiKey, prefix);
+        SetFeedId(feed, "more-in-genre");
+        AddPagination(feed, seriesDtos, $"{prefix}{apiKey}/more-in-genre");
+
+        foreach (var seriesDto in seriesDtos)
+        {
+            feed.Entries.Add(CreateSeries(seriesDto, seriesMetadatas.First(s => s.SeriesId == seriesDto.Id), apiKey, prefix, baseUrl));
+        }
+
+        return CreateXmlResult(SerializeXml(feed));
+    }
+
+    [HttpGet("{apiKey}/recently-updated")]
+    [Produces("application/xml")]
+    public async Task<IActionResult> GetRecentlyUpdated(string apiKey, [FromQuery] int pageNumber = 1)
+    {
+        var userId = await GetUser(apiKey);
+        if (!(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).EnableOpds)
+            return BadRequest(await _localizationService.Translate(userId, "opds-disabled"));
+        var (baseUrl, prefix) = await GetPrefix();
+        var seriesDtos = (await _unitOfWork.SeriesRepository.GetRecentlyUpdatedSeries(userId, PageSize)).ToList();
+        var seriesMetadatas = await _unitOfWork.SeriesRepository.GetSeriesMetadataForIds(seriesDtos.Select(s => s.SeriesId));
+
+        var feed = CreateFeed(await _localizationService.Translate(userId, "recently-updated"), $"{prefix}{apiKey}/recently-updated", apiKey, prefix);
+        SetFeedId(feed, "recently-updated");
+        //AddPagination(feed, seriesDtos, $"{prefix}{apiKey}/recently-updated");
+
+        foreach (var groupedSeries in seriesDtos)
+        {
+            var seriesDto = new SeriesDto()
+            {
+                Name = $"{groupedSeries.SeriesName} ({groupedSeries.Count})",
+                Id = groupedSeries.SeriesId,
+                Format = groupedSeries.Format,
+                LibraryId = groupedSeries.LibraryId,
+            };
+            var metadata = seriesMetadatas.First(s => s.SeriesId == seriesDto.Id);
+            feed.Entries.Add(CreateSeries(seriesDto, metadata, apiKey, prefix, baseUrl));
+        }
+
+        return CreateXmlResult(SerializeXml(feed));
+    }
+
     [HttpGet("{apiKey}/on-deck")]
     [Produces("application/xml")]
     public async Task<IActionResult> GetOnDeck(string apiKey, [FromQuery] int pageNumber = 1)
@@ -1161,7 +1243,7 @@ private async Task<FeedLink> CreatePageStreamLink(int libraryId, int seriesId, i
         var userId = await GetUser(apiKey);
         var progress = await _unitOfWork.AppUserProgressRepository.GetUserProgressDtoAsync(chapterId, userId);
 
-        // TODO: Type could be wrong
+        // NOTE: Type could be wrong, there is nothing I can do in the spec
         var link = CreateLink(FeedLinkRelation.Stream, "image/jpeg",
             $"{prefix}{apiKey}/image?libraryId={libraryId}&seriesId={seriesId}&volumeId={volumeId}&chapterId={chapterId}&pageNumber=" + "{pageNumber}");
         link.TotalPages = mangaFile.Pages;

diff --git a/API/Controllers/StreamController.cs b/API/Controllers/StreamController.cs
@@ -19,13 +19,11 @@ public class StreamController : BaseApiController
 {
     private readonly IStreamService _streamService;
     private readonly IUnitOfWork _unitOfWork;
-    private readonly ILogger<StreamController> _logger;
 
-    public StreamController(IStreamService streamService, IUnitOfWork unitOfWork, ILogger<StreamController> logger)
+    public StreamController(IStreamService streamService, IUnitOfWork unitOfWork)
     {
         _streamService = streamService;
         _unitOfWork = unitOfWork;
-        _logger = logger;
     }
 
     /// <summary>

diff --git a/API/Controllers/ThemeController.cs b/API/Controllers/ThemeController.cs
@@ -53,7 +53,7 @@ public async Task<ActionResult> UpdateDefault(UpdateDefaultThemeDto dto)
         {
             await _themeService.UpdateDefault(dto.ThemeId);
         }
-        catch (KavitaException ex)
+        catch (KavitaException)
         {
             return BadRequest(await _localizationService.Translate(User.GetUserId(), "theme-doesnt-exist"));
         }

diff --git a/API/DTOs/Account/LoginDto.cs b/API/DTOs/Account/LoginDto.cs
@@ -1,4 +1,5 @@
 namespace API.DTOs.Account;
+#nullable enable
 
 public class LoginDto
 {

diff --git a/API/DTOs/Filtering/FilterDto.cs b/API/DTOs/Filtering/FilterDto.cs
@@ -3,6 +3,7 @@
 using API.Entities.Enums;
 
 namespace API.DTOs.Filtering;
+#nullable enable
 
 public class FilterDto
 {

diff --git a/API/DTOs/Filtering/Range.cs b/API/DTOs/Filtering/Range.cs
@@ -1,4 +1,6 @@
 namespace API.DTOs.Filtering;
+#nullable enable
+
 /// <summary>
 /// Represents a range between two int/float/double
 /// </summary>

diff --git a/API/DTOs/Filtering/v2/FilterV2Dto.cs b/API/DTOs/Filtering/v2/FilterV2Dto.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 
-
 namespace API.DTOs.Filtering.v2;
-
-
+#nullable enable
 
 /// <summary>
 /// Metadata filtering for v2 API only

diff --git a/API/DTOs/LibraryDto.cs b/API/DTOs/LibraryDto.cs
@@ -4,6 +4,7 @@
 using API.Entities.Enums;
 
 namespace API.DTOs;
+#nullable enable
 
 public class LibraryDto
 {

diff --git a/API/DTOs/MemberDto.cs b/API/DTOs/MemberDto.cs
@@ -3,6 +3,7 @@
 using API.DTOs.Account;
 
 namespace API.DTOs;
+#nullable enable
 
 /// <summary>
 /// Represents a member of a Kavita server.