From 740578b9dc68afd0b6a01a897a08f34c4667a893 Mon Sep 17 00:00:00 2001 From: "Abdulmhsen B. A. A" Date: Tue, 30 Apr 2024 16:27:06 +0300 Subject: [PATCH] Bypass state check if force-full flag is set. --- src/Libs/Mappers/Import/DirectMapper.php | 2 +- src/Libs/Mappers/Import/MemoryMapper.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Libs/Mappers/Import/DirectMapper.php b/src/Libs/Mappers/Import/DirectMapper.php index 9945ebdb..02ffa5c7 100644 --- a/src/Libs/Mappers/Import/DirectMapper.php +++ b/src/Libs/Mappers/Import/DirectMapper.php @@ -505,7 +505,7 @@ final class DirectMapper implements iImport * 2- if the db.metadata.backend.played_at is equal to entity.updated or the db.metadata has no data. * 3 - mark entity as tainted and re-process it. */ - if (true === $cloned->isWatched() && false === $entity->isWatched()) { + if (true === $hasAfter && true === $cloned->isWatched() && false === $entity->isWatched()) { $message = 'MAPPER: Watch state conflict detected in [{backend}: {title}] [{new_state}] vs db [{id}: {current_state}].'; $hasMeta = count($cloned->getMetadata($entity->via)) >= 1; $hasDate = $entity->updated === ag($cloned->getMetadata($entity->via), iState::COLUMN_META_DATA_PLAYED_AT); diff --git a/src/Libs/Mappers/Import/MemoryMapper.php b/src/Libs/Mappers/Import/MemoryMapper.php index dd293b3c..4da28aad 100644 --- a/src/Libs/Mappers/Import/MemoryMapper.php +++ b/src/Libs/Mappers/Import/MemoryMapper.php @@ -396,7 +396,7 @@ final class MemoryMapper implements iImport * 2- if the db.metadata.backend.played_at is equal to entity.updated or the db.metadata has no data. * 3 - mark entity as tainted and re-process it. */ - if (true === $cloned->isWatched() && false === $entity->isWatched()) { + if (true === $hasAfter && true === $cloned->isWatched() && false === $entity->isWatched()) { $message = 'MAPPER: Watch state conflict detected in [{backend}: {title}] [{new_state}] vs db [{id}: {current_state}].'; $hasMeta = count($cloned->getMetadata($entity->via)) >= 1; $hasDate = $entity->updated === ag($cloned->getMetadata($entity->via), iState::COLUMN_META_DATA_PLAYED_AT);