Merge branch 'master' into fix-on-watched-status-changed
This commit is contained in:
@@ -155,11 +155,11 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.Tasks
|
|||||||
var videoYTId = Utils.GetVideoNameFromPath(video.Path);
|
var videoYTId = Utils.GetVideoNameFromPath(video.Path);
|
||||||
_logger.LogDebug("Current video extracted YouTube id: {VideoYtId}", videoYTId);
|
_logger.LogDebug("Current video extracted YouTube id: {VideoYtId}", videoYTId);
|
||||||
HttpStatusCode statusCode;
|
HttpStatusCode statusCode;
|
||||||
var userItemData = _userDataManager.GetUserData(user, channel);
|
var channelItemData = _userDataManager.GetUserData(user, channel);
|
||||||
|
|
||||||
if (!isChannelCheckedForWatched && channel.IsPlayed(user, userItemData))
|
if (!isChannelCheckedForWatched && channel.IsPlayed(user, channelItemData))
|
||||||
{
|
{
|
||||||
var isChannelPlayed = channel.IsPlayed(user, userItemData);
|
var isChannelPlayed = channel.IsPlayed(user, channelItemData);
|
||||||
statusCode = await taApi.SetWatchedStatus(channelYTId, isChannelPlayed).ConfigureAwait(true);
|
statusCode = await taApi.SetWatchedStatus(channelYTId, isChannelPlayed).ConfigureAwait(true);
|
||||||
if (statusCode != System.Net.HttpStatusCode.OK)
|
if (statusCode != System.Net.HttpStatusCode.OK)
|
||||||
{
|
{
|
||||||
@@ -173,13 +173,26 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.Tasks
|
|||||||
isChannelCheckedForWatched = true;
|
isChannelCheckedForWatched = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var videoItemData = _userDataManager.GetUserData(user, video);
|
||||||
if (!isChannelWatched)
|
if (!isChannelWatched)
|
||||||
{
|
{
|
||||||
var isVideoPlayed = video.IsPlayed(user, userItemData);
|
var isVideoPlayed = video.IsPlayed(user, videoItemData);
|
||||||
statusCode = await taApi.SetWatchedStatus(videoYTId, isVideoPlayed).ConfigureAwait(true);
|
var taVideo = await taApi.GetVideo(videoYTId).ConfigureAwait(true);
|
||||||
if (statusCode != System.Net.HttpStatusCode.OK)
|
if (taVideo != null)
|
||||||
{
|
{
|
||||||
_logger.LogCritical("{Message}", $"POST /watched returned {statusCode} for video {video.Name} ({videoYTId}) with wacthed status {isVideoPlayed}");
|
var isTAVideoPlayed = taVideo?.Player.IsWatched ?? false;
|
||||||
|
if (isTAVideoPlayed != isVideoPlayed)
|
||||||
|
{
|
||||||
|
statusCode = await taApi.SetWatchedStatus(videoYTId, isVideoPlayed).ConfigureAwait(true);
|
||||||
|
if (statusCode != System.Net.HttpStatusCode.OK)
|
||||||
|
{
|
||||||
|
_logger.LogCritical("{Message}", $"POST /watched returned {statusCode} for video {video.Name} ({videoYTId}) with wacthed status {isVideoPlayed}");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Video {VideoId} watch status marked as {Status} in TubeArchivist", videoYTId, isVideoPlayed);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger.LogDebug("{Message}", isVideoPlayed);
|
_logger.LogDebug("{Message}", isVideoPlayed);
|
||||||
|
|||||||
Reference in New Issue
Block a user