From 24bbf226a14304db30c7ed95ec3567fdde3e3a59 Mon Sep 17 00:00:00 2001
From: alfred82santa <alfred.santacatalinagea@telefonica.com>
Date: Sun, 14 Mar 2021 11:29:23 +0100
Subject: [PATCH] Sync reading state only for books on kobo shelves

---
 cps/kobo.py | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 141d745d..19122314 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -171,7 +171,7 @@ def HandleSyncRequest():
                             ub.BookShelf.date_added > sync_token.books_last_modified))
                 .filter(db.Data.format.in_(KOBO_FORMATS))
                 .order_by(db.Books.id)
-                .order_by('last_modified')
+                .order_by(ub.ArchivedBook.last_modified)
                 .join(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)
                 .join(ub.Shelf)
                 .filter(ub.Shelf.kobo_sync)
@@ -253,11 +253,36 @@ def HandleSyncRequest():
         books_last_id = -1
 
     # generate reading state data
+    changed_reading_states = ub.session.query(ub.KoboReadingState)
+
+    if only_kobo_shelves:
+        changed_reading_states = (
+            changed_reading_states.join(ub.BookShelf, ub.KoboReadingState.book_id == ub.BookShelf.book_id)
+            .join(ub.Shelf)
+            .filter(
+                ub.Shelf.kobo_sync,
+                or_(
+                    func.datetime(ub.KoboReadingState.last_modified) > sync_token.reading_state_last_modified,
+                    ub.BookShelf.date_added > sync_token.books_last_modified
+                )
+            )
+        ).distinct()
+
+    else:
+        changed_reading_states = (
+            changed_reading_states.filter(
+                func.datetime(ub.KoboReadingState.last_modified) > sync_token.reading_state_last_modified
+            )
+        )
     changed_reading_states = (
-        ub.session.query(ub.KoboReadingState)
-        .filter(and_(func.datetime(ub.KoboReadingState.last_modified) > sync_token.reading_state_last_modified,
-                     ub.KoboReadingState.user_id == current_user.id,
-                     ub.KoboReadingState.book_id.notin_(reading_states_in_new_entitlements))))
+        changed_reading_states.filter(
+            and_(
+                ub.KoboReadingState.user_id == current_user.id,
+                ub.KoboReadingState.book_id.notin_(reading_states_in_new_entitlements)
+            )
+        )
+    )
+
     for kobo_reading_state in changed_reading_states.all():
         book = calibre_db.session.query(db.Books).filter(db.Books.id == kobo_reading_state.book_id).one_or_none()
         if book: