Merge pull request #4526 from crobibero/mark-played

Fix marking item as played

Jellyfin.Api/Controllers/PlaystateController.cs

@@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Helpers;
+using Jellyfin.Api.ModelBinders;
 using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
@@ -74,7 +75,7 @@ namespace Jellyfin.Api.Controllers
         public ActionResult<UserItemDataDto> MarkPlayedItem(
             [FromRoute, Required] Guid userId,
             [FromRoute, Required] Guid itemId,
-            [FromQuery] DateTime? datePlayed)
+            [FromQuery, ModelBinder(typeof(LegacyDateTimeModelBinder))] DateTime? datePlayed)
         {
             var user = _userManager.GetUserById(userId);
             var session = RequestHelpers.GetSession(_sessionManager, _authContext, Request);

Jellyfin.Api/ModelBinders/LegacyDateTimeModelBinder.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Api.ModelBinders
+{
+    /// <summary>
+    /// DateTime model binder.
+    /// </summary>
+    public class LegacyDateTimeModelBinder : IModelBinder
+    {
+        // Borrowed from the DateTimeModelBinderProvider
+        private const DateTimeStyles SupportedStyles = DateTimeStyles.AdjustToUniversal | DateTimeStyles.AllowWhiteSpaces;
+        private readonly DateTimeModelBinder _defaultModelBinder;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LegacyDateTimeModelBinder"/> class.
+        /// </summary>
+        /// <param name="loggerFactory">Instance of the <see cref="ILoggerFactory"/> interface.</param>
+        public LegacyDateTimeModelBinder(ILoggerFactory loggerFactory)
+        {
+            _defaultModelBinder = new DateTimeModelBinder(SupportedStyles, loggerFactory);
+        }
+
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
+            if (valueProviderResult.Values.Count == 1)
+            {
+                var dateTimeString = valueProviderResult.FirstValue;
+                // Mark Played Item.
+                if (DateTime.TryParseExact(dateTimeString, "yyyyMMddHHmmss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var dateTime))
+                {
+                    bindingContext.Result = ModelBindingResult.Success(dateTime);
+                }
+                else
+                {
+                    return _defaultModelBinder.BindModelAsync(bindingContext);
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

Jellyfin.Api/TypeConverters/DateTimeTypeConverter.cs

@@ -1,44 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-
-namespace Jellyfin.Api.TypeConverters
-{
-    /// <summary>
-    /// Custom datetime parser.
-    /// </summary>
-    public class DateTimeTypeConverter : TypeConverter
-    {
-        /// <inheritdoc />
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
-        {
-            if (sourceType == typeof(string))
-            {
-                return true;
-            }
-
-            return base.CanConvertFrom(context, sourceType);
-        }
-
-        /// <inheritdoc />
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
-        {
-            if (value is string dateString)
-            {
-                // Mark Played Item.
-                if (DateTime.TryParseExact(dateString, "yyyyMMddHHmmss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var dateTime))
-                {
-                    return dateTime;
-                }
-
-                // Get Activity Logs.
-                if (DateTime.TryParse(dateString, null, DateTimeStyles.RoundtripKind, out dateTime))
-                {
-                    return dateTime;
-                }
-            }
-
-            return base.ConvertFrom(context, culture, value);
-        }
-    }
-}

Jellyfin.Server/Startup.cs

@@ -1,8 +1,5 @@
-using System;
-using System.ComponentModel;
 using System.Net.Http.Headers;
 using System.Net.Mime;
-using Jellyfin.Api.TypeConverters;
 using Jellyfin.Server.Extensions;
 using Jellyfin.Server.Implementations;
 using Jellyfin.Server.Middleware;
@@ -164,9 +161,6 @@ namespace Jellyfin.Server
                     endpoints.MapHealthChecks("/health");
                 });
             });
-
-            // Add type descriptor for legacy datetime parsing.
-            TypeDescriptor.AddAttributes(typeof(DateTime?), new TypeConverterAttribute(typeof(DateTimeTypeConverter)));
         }
     }
 }