Update to Jellyfin 10.8.0

danieladov · Jan 27, 2022 · 45ba528 · 45ba528
1 parent f2d4c49
commit 45ba528
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/Jellyfin.Plugin.MergeVersions/Api/MergeVersionsController.cs b/Jellyfin.Plugin.MergeVersions/Api/MergeVersionsController.cs
@@ -13,12 +13,9 @@
 using Jellyfin.Api.Helpers;
 
 using System.Net.Mime;
-using MediaBrowser.Controller.Collections;
-using MediaBrowser.Controller.Library;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Plugin.MergeVersions.Api
 { 

diff --git a/Jellyfin.Plugin.MergeVersions/Jellyfin.Plugin.MergeVersions.csproj b/Jellyfin.Plugin.MergeVersions/Jellyfin.Plugin.MergeVersions.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>true</IsPackable>
-    <AssemblyVersion>10.7.7.0</AssemblyVersion>
-    <FileVersion>10.7.7.0</FileVersion>
+    <AssemblyVersion>10.8.0.0</AssemblyVersion>
+    <FileVersion>10.8.0.0</FileVersion>
     <Authors />
     <Company />
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jellyfin.Controller" Version="10.6.0" />
+    <PackageReference Include="Jellyfin.Controller" Version="10.8.0-alpha5" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0" />
     <PackageReference Include="SQLitePCL.pretty.netstandard" Version="2.1.0" />
@@ -23,10 +23,7 @@
 
   <ItemGroup>
     <Reference Include="Jellyfin.Api">
-      <HintPath>..\..\jellyfin\Jellyfin.Api\bin\Debug\net5.0\Jellyfin.Api.dll</HintPath>
-    </Reference>
-    <Reference Include="MediaBrowser.Api">
-      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\Jellyfin\Server\MediaBrowser.Api.dll</HintPath>
+      <HintPath>..\..\jellyfin\Jellyfin.Api\bin\Debug\net6.0\Jellyfin.Api.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/Jellyfin.Plugin.MergeVersions/MergeVersionsManager.cs b/Jellyfin.Plugin.MergeVersions/MergeVersionsManager.cs
@@ -20,6 +20,7 @@
 using Microsoft.Extensions.Logging;
 using Jellyfin.Api.Controllers;
 using Jellyfin.Api.Helpers;
+using Jellyfin.Data.Enums;
 
 
 
@@ -59,8 +60,20 @@ TranscodingJobHelper transcodingJobHelper
             _userManager = userManager;
             _logger = logger;
             _timer = new Timer(_ => OnTimerElapsed(), null, Timeout.Infinite, Timeout.Infinite);
-            _videosController = new VideosController(_libraryManager, _userManager, dtoService, dlnaManager, authContext,
-                mediaSourceManager, serverConfigurationManager, mediaEncoder, fileSystem, subtitleEncoder, null, deviceManager, transcodingJobHelper, null);
+            _videosController = new VideosController(
+                _libraryManager,
+                _userManager,
+                dtoService,
+                dlnaManager,
+                authContext,
+                mediaSourceManager, 
+                serverConfigurationManager, 
+                mediaEncoder, 
+                deviceManager,
+                transcodingJobHelper,
+                null,
+                null
+                );
 
 
                _fileSystem = fileSystem;       
@@ -72,7 +85,7 @@ private IEnumerable<Movie> GetMoviesFromLibrary()
         {
             var movies = _libraryManager.GetItemList(new InternalItemsQuery
             {
-                IncludeItemTypes = new[] {nameof(Movie)},
+                IncludeItemTypes = new[] { BaseItemKind.Movie },
                 IsVirtualItem = false,
                 Recursive = true,
                 HasTmdbId = true,
@@ -88,7 +101,7 @@ private IEnumerable<Episode> GetEpisodesFromLibrary()
 		{
             var episodes = _libraryManager.GetItemList(new InternalItemsQuery
             {
-                IncludeItemTypes = new[] { nameof(Episode) },
+                IncludeItemTypes = new[] { BaseItemKind.Episode},
                 IsVirtualItem = false,
                 Recursive = true,