Merge branch 'master' into cover_thumbnail

# Conflicts: # test/Calibre-Web TestSummary_Linux.html
2022-04-20 07:25:37 +02:00
parent 2f3e5eadeb 2303fc0814
commit 3c98cd1b9a
63 changed files with 13803 additions and 12890 deletions
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -161,7 +161,7 @@ def selected_roles(dictionary):

 # :rtype: BookMeta
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
-                                  'series_id, languages, publisher')
+                                  'series_id, languages, publisher, pubdate, identifiers')

 STABLE_VERSION = {'version': '0.6.19 Beta'}