Fix entry_dedupe bug causing the flag of the newest entry to be set t…

…o False, even if it was true before. Found during to #140. Likely introduced in #254.
lemon24 · Oct 11, 2021 · b43d065 · b43d065
1 parent a66a302
commit b43d065
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/reader/plugins/entry_dedupe.py b/src/reader/plugins/entry_dedupe.py
@@ -348,12 +348,13 @@ def by_title(e):
 
 
 def _get_flag_args(entry, duplicates, name):
-    flag = any(getattr(d, name) for d in duplicates)
+    entries = duplicates + [entry]
+    flag = any(getattr(d, name) for d in entries)
 
     modified_name = f'{name}_modified'
     modifieds = (
         getattr(e, modified_name)
-        for e in duplicates + [entry]
+        for e in entries
         if getattr(e, name) == flag and getattr(e, modified_name)
     )
     modified = next(iter(sorted(modifieds)), None)

diff --git a/tests/test_plugins_entry_dedupe.py b/tests/test_plugins_entry_dedupe.py
@@ -409,7 +409,7 @@ def test_read_modified_copying(make_reader, db_path, data, expected, same_last_u
             (9, False, None),
         ],
     ),
-    # important, no modified
+    # old important, no modified
     (
         [
             (1, True, None),
@@ -419,6 +419,16 @@ def test_read_modified_copying(make_reader, db_path, data, expected, same_last_u
             (9, True, None),
         ],
     ),
+    # new important, no modified
+    (
+        [
+            (1, False, None),
+            (9, True, None),
+        ],
+        [
+            (9, True, None),
+        ],
+    ),
     # none important, modified
     (
         [
@@ -449,7 +459,7 @@ def test_read_modified_copying(make_reader, db_path, data, expected, same_last_u
             (9, False, datetime(2010, 1, 1)),
         ],
     ),
-    # important, modified
+    # old important, modified
     (
         [
             (1, True, datetime(2010, 1, 1)),
@@ -459,6 +469,16 @@ def test_read_modified_copying(make_reader, db_path, data, expected, same_last_u
             (9, True, datetime(2010, 1, 1)),
         ],
     ),
+    # new important, old modified
+    (
+        [
+            (1, False, datetime(2010, 1, 1)),
+            (9, True, None),
+        ],
+        [
+            (9, True, None),
+        ],
+    ),
 ]