Support Jellyfin 12

.github/workflows/build.yaml

@@ -17,5 +17,5 @@ jobs:
   call:
     uses: jellyfin/jellyfin-meta-plugins/.github/workflows/build.yaml@master
     with:
-      dotnet-version: "9.0.*"
-      dotnet-target: "net9.0"
+      dotnet-version: "10.0.*"
+      dotnet-target: "net10.0"

.github/workflows/publish.yaml

@@ -10,8 +10,8 @@ jobs:
   build:
     uses: jellyfin/jellyfin-meta-plugins/.github/workflows/build.yaml@master
     with:
-      dotnet-version: "9.0.*"
-      dotnet-target: "net9.0"
+      dotnet-version: "10.0.*"
+      dotnet-target: "net10.0"
   upload:
     runs-on: ubuntu-latest
     needs:

.github/workflows/scan-codeql.yaml

@@ -9,5 +9,5 @@ jobs:
   call:
     uses: jellyfin/jellyfin-meta-plugins/.github/workflows/scan-codeql.yaml@master
     with:
-      dotnet-version: "9.0.*"
+      dotnet-version: "10.0.*"
       repository-name: Kevinjil/Jellyfin.Xtream

.github/workflows/test.yaml

@@ -17,4 +17,4 @@ jobs:
   call:
     uses: jellyfin/jellyfin-meta-plugins/.github/workflows/test.yaml@master
     with:    
-      dotnet-version: 9.0.x
+      dotnet-version: 10.0.x

Jellyfin.Xtream/CatchupChannel.cs

@@ -198,6 +198,7 @@ private async Task<ChannelItemResult> GetStreams(int categoryId, int channelId,
                         new()
                         {
                             ContentType = ChannelMediaContentType.TvExtra,
+                            DateModified = StreamService.MediaSourceRevision,
                             Id = StreamService.ToGuid(StreamService.CatchupStreamPrefix, channelId, 0, day).ToString(),
                             IsLiveStream = false,
                             MediaSources = [
@@ -226,6 +227,7 @@ private async Task<ChannelItemResult> GetStreams(int categoryId, int channelId,
             {
                 ContentType = ChannelMediaContentType.TvExtra,
                 DateCreated = epg.Start,
+                DateModified = StreamService.MediaSourceRevision,
                 Id = StreamService.ToGuid(StreamService.CatchupStreamPrefix, channel.StreamId, epg.Id, day).ToString(),
                 IsLiveStream = false,
                 MediaSources = sources,

Jellyfin.Xtream/Jellyfin.Xtream.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Jellyfin.Xtream</RootNamespace>
     <AssemblyVersion>0.8.1.0</AssemblyVersion>
     <FileVersion>0.8.1.0</FileVersion>
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jellyfin.Controller" Version="10.11.0" />
-    <PackageReference Include="Jellyfin.Model" Version="10.11.0" />
+    <PackageReference Include="Jellyfin.Controller" Version="12.0.0" />
+    <PackageReference Include="Jellyfin.Model" Version="12.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

Jellyfin.Xtream/SeriesChannel.cs

@@ -217,6 +217,7 @@ private ChannelItemInfo CreateChannelItemInfo(SeriesStreamInfo series, Season? s
         {
             ContentType = ChannelMediaContentType.Episode,
             DateCreated = episode.Added,
+            DateModified = StreamService.MediaSourceRevision,
             Genres = GetGenres(serie.Genre),
             Id = StreamService.ToGuid(StreamService.EpisodePrefix, 0, 0, episode.EpisodeId).ToString(),
             IndexNumber = episode.EpisodeNum,

Jellyfin.Xtream/Service/StreamService.cs

@@ -91,6 +91,13 @@ public partial class StreamService(IXtreamClient xtreamClient)
     /// </summary>
     public const int EpgPrefix = 0x5d774c3f;
 
+    /// <summary>
+    /// The time the media sources of channel items last changed shape.
+    /// Jellyfin only rewrites the sources it saved for a channel item when the item changes,
+    /// so channel media items carry this as their modification date.
+    /// </summary>
+    public static readonly DateTime MediaSourceRevision = new(2026, 9, 28, 0, 0, 0, DateTimeKind.Utc);
+
     private static readonly Regex _tagRegex = TagRegex();
 
     /// <summary>
@@ -399,7 +406,9 @@ public MediaSourceInfo GetMediaSourceInfo(
         {
             Container = extension,
             EncoderProtocol = MediaProtocol.Http,
-            Id = ToGuid(MediaSourcePrefix, (int)type, id, 0).ToString(),
+            // Jellyfin gives a channel source without an id the id of its item, which it requires since 12.0.
+            // Live TV keeps its own id, which identifies the restream to share.
+            Id = isLive ? ToGuid(MediaSourcePrefix, (int)type, id, 0).ToString() : null,
             IsInfiniteStream = isLive,
             IsRemote = true,
             MediaStreams =

Jellyfin.Xtream/VodChannel.cs

@@ -131,6 +131,7 @@ private Task<ChannelItemInfo> CreateChannelItemInfo(StreamInfo stream)
         {
             ContentType = ChannelMediaContentType.Movie,
             DateCreated = DateTimeOffset.FromUnixTimeSeconds(added).DateTime,
+            DateModified = StreamService.MediaSourceRevision,
             Id = $"{StreamService.StreamPrefix}{stream.StreamId}",
             ImageUrl = stream.StreamIcon,
             IsLiveStream = false,

build.yaml

@@ -2,8 +2,8 @@
 name: "Jellyfin Xtream"
 guid: "5d774c35-8567-46d3-a950-9bb8227a0c5d"
 version: "0.8.1.0"
-targetAbi: "10.11.0.0"
-framework: "net9.0"
+targetAbi: "12.0.0.0"
+framework: "net10.0"
 overview: "Stream content from an Xtream-compatible server."
 description: >
   Stream Live IPTV, Video On-Demand, and Series from an Xtream-compatible server using this plugin.

jellyfin.ruleset

@@ -100,6 +100,8 @@
         <Rule Id="CA1308" Action="None" />
         <!-- disable warning CA1848: Use the LoggerMessage delegates -->
         <Rule Id="CA1848" Action="None" />
+        <!-- disable warning CA1873: Avoid potentially expensive logging -->
+        <Rule Id="CA1873" Action="Info" />
         <!-- disable warning CA2101: Specify marshaling for P/Invoke string arguments -->
         <Rule Id="CA2101" Action="None" />
         <!-- disable warning CA2234: Pass System.Uri objects instead of strings -->