Code refactoring ub.session.commit()

Code cosmentics admin.py

cps/kobo.py

@@ -462,10 +462,7 @@ def HandleTagCreate():
     items_unknown_to_calibre = add_items_to_shelf(items, shelf)
     if items_unknown_to_calibre:
         log.debug("Received request to add unknown books to a collection. Silently ignoring items.")
-    try:
-        ub.session.commit()
-    except OperationalError:
-        ub.session.rollback()
+    ub.session_commit()
     return make_response(jsonify(str(shelf.uuid)), 201)
 
 
@@ -497,10 +494,7 @@ def HandleTagUpdate(tag_id):
 
         shelf.name = name
         ub.session.merge(shelf)
-        try:
-            ub.session.commit()
-        except OperationalError:
-            ub.session.rollback()
+        ub.session_commit()
     return make_response(' ', 200)
 
 
@@ -552,11 +546,7 @@ def HandleTagAddItem(tag_id):
         log.debug("Received request to add an unknown book to a collection. Silently ignoring item.")
 
     ub.session.merge(shelf)
-    try:
-        ub.session.commit()
-    except OperationalError:
-        ub.session.rollback()
-
+    ub.session_commit()
     return make_response('', 201)
 
 
@@ -596,10 +586,7 @@ def HandleTagRemoveItem(tag_id):
             shelf.books.filter(ub.BookShelf.book_id == book.id).delete()
         except KeyError:
             items_unknown_to_calibre.append(item)
-    try:
-        ub.session.commit()
-    except OperationalError:
-        ub.session.rollback()
+    ub.session_commit()
 
     if items_unknown_to_calibre:
         log.debug("Received request to remove an unknown book to a collecition. Silently ignoring item.")
@@ -645,10 +632,7 @@ def sync_shelves(sync_token, sync_results):
                 "ChangedTag": tag
             })
     sync_token.tags_last_modified = new_tags_last_modified
-    try:
-        ub.session.commit()
-    except OperationalError:
-        ub.session.rollback()
+    ub.session_commit()
 
 
 # Creates a Kobo "Tag" object from a ub.Shelf object
@@ -729,10 +713,7 @@ def HandleStateRequest(book_uuid):
             abort(400, description="Malformed request data is missing 'ReadingStates' key")
 
         ub.session.merge(kobo_reading_state)
-        try:
-            ub.session.commit()
-        except OperationalError:
-            ub.session.rollback()
+        ub.session_commit()
         return jsonify({
             "RequestResult": "Success",
             "UpdateResults": [update_results_response],
@@ -770,10 +751,10 @@ def get_or_create_reading_state(book_id):
         kobo_reading_state.statistics = ub.KoboStatistics()
         book_read.kobo_reading_state = kobo_reading_state
     ub.session.add(book_read)
-    try:
-        ub.session.commit()
-    except OperationalError:
-        ub.session.rollback()
+    #try:
+    #    ub.session.commit()
+    #except OperationalError:
+    #    ub.session.rollback()
     return book_read.kobo_reading_state
 
 
@@ -876,11 +857,7 @@ def HandleBookDeletionRequest(book_uuid):
     archived_book.last_modified = datetime.datetime.utcnow()
 
     ub.session.merge(archived_book)
-    try:
-        ub.session.commit()
-    except OperationalError:
-        ub.session.rollback()
-
+    ub.session_commit()
     return ("", 204)