Start adding hash on import/rename

Author: demitrix

root/app/calibre-web/cps/editbooks.py

@@ -48,6 +48,7 @@
 from .file_helper import validate_mime_type
 from .usermanagement import user_login_required, login_required_if_no_ano
 from .string_helper import strip_whitespaces
+from kosync import update_document_hash
 
 editbook = Blueprint('edit-book', __name__)
 log = logger.create()
@@ -145,7 +146,8 @@ def upload():
                     calibre_db.set_metadata_dirty(book_id)
                 # save data to database, reread data
                 calibre_db.session.commit()
-
+                # update document_hash for kosync
+                update_document_hash(book_id)
                 if config.config_use_google_drive:
                     gdriveutils.updateGdriveCalibreFromLocal()
                 if error:
@@ -307,6 +309,7 @@ def edit_list_book(param):
         book.last_modified = datetime.now(timezone.utc)
 
         calibre_db.session.commit()
+        update_document_hash(book.id)
         # revert change for sort if automatic fields link is deactivated
         if param == 'title' and vals.get('checkT') == "false":
             book.sort = sort_param
@@ -424,6 +427,7 @@ def table_xchange_author_title():
                 calibre_db.set_metadata_dirty(book.id)
             try:
                 calibre_db.session.commit()
+                update_document_hash(book.id)
             except (OperationalError, IntegrityError, StaleDataError) as e:
                 calibre_db.session.rollback()
                 log.error_or_exception("Database error: {}".format(e))
@@ -552,6 +556,7 @@ def do_edit_book(book_id, upload_formats=None):
 
         calibre_db.session.merge(book)
         calibre_db.session.commit()
+        update_document_hash(book.id)
         if config.config_use_google_drive:
             gdriveutils.updateGdriveCalibreFromLocal()
         if edit_error is not True and title_author_error is not True and cover_upload_success is not False:

root/app/calibre-web/cps/kosync.py

@@ -24,18 +24,30 @@
 
 log = logger.create()
 
+def filename_hash(book_data):
+    filename = f'{book_data.name}.{book_data.format.lower()}'
+    hash = md5(filename.encode()).hexdigest()
+    return hash
+
 def populate_document_hashes():
-    start = time.time()
     books_missing_hash = calibre_db.session.query(db.Data).outerjoin(ub.KosyncBooks,db.Data.id == ub.KosyncBooks.data_id).where(ub.KosyncBooks.data_id == None).all()
-    log.debug(len(books_missing_hash))
     for missing_hash in books_missing_hash:
-        filename = f'{missing_hash.name}.{missing_hash.format.lower()}'
-        hash = md5(filename.encode()).hexdigest()
+        hash = filename_hash(missing_hash)
         kosync_book = ub.KosyncBooks(data_id=missing_hash.id, book=missing_hash.book, document_hash=hash)
         ub.session.add(kosync_book)
     ub.session_commit()
-    end = time.time()
-    log.debug(f'Migrated {len(books_missing_hash)} records in {(end-start) * 10**3}ms')
+
+def update_document_hash(book_id):
+    books_formats = calibre_db.session.query(db.Data).where(db.Data.book == book_id).all()
+    for format in books_formats:
+        sync = ub.session.query(ub.KosyncBooks.data_id == format.id).scalar()
+        if sync:
+            sync.document_hash = filename_hash(format)
+        if not sync:
+            hash = filename_hash(format)
+            sync = ub.KosyncBooks(data_id = format.id, book = format.book, document_hash = hash)
+            ub.session.add(sync)
+    ub.session_commit()
 
 def requires_kosync_auth(f):
     @wraps(f)