Bump Microsoft.EntityFrameworkCore.Tools from 6.0.9 to 6.0.10

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # Joshua must review all changes to deployment and build.sh
-.ci/*           @joshuaboniface
-deployment/*    @joshuaboniface
-build.sh        @joshuaboniface
+.ci/*           @dannymichel
+deployment/*    @dannymichel
+build.sh        @dannymichel

.github/workflows/automation.yml

@@ -11,7 +11,7 @@ jobs:
   label:
     name: Labeling
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'jellyfin/jellyfin' }}
+    if: ${{ github.repository == 'vesoapp/veso' }}
     steps:
       - name: Apply label
         uses: eps1lon/actions-label-merge-conflict@v2.0.1
@@ -23,7 +23,7 @@ jobs:
   project:
     name: Project board
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'jellyfin/jellyfin' }}
+    if: ${{ github.repository == 'vesoapp/veso' }}
     steps:
       - name: Remove from 'Current Release' project
         uses: alex-page/github-project-automation-plus@v0.8.1

.gitignore

@@ -281,3 +281,4 @@ apiclient/generated
 
 # Omnisharp crash logs
 mono_crash.*.json
+.DS_Store

Dockerfile

@@ -7,8 +7,8 @@ ARG DOTNET_VERSION=6.0
 FROM node:lts-alpine as web-builder
 ARG JELLYFIN_WEB_VERSION=master
 RUN apk add curl git zlib zlib-dev autoconf g++ make libpng-dev gifsicle alpine-sdk automake libtool make gcc musl-dev nasm python3 \
- && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
- && cd jellyfin-web-* \
+ && curl -L https://github.com/vesoapp/veso-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
+ && cd veso-web-* \
  && npm ci --no-audit --unsafe-perm \
  && mv dist /dist
 

Dockerfile.arm

@@ -8,8 +8,8 @@ ARG DOTNET_VERSION=6.0
 FROM node:lts-alpine as web-builder
 ARG JELLYFIN_WEB_VERSION=master
 RUN apk add curl git zlib zlib-dev autoconf g++ make libpng-dev gifsicle alpine-sdk automake libtool make gcc musl-dev nasm python3 \
- && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
- && cd jellyfin-web-* \
+ && curl -L https://github.com/vesoapp/veso-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
+ && cd veso-web-* \
  && npm ci --no-audit --unsafe-perm \
  && mv dist /dist
 

Dockerfile.arm64

@@ -8,8 +8,8 @@ ARG DOTNET_VERSION=6.0
 FROM node:lts-alpine as web-builder
 ARG JELLYFIN_WEB_VERSION=master
 RUN apk add curl git zlib zlib-dev autoconf g++ make libpng-dev gifsicle alpine-sdk automake libtool make gcc musl-dev nasm python3 \
- && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
- && cd jellyfin-web-* \
+ && curl -L https://github.com/vesoapp/veso-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
+ && cd veso-web-* \
  && npm ci --no-audit --unsafe-perm \
  && mv dist /dist
 

Emby.Server.Implementations/ApplicationHost.cs

@@ -83,7 +83,6 @@
 using MediaBrowser.Controller.TV;
 using MediaBrowser.LocalMetadata.Savers;
 using MediaBrowser.MediaEncoding.BdInfo;
-using MediaBrowser.MediaEncoding.Subtitles;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Globalization;
@@ -633,8 +632,7 @@ protected virtual void RegisterServices(IServiceCollection serviceCollection)
             serviceCollection.AddSingleton<IAuthService, AuthService>();
             serviceCollection.AddSingleton<IQuickConnect, QuickConnectManager>();
 
-            serviceCollection.AddSingleton<ISubtitleParser, SubtitleEditParser>();
-            serviceCollection.AddSingleton<ISubtitleEncoder, SubtitleEncoder>();
+            serviceCollection.AddSingleton<ISubtitleEncoder, MediaBrowser.MediaEncoding.Subtitles.SubtitleEncoder>();
 
             serviceCollection.AddSingleton<IAttachmentExtractor, MediaBrowser.MediaEncoding.Attachments.AttachmentExtractor>();
 

Emby.Server.Implementations/Session/SessionManager.cs

@@ -19,6 +19,7 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Authentication;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
@@ -56,6 +57,7 @@ public class SessionManager : ISessionManager, IDisposable
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly IServerApplicationHost _appHost;
         private readonly IDeviceManager _deviceManager;
+        private readonly IServerConfigurationManager _config;
 
         /// <summary>
         /// The active connections.
@@ -78,7 +80,8 @@ public class SessionManager : ISessionManager, IDisposable
             IImageProcessor imageProcessor,
             IServerApplicationHost appHost,
             IDeviceManager deviceManager,
-            IMediaSourceManager mediaSourceManager)
+            IMediaSourceManager mediaSourceManager,
+            IServerConfigurationManager config)
         {
             _logger = logger;
             _eventManager = eventManager;
@@ -91,6 +94,7 @@ public class SessionManager : ISessionManager, IDisposable
             _appHost = appHost;
             _deviceManager = deviceManager;
             _mediaSourceManager = mediaSourceManager;
+            _config = config;
 
             _deviceManager.DeviceOptionsUpdated += OnDeviceManagerDeviceOptionsUpdated;
         }
@@ -728,12 +732,22 @@ private void OnPlaybackStart(User user, BaseItem item)
         {
             var data = _userDataManager.GetUserData(user, item);
 
-            data.PlayCount++;
-            data.LastPlayedDate = DateTime.UtcNow;
+            if (!_config.Configuration.UpdateLastPlayedAndPlayCountOnPlayCompletion)
+            {
+                data.PlayCount++;
+                data.LastPlayedDate = DateTime.UtcNow;
+            }
 
-            if (item.SupportsPlayedStatus && !item.SupportsPositionTicksResume)
+            if (item.SupportsPlayedStatus)
             {
-                data.Played = true;
+                if (!item.SupportsPositionTicksResume)
+                {
+                    data.Played = true;
+                }
+                else if (_config.Configuration.MarkResumableItemUnplayedOnPlay)
+                {
+                    data.Played = false;
+                }
             }
             else
             {
@@ -1008,6 +1022,11 @@ private bool OnPlaybackStopped(User user, BaseItem item, long? positionTicks, bo
                 if (positionTicks.HasValue)
                 {
                     playedToCompletion = _userDataManager.UpdatePlayState(item, data, positionTicks.Value);
+                    if (playedToCompletion && _config.Configuration.UpdateLastPlayedAndPlayCountOnPlayCompletion)
+                    {
+                        data.PlayCount++;
+                        data.LastPlayedDate = DateTime.UtcNow;
+                    }
                 }
                 else
                 {

Emby.Server.Implementations/TV/TVSeriesManager.cs

@@ -260,6 +260,30 @@ Episode GetEpisode()
                         consideredEpisodes.Add(lastWatchedEpisode);
                     }
 
+                    if (rewatching)
+                    {
+                        lastQuery.ParentIndexNumberNotEquals = null;
+                        lastQuery.ParentIndexNumber = 0;
+                        Episode lastWatchedSpecialEpisode = _libraryManager.GetItemList(lastQuery).Cast<Episode>().FirstOrDefault();
+
+                        if (lastWatchedEpisode != null && lastWatchedSpecialEpisode != null)
+                        {
+                            // both regular and special episodes have been watched
+                            // compare viewing dates to find latest watched
+                            // if special was more recently watched, replace lastWatchedEpisode with special
+                            var userDataRegular = _userDataManager.GetUserData(user, lastWatchedEpisode);
+                            var userDataSpecial = _userDataManager.GetUserData(user, lastWatchedSpecialEpisode);
+                            if (userDataSpecial.LastPlayedDate > userDataRegular.LastPlayedDate)
+                            {
+                                lastWatchedEpisode = lastWatchedSpecialEpisode;
+                                // get next regular episode based on recently watched special
+                                nextQuery.MinSortName = null;
+                                nextQuery.MinPremiereDate = lastWatchedEpisode.PremiereDate;
+                                nextEpisode = _libraryManager.GetItemList(nextQuery).Cast<Episode>().FirstOrDefault();
+                            }
+                        }
+                    }
+
                     if (nextEpisode != null)
                     {
                         consideredEpisodes.Add(nextEpisode);

Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj

@@ -33,7 +33,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

MediaBrowser.Controller/Entities/UserViewBuilder.cs

@@ -126,7 +126,7 @@ public QueryResult<BaseItem> GetUserItems(Folder queryParent, Folder displayPare
 
         private int GetSpecialItemsLimit()
         {
-            return 50;
+            return 100;
         }
 
         private QueryResult<BaseItem> GetMovieFolders(Folder parent, User user, InternalItemsQuery query)

MediaBrowser.MediaEncoding/Subtitles/AssParser.cs

@@ -0,0 +1,19 @@
+using Microsoft.Extensions.Logging;
+using Nikse.SubtitleEdit.Core.SubtitleFormats;
+
+namespace MediaBrowser.MediaEncoding.Subtitles
+{
+    /// <summary>
+    /// Advanced SubStation Alpha subtitle parser.
+    /// </summary>
+    public class AssParser : SubtitleEditParser<AdvancedSubStationAlpha>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AssParser"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        public AssParser(ILogger logger) : base(logger)
+        {
+        }
+    }
+}

MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs

@@ -1,6 +1,7 @@
 #pragma warning disable CS1591
 
 using System.IO;
+using System.Threading;
 using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
@@ -11,15 +12,8 @@ public interface ISubtitleParser
         /// Parses the specified stream.
         /// </summary>
         /// <param name="stream">The stream.</param>
-        /// <param name="fileExtension">The file extension.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>SubtitleTrackInfo.</returns>
-        SubtitleTrackInfo Parse(Stream stream, string fileExtension);
-
-        /// <summary>
-        /// Determines whether the file extension is supported by the parser.
-        /// </summary>
-        /// <param name="fileExtension">The file extension.</param>
-        /// <returns>A value indicating whether the file extension is supported.</returns>
-        bool SupportsFileExtension(string fileExtension);
+        SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken);
     }
 }

MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs

@@ -0,0 +1,19 @@
+using Microsoft.Extensions.Logging;
+using Nikse.SubtitleEdit.Core.SubtitleFormats;
+
+namespace MediaBrowser.MediaEncoding.Subtitles
+{
+    /// <summary>
+    /// SubRip subtitle parser.
+    /// </summary>
+    public class SrtParser : SubtitleEditParser<SubRip>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SrtParser"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        public SrtParser(ILogger logger) : base(logger)
+        {
+        }
+    }
+}

MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs

@@ -0,0 +1,19 @@
+using Microsoft.Extensions.Logging;
+using Nikse.SubtitleEdit.Core.SubtitleFormats;
+
+namespace MediaBrowser.MediaEncoding.Subtitles
+{
+    /// <summary>
+    /// SubStation Alpha subtitle parser.
+    /// </summary>
+    public class SsaParser : SubtitleEditParser<SubStationAlpha>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SsaParser"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        public SsaParser(ILogger logger) : base(logger)
+        {
+        }
+    }
+}