From 98472b5aa638ab2239fda2a9114d8331cc12e1f0 Mon Sep 17 00:00:00 2001
From: DarkFighterLuke <luca-consoli@live.it>
Date: Fri, 21 Feb 2025 17:41:51 +0100
Subject: [PATCH 1/5] Fix JF->TA watched status synchronization

---
 Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs b/Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs
index bf21ab0..d3f3881 100644
--- a/Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs
+++ b/Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs
@@ -173,7 +173,7 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata
         private async void OnWatchedStatusChange(object? sender, UserDataSaveEventArgs eventArgs)
         {
             var user = _userManager.GetUserById(eventArgs.UserId);
-            if (user != null && Configuration.GetJFUsernamesToArray().Contains(user!.Username))
+            if (Configuration.JFTASync && user != null && Configuration.GetJFUsernamesToArray().Contains(user!.Username))
             {
                 var isPlayed = eventArgs.Item.IsPlayed(user);
                 Logger.LogDebug("User {UserId} changed watched status to {Status} for the item {ItemName}", eventArgs.UserId, isPlayed, eventArgs.Item.Name);

From 16598bb86e878a88862f5494e197756e7030e3ec Mon Sep 17 00:00:00 2001
From: DarkFighterLuke <luca-consoli@live.it>
Date: Fri, 21 Feb 2025 17:42:58 +0100
Subject: [PATCH 2/5] Adapt to the new TA API changes

---
 .../TubeArchivist/TubeArchivistApi.cs         | 25 ++++++++-----------
 .../TubeArchivist/Video/Player.cs             | 22 +++++-----------
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/Jellyfin.Plugin.TubeArchivistMetadata/TubeArchivist/TubeArchivistApi.cs b/Jellyfin.Plugin.TubeArchivistMetadata/TubeArchivist/TubeArchivistApi.cs
index df6d363..18e4672 100644
--- a/Jellyfin.Plugin.TubeArchivistMetadata/TubeArchivist/TubeArchivistApi.cs
+++ b/Jellyfin.Plugin.TubeArchivistMetadata/TubeArchivist/TubeArchivistApi.cs
@@ -65,7 +65,7 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.TubeArchivist
         /// <returns>A task.</returns>
         public async Task<Channel?> GetChannel(string channelId)
         {
-            ResponseContainer<Channel>? channel = null;
+            Channel? channel = null;
 
             var channelsEndpoint = "/api/channel/";
             var url = new Uri(Utils.SanitizeUrl(Plugin.Instance?.Configuration.TubeArchivistUrl + channelsEndpoint + channelId));
@@ -82,10 +82,10 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.TubeArchivist
             if (response.IsSuccessStatusCode)
             {
                 string rawData = await response.Content.ReadAsStringAsync().ConfigureAwait(true);
-                channel = JsonConvert.DeserializeObject<ResponseContainer<Channel>>(rawData);
+                channel = JsonConvert.DeserializeObject<Channel>(rawData);
             }
 
-            return channel?.Data;
+            return channel;
         }
 
         /// <summary>
@@ -95,7 +95,7 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.TubeArchivist
         /// <returns>A task.</returns>
         public async Task<Video?> GetVideo(string videoId)
         {
-            ResponseContainer<Video>? video = null;
+            Video? video = null;
 
             var videosEndpoint = "/api/video/";
             var url = new Uri(Utils.SanitizeUrl(Plugin.Instance?.Configuration.TubeArchivistUrl + videosEndpoint + videoId));
@@ -112,10 +112,11 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.TubeArchivist
             if (response.IsSuccessStatusCode)
             {
                 string rawData = await response.Content.ReadAsStringAsync().ConfigureAwait(true);
-                video = JsonConvert.DeserializeObject<ResponseContainer<Video>>(rawData);
+                _logger.LogInformation("{Message}", rawData);
+                video = JsonConvert.DeserializeObject<Video>(rawData);
             }
 
-            return video?.Data;
+            return video;
         }
 
         /// <summary>
@@ -174,15 +175,11 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.TubeArchivist
         {
             Progress? progress = null;
 
-            var progressEndpoint = $"/api/video/{videoId}/progress/";
-            var url = new Uri(Utils.SanitizeUrl(Plugin.Instance!.Configuration.TubeArchivistUrl + progressEndpoint));
-
-            var response = await client.GetAsync(url).ConfigureAwait(true);
-
-            if (response.IsSuccessStatusCode)
+            var video = await GetVideo(videoId).ConfigureAwait(true);
+            if (video != null)
             {
-                string rawData = await response.Content.ReadAsStringAsync().ConfigureAwait(true);
-                progress = JsonConvert.DeserializeObject<Progress>(rawData);
+                progress = new Progress((long)video.Player.Position);
+                _logger.LogInformation("{Message}", $"Retrieved progress {video.Player.Position}");
             }
 
             return progress;
diff --git a/Jellyfin.Plugin.TubeArchivistMetadata/TubeArchivist/Video/Player.cs b/Jellyfin.Plugin.TubeArchivistMetadata/TubeArchivist/Video/Player.cs
index 3689c7c..2e888c1 100644
--- a/Jellyfin.Plugin.TubeArchivistMetadata/TubeArchivist/Video/Player.cs
+++ b/Jellyfin.Plugin.TubeArchivistMetadata/TubeArchivist/Video/Player.cs
@@ -1,4 +1,3 @@
-using System;
 using Newtonsoft.Json;
 
 namespace Jellyfin.Plugin.TubeArchivistMetadata.TubeArchivist
@@ -13,12 +12,12 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.TubeArchivist
         /// </summary>
         /// <param name="duration">Duration of the video.</param>
         /// <param name="isWatched">Whether the video is marked as watched.</param>
-        /// <param name="watchedUnixTime">Unix time of when the video has been marked watched.</param>
-        public Player(long duration, bool isWatched, long watchedUnixTime)
+        /// <param name="position">Video watched seconds.</param>
+        public Player(long duration, bool isWatched, double position)
         {
             Duration = duration;
             IsWatched = isWatched;
-            WatchedUnixTime = watchedUnixTime;
+            Position = position;
         }
 
         /// <summary>
@@ -34,18 +33,9 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.TubeArchivist
         public bool IsWatched { get; }
 
         /// <summary>
-        /// Gets the Unix date and time when the video has been marked as watched.
+        /// Gets the video watched seconds.
         /// </summary>
-        [JsonProperty(PropertyName = "watched_date")]
-        public long WatchedUnixTime { get; }
-
-        /// <summary>
-        /// Gets the date and time when the video has been marked as watched.
-        /// </summary>
-        [JsonIgnore]
-        public DateTime WatchedTime
-        {
-            get => DateTimeOffset.FromUnixTimeSeconds(WatchedUnixTime).DateTime;
-        }
+        [JsonProperty(PropertyName = "position")]
+        public double Position { get; }
     }
 }

From a424721d9368f90a3628b162357324fd797776af Mon Sep 17 00:00:00 2001
From: DarkFighterLuke <31162436+DarkFighterLuke@users.noreply.github.com>
Date: Sat, 22 Feb 2025 15:14:11 +0100
Subject: [PATCH 3/5] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1062b62..99cc1c1 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
 
 > [!IMPORTANT]
 > Jellyfin release cycle has changed in the past few months and now it is shorter than before. The plugin supports only the latest Jellyfin release, in order to continue using this plugin with all the latest features you will need to upgrade your Jellyfin installation.
+> The same rule applies to TubeArchivist: the plugin is only guaranteed to work with the latest TubeArchivist version.
 
 ## About
 

From 4db1ce755a1d26a87a8ce2d632875393caef958c Mon Sep 17 00:00:00 2001
From: DarkFighterLuke <luca-consoli@live.it>
Date: Sat, 22 Feb 2025 15:15:54 +0100
Subject: [PATCH 4/5] Update build.yaml

---
 build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.yaml b/build.yaml
index 1099e1c..100e397 100644
--- a/build.yaml
+++ b/build.yaml
@@ -2,7 +2,7 @@
 name: "TubeArchivistMetadata"
 guid: "dc97d0c6-28b0-4242-afb4-5833ae1b3715"
 imageUrl: https://raw.githubusercontent.com/tubearchivist/tubearchivist-jf-plugin/master/images/logo.png
-version: "1.3.4.0"
+version: "1.3.5.0"
 targetAbi: "10.10.0.0"
 framework: "net8.0"
 overview: "Metadata for your TubeArchivist library on Jellyfin"
@@ -14,4 +14,4 @@ owner: "DarkFighterLuke"
 artifacts:
 - "Jellyfin.Plugin.TubeArchivistMetadata.dll"
 changelog: >
-  Merge workaround for JF crashing when scanning Series pull request by wolffshots
+  Adapt to the new TA API changes

From 11eb456c56047d54df0f73af66db076507081b75 Mon Sep 17 00:00:00 2001
From: DarkFighterLuke <luca-consoli@live.it>
Date: Sat, 22 Feb 2025 15:37:33 +0100
Subject: [PATCH 5/5] Fix JF crash when setting watched status with TA offline

---
 Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs | 13 ++++++++++---
 build.yaml                                      |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs b/Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs
index d3f3881..386948b 100644
--- a/Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs
+++ b/Jellyfin.Plugin.TubeArchivistMetadata/Plugin.cs
@@ -199,10 +199,17 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata
                     return;
                 }
 
