Fixed current automerge option not being the one shown in the CWA settings page.

Fixed  Enable Hardcover checkbox being unchecked regardless of whether the feature was enabled or not.

Fixed issue of existing ratings or previously enter ratings being wiped after fetching metadata

Author: crocodilestick

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

@@ -1871,7 +1871,7 @@ def _configuration_update_helper():
                                                config.config_use_goodreads)
 
         # Hardcover configuration
-        _config_checkbox(to_save, "config_use_hardcover")
+        _config_checkbox(to_save, "config_hardcover_sync")
         _config_string(to_save, "config_hardcover_token")
 
         _config_int(to_save, "config_updatechannel")

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

@@ -162,6 +162,7 @@ def set_cwa_settings():
                         'rtf', 'snb', 'tcr', 'txt', 'txtz']
     target_formats = ['epub', 'azw3', 'kepub', 'mobi', 'pdf']
     automerge_options = ['ignore', 'overwrite', 'new_record']
+    autoingest_options = ['ignore', 'overwrite', 'new_record']
 
     boolean_settings = []
     string_settings = []
@@ -235,8 +236,8 @@ def set_cwa_settings():
         ...
 
     return render_title_template("cwa_settings.html", title=_("Calibre-Web Automated User Settings"), page="cwa-settings",
-                                    cwa_settings=cwa_settings, ignorable_formats=ignorable_formats,
-                                    target_formats=target_formats, automerge_options=automerge_options)
+                                    cwa_settings=cwa_settings, ignorable_formats=ignorable_formats, target_formats=target_formats,
+                                    automerge_options=automerge_options, autoingest_options=autoingest_options)
 
 ##————————————————————————————————————————————————————————————————————————————##
 ##                                                                            ##

root/app/calibre-web/cps/static/js/get_meta.js

@@ -62,7 +62,8 @@ $(function () {
       $("#title").val(book.title);
     }
     $("#languages").val(uniqueLanguages.join(", "));
-    $("#rating").data("rating").setValue(Math.round(book.rating));
+    // Removed as users can't fetch ratings from metadata providers
+    // $("#rating").data("rating").setValue(Math.round(book.rating)); 
 
     if (updateItems.cover && book.cover && $("#cover_url").length) {
       $(".cover img").attr("src", book.cover);

root/app/calibre-web/cps/templates/config_edit.html

@@ -168,8 +168,8 @@ <h4 class="panel-title">
     </div>
     {% endif %}
     <div class="form-group">
-      <input type="checkbox" id="config_use_hardcover" name="config_use_hardcover" data-control="hardcover-settings" {% if config.config_use_hardcover %}checked{% endif %}>
-      <label for="config_use_hardcover">{{_('Use Hardcover')}}</label>
+      <input type="checkbox" id="config_hardcover_sync" name="config_hardcover_sync" data-control="hardcover-settings" {% if config.config_hardcover_sync %}checked{% endif %}>
+      <label for="config_hardcover_sync">{{_('Enable Hardcover Sync')}}</label>
     </div>
     <div data-related="hardcover-settings">
       <div class="form-group">

root/app/calibre-web/cps/templates/cwa_settings.html

@@ -208,6 +208,13 @@ <h4 class="settings-section-header">CWA Auto-Ingest Automerge</h4>
             <option value="ignore">ignore</option>
             <option value="overwrite">overwrite</option>
             <option value="new_record" selected="">new_record</option>
+        {% for option in autoingest_options -%}
+          {% if cwa_settings['auto_ingest_automerge'] == option %}
+            <option value="{{ format }}" selected>{{ format }}</option>
+          {% else %}
+            <option value="{{ format }}">{{ format }}</option>
+          {% endif %}
+        {% endfor %}
       </select>
 
       <h4>Possible Values:</h4>