Merge branch 'hardcover' of https://github.com/demitrix/Calibre-Web-Automated into hardcover

Author: demitrix

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

@@ -1870,6 +1870,10 @@ def _configuration_update_helper():
             services.goodreads_support.connect(config.config_goodreads_api_key,
                                                config.config_use_goodreads)
 
+        # Hardcover configuration
+        _config_checkbox(to_save, "config_use_hardcover")
+        _config_string(to_save, "config_hardcover_token")
+            
         _config_int(to_save, "config_updatechannel")
 
         # Reverse proxy login configuration

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

@@ -118,6 +118,8 @@ class _Settings(_Base):
 
     config_use_goodreads = Column(Boolean, default=False)
     config_goodreads_api_key = Column(String)
+    config_hardcover_token = Column(String)
+    
     config_register_email = Column(Boolean, default=False)
     config_login_type = Column(Integer, default=0)
 

root/app/calibre-web/cps/metadata_provider/hardcover.py

@@ -20,7 +20,7 @@
 from typing import Dict, List, Optional
 
 import requests
-from cps import logger
+from cps import logger, config
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 from cps.isoLanguages import get_language_name
 from ..cw_login import current_user
@@ -100,7 +100,7 @@ def search(
         val = list()
         if self.active:
             try:
-                token = current_user.hardcover_token or getenv("HARDCOVER_TOKEN")
+                token = current_user.hardcover_token or config.config_hardcover_token or getenv("HARDCOVER_TOKEN")
                 if not token:
                     self.set_status(False)
                     raise Exception("Hardcover token not set for user, and no global token provided.")

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

@@ -271,7 +271,7 @@ <h4 class="modal-title text-center" id="metaModalLabel">{{_('Fetch Metadata')}}<
           alt="Cover"
         >
         <div class="image-dimensions"></div>
-        <input type="checkbox" data-meta-index="<%= index %>" data-meta-value="cover">
+        <input type="checkbox" data-meta-index="<%= index %>" data-meta-value="cover" checked>
       </div>
       <button class="btn btn-default">Save</button>
       <div><a class="meta_source" href="<%= book.source.link %>" target="_blank" rel="noopener"><%= book.source.description %></a></div>
@@ -280,38 +280,38 @@ <h4 class="modal-title text-center" id="metaModalLabel">{{_('Fetch Metadata')}}<
       <% } %>
     </div>
     <dl class="media-body">
-      <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="title">Title:</dt>
+      <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="title" checked>Title:</dt>
       <dd><a class="meta_title" href="<%= book.url %>" target="_blank" rel="noopener"><%= book.title %></a></dd>
-      <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="authors">Author:</dt>
+      <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="authors" checked>Author:</dt>
       <dd class="meta_author"><%= book.authors.join(" & ") %></dd>
       <% if (book.publisher) { %>
-        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="publisher">Publisher:</dt>
+        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="publisher" checked>Publisher:</dt>
         <dd class="meta_publisher"><%= book.publisher %></dd>
       <% } %>
       <% if (book.publishedDate) { %>
-        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="pubDate">Published Date:</dt>
+        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="pubDate" checked>Published Date:</dt>
         <dd class="meta_publishedDate"><%= book.publishedDate %></dd>
       <% } %>
       <% if (book.series) { %>
-        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="series">Series:</dt>
+        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="series" checked>Series:</dt>
         <dd class="meta_publishedDate"><%= book.series %></dd>
       <% } %>
       <% if (book.series_index) { %>
-        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="seriesIndex">Series Index:</dt>
+        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="seriesIndex" checked>Series Index:</dt>
         <dd class="meta_publishedDate"><%= book.series_index %></dd>
       <% } %>
       <% if (book.description) { %>
-        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="description">Description:</dt>
+        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="description" checked>Description:</dt>
         <dd class="meta_description"><%= book.description %></dd>
       <% } %>
       <% if (book.tags.length !== 0) { %>
-        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="tags">Tags:</dt>
+        <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="tags" checked>Tags:</dt>
         <dd class="meta_author"><%= book.tags.join(", ") %></dd>
       <% } %>
       <% if (Object.keys(book.identifiers).length !== 0 ) { %>
         <% for (const key in book.identifiers) { %>
           <% if (book.identifiers[key] !== "") { %>
-            <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="<%= key %>">Identifier</dt>
+            <dt><input type="checkbox" data-meta-index="<%= index %>" data-meta-value="<%= key %>" checked>Identifier</dt>
             <dd class="meta_identifier"><%= key %>:<%= book.identifiers[key] %>
               <% if (key === "hardcover-id" && !document.getElementById("keyword").value.includes("hardcover-id")) { %>
                 <a href="#" data-hardcover-id="<%= book.identifiers[key] %>" ><span class="glyphicon glyphicon-search" style="padding-left: 10px; padding-right: 6px;"></span>Editions</a>

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

@@ -167,6 +167,16 @@ <h4 class="panel-title">
       </div>
     </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>
+    </div>
+    <div data-related="hardcover-settings">
+      <div class="form-group">
+        <label for="config_hardcover_token">{{_('Hardcover API Key')}}</label>
+        <input type="text" class="form-control" id="config_hardcover_token" name="config_hardcover_token" value="{% if config.config_hardcover_token != None %}{{ config.config_hardcover_token }}{% endif %}" autocomplete="off">
+      </div>
+    </div>
     <div class="form-group">
       <input type="checkbox" id="config_allow_reverse_proxy_header_login" name="config_allow_reverse_proxy_header_login" data-control="reverse-proxy-login-settings" {% if config.config_allow_reverse_proxy_header_login %}checked{% endif %}>
       <label for="config_allow_reverse_proxy_header_login">{{_('Allow Reverse Proxy Authentication')}}</label>

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

@@ -1571,7 +1571,7 @@ def profile():
     languages = calibre_db.speaking_language()
     translations = get_available_locale()
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    hardcover_support = feature_support['hardcover'] and config.config_hardcover_sync
+    hardcover_support = feature_support['hardcover']
     if feature_support['oauth'] and config.config_login_type == 2:
         oauth_status = get_oauth_status()
         local_oauth_check = oauth_check