-                var statusCode = await TubeArchivistApi.GetInstance().SetWatchedStatus(itemYTId, isPlayed).ConfigureAwait(true);
-                if (statusCode != System.Net.HttpStatusCode.OK)
+                try
                 {
-                    Logger.LogCritical("POST /watched returned {StatusCode} for item {ItemName} ({VideoYTId}) with watched status {IsPlayed}", statusCode, eventArgs.Item.Name, itemYTId, isPlayed);
+                    var statusCode = await TubeArchivistApi.GetInstance().SetWatchedStatus(itemYTId, isPlayed).ConfigureAwait(true);
+                    if (statusCode != System.Net.HttpStatusCode.OK)
+                    {
+                        Logger.LogCritical("POST /watched returned {StatusCode} for item {ItemName} ({VideoYTId}) with watched status {IsPlayed}", statusCode, eventArgs.Item.Name, itemYTId, isPlayed);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogCritical("An exception occurred while calling POST /watched for item {ItemName} ({VideoYTId}) with watched status {IsPlayed}: {ExceptionMessage}", eventArgs.Item.Name, itemYTId, isPlayed, ex.Message);
                 }
             }
         }
diff --git a/build.yaml b/build.yaml
index 100e397..4c79ed1 100644
--- a/build.yaml
+++ b/build.yaml
@@ -15,3 +15,4 @@ artifacts:
 - "Jellyfin.Plugin.TubeArchivistMetadata.dll"
 changelog: >
   Adapt to the new TA API changes
+  Fix JF crash when setting watched status with TA offline