From 8c0aa79f78ae07717121cd7c731b5aed32fd8947 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Fri, 28 May 2021 18:48:46 +0200 Subject: [PATCH 01/50] Fix #1915 (more than 10 books at a time are displayed in books table) --- ...bootstrap-table-af-ZA.min.js => bootstrap-table-af.min.js} | 0 ...bootstrap-table-ar-SA.min.js => bootstrap-table-ar.min.js} | 0 ...bootstrap-table-bg-BG.min.js => bootstrap-table-bg.min.js} | 0 ...bootstrap-table-ca-ES.min.js => bootstrap-table-ca.min.js} | 0 ...bootstrap-table-cs-CZ.min.js => bootstrap-table-cs.min.js} | 0 ...bootstrap-table-da-DK.min.js => bootstrap-table-da.min.js} | 0 ...bootstrap-table-de-DE.min.js => bootstrap-table-de.min.js} | 0 ...bootstrap-table-el-GR.min.js => bootstrap-table-el.min.js} | 0 ...bootstrap-table-es-ES.min.js => bootstrap-table-es.min.js} | 0 ...bootstrap-table-et-EE.min.js => bootstrap-table-et.min.js} | 0 ...bootstrap-table-eu-EU.min.js => bootstrap-table-eu.min.js} | 0 ...bootstrap-table-fa-IR.min.js => bootstrap-table-fa.min.js} | 0 ...bootstrap-table-fi-FI.min.js => bootstrap-table-fi.min.js} | 0 ...bootstrap-table-fr-FR.min.js => bootstrap-table-fr.min.js} | 0 ...bootstrap-table-he-IL.min.js => bootstrap-table-he.min.js} | 0 ...bootstrap-table-hr-HR.min.js => bootstrap-table-hr.min.js} | 0 ...bootstrap-table-hu-HU.min.js => bootstrap-table-hu.min.js} | 0 ...bootstrap-table-id-ID.min.js => bootstrap-table-id.min.js} | 0 ...bootstrap-table-it-IT.min.js => bootstrap-table-it.min.js} | 0 ...bootstrap-table-ja-JP.min.js => bootstrap-table-ja.min.js} | 0 ...bootstrap-table-ka-GE.min.js => bootstrap-table-ka.min.js} | 0 ...bootstrap-table-ko-KR.min.js => bootstrap-table-ko.min.js} | 0 ...bootstrap-table-nl-NL.min.js => bootstrap-table-nl.min.js} | 0 ...bootstrap-table-pl-PL.min.js => bootstrap-table-pl.min.js} | 0 ...tstrap-table-pt-BR.min.js => bootstrap-table-pt_BR.min.js} | 0 ...bootstrap-table-ro-RO.min.js => bootstrap-table-ro.min.js} | 0 ...bootstrap-table-ru-RU.min.js => bootstrap-table-ru.min.js} | 0 ...bootstrap-table-sk-SK.min.js => bootstrap-table-sk.min.js} | 0 ...bootstrap-table-sv-SE.min.js => bootstrap-table-sv.min.js} | 0 ...bootstrap-table-tr-TR.min.js => bootstrap-table-tr.min.js} | 0 ...bootstrap-table-uk-UA.min.js => bootstrap-table-uk.min.js} | 0 ...p-table-zh-CN.min.js => bootstrap-table-zh_Hans_CN.min.js} | 0 cps/static/js/table.js | 3 ++- cps/templates/book_table.html | 4 ++++ cps/templates/tasks.html | 2 -- 35 files changed, 6 insertions(+), 3 deletions(-) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-af-ZA.min.js => bootstrap-table-af.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-ar-SA.min.js => bootstrap-table-ar.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-bg-BG.min.js => bootstrap-table-bg.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-ca-ES.min.js => bootstrap-table-ca.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-cs-CZ.min.js => bootstrap-table-cs.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-da-DK.min.js => bootstrap-table-da.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-de-DE.min.js => bootstrap-table-de.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-el-GR.min.js => bootstrap-table-el.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-es-ES.min.js => bootstrap-table-es.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-et-EE.min.js => bootstrap-table-et.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-eu-EU.min.js => bootstrap-table-eu.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-fa-IR.min.js => bootstrap-table-fa.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-fi-FI.min.js => bootstrap-table-fi.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-fr-FR.min.js => bootstrap-table-fr.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-he-IL.min.js => bootstrap-table-he.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-hr-HR.min.js => bootstrap-table-hr.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-hu-HU.min.js => bootstrap-table-hu.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-id-ID.min.js => bootstrap-table-id.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-it-IT.min.js => bootstrap-table-it.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-ja-JP.min.js => bootstrap-table-ja.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-ka-GE.min.js => bootstrap-table-ka.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-ko-KR.min.js => bootstrap-table-ko.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-nl-NL.min.js => bootstrap-table-nl.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-pl-PL.min.js => bootstrap-table-pl.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-pt-BR.min.js => bootstrap-table-pt_BR.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-ro-RO.min.js => bootstrap-table-ro.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-ru-RU.min.js => bootstrap-table-ru.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-sk-SK.min.js => bootstrap-table-sk.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-sv-SE.min.js => bootstrap-table-sv.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-tr-TR.min.js => bootstrap-table-tr.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-uk-UA.min.js => bootstrap-table-uk.min.js} (100%) rename cps/static/js/libs/bootstrap-table/locale/{bootstrap-table-zh-CN.min.js => bootstrap-table-zh_Hans_CN.min.js} (100%) diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt_BR.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt_BR.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js similarity index 100% rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js diff --git a/cps/static/js/table.js b/cps/static/js/table.js index a38ca1c6..577b8d8c 100644 --- a/cps/static/js/table.js +++ b/cps/static/js/table.js @@ -136,10 +136,11 @@ $(function() { $("#books-table").bootstrapTable({ sidePagination: "server", + pageList: "[10, 25, 50, 100]", queryParams: queryParams, pagination: true, paginationLoop: false, - paginationDetailHAlign: " hidden", + paginationDetailHAlign: "right", paginationHAlign: "left", idField: "id", uniqueId: "id", diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html index e340dc0a..ea978eb6 100644 --- a/cps/templates/book_table.html +++ b/cps/templates/book_table.html @@ -97,5 +97,9 @@ +{% if not g.user.locale == 'en' %} + +{% endif %} + {% endblock %} diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html index 4a755c82..5cc15f87 100644 --- a/cps/templates/tasks.html +++ b/cps/templates/tasks.html @@ -21,8 +21,6 @@ - {% endblock %} {% block js %} From ced0bcfe3373aed3ce7af4a56a830a79eec258f4 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 29 May 2021 17:30:06 +0200 Subject: [PATCH 02/50] Fix missing " in books table --- cps/templates/book_table.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html index ea978eb6..7cc0c51a 100644 --- a/cps/templates/book_table.html +++ b/cps/templates/book_table.html @@ -77,11 +77,11 @@

{{_('Books with Title will be merged from:')}}

-
+

{{_('Into Book with Title:')}}

-
+
From 67874e07b64a4632983814d795ca0e7d41166870 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 29 May 2021 19:18:43 +0200 Subject: [PATCH 03/50] Fix routes for reverse proxy --- cps/static/js/table.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cps/static/js/table.js b/cps/static/js/table.js index 577b8d8c..15653aa9 100644 --- a/cps/static/js/table.js +++ b/cps/static/js/table.js @@ -65,7 +65,7 @@ $(function() { method:"post", contentType: "application/json; charset=utf-8", dataType: "json", - url: window.location.pathname + "/../../ajax/mergebooks", + url: window.location.pathname + "/../ajax/mergebooks", data: JSON.stringify({"Merge_books":selections}), success: function success() { $("#books-table").bootstrapTable("refresh"); @@ -79,7 +79,7 @@ $(function() { method:"post", contentType: "application/json; charset=utf-8", dataType: "json", - url: window.location.pathname + "/../../ajax/simulatemerge", + url: window.location.pathname + "/../ajax/simulatemerge", data: JSON.stringify({"Merge_books":selections}), success: function success(booTitles) { $.each(booTitles.from, function(i, item) { @@ -96,7 +96,7 @@ $(function() { method:"post", contentType: "application/json; charset=utf-8", dataType: "json", - url: window.location.pathname + "/../../ajax/xchange", + url: window.location.pathname + "/../ajax/xchange", data: JSON.stringify({"xchange":selections}), success: function success() { $("#books-table").bootstrapTable("refresh"); @@ -163,7 +163,7 @@ $(function() { $.ajax({ method:"get", dataType: "json", - url: window.location.pathname + "/../../ajax/sort_value/" + field + "/" + row.id, + url: window.location.pathname + "/../ajax/sort_value/" + field + "/" + row.id, success: function success(data) { var key = Object.keys(data)[0]; $("#books-table").bootstrapTable("updateCellByUniqueId", { @@ -191,7 +191,7 @@ $(function() { method:"post", contentType: "application/json; charset=utf-8", dataType: "json", - url: window.location.pathname + "/../../ajax/table_settings", + url: window.location.pathname + "/../ajax/table_settings", data: "{" + st + "}", }); }, From 1a0bf45c34b174832033df9a82212e0ebcf19886 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 6 Jun 2021 12:16:47 +0200 Subject: [PATCH 04/50] Check file/folder permissions before update --- cps/admin.py | 3 +- cps/static/js/main.js | 4 +-- cps/updater.py | 74 ++++++++++++++++++++++++++++++------------- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index ac82bc8e..f201efc8 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -1671,7 +1671,8 @@ def get_updater_status(): "9": _(u'Update failed:') + u' ' + _(u'Connection error'), "10": _(u'Update failed:') + u' ' + _(u'Timeout while establishing connection'), "11": _(u'Update failed:') + u' ' + _(u'General error'), - "12": _(u'Update failed:') + u' ' + _(u'Update File Could Not be Saved in Temp Dir') + "12": _(u'Update failed:') + u' ' + _(u'Update file could not be saved in temp dir'), + "13": _(u'Update failed:') + u' ' + _(u'Files could not be replaced during update') } status['text'] = text updater_thread.status = 0 diff --git a/cps/static/js/main.js b/cps/static/js/main.js index ce930cc3..2f7dc172 100644 --- a/cps/static/js/main.js +++ b/cps/static/js/main.js @@ -239,14 +239,13 @@ $(function() { dataType: "json", url: window.location.pathname + "/../../get_updater_status", success: function success(data) { - // console.log(data.status); $("#DialogContent").html(updateText[data.status]); if (data.status > 6) { cleanUp(); } }, error: function error() { - $("#DialogContent").html(updateText[7]); + $("#DialogContent").html(updateText[11]); cleanUp(); }, timeout: 2000 @@ -442,7 +441,6 @@ $(function() { success: function success(data) { updateText = data.text; $("#DialogContent").html(updateText[data.status]); - // console.log(data.status); updateTimerID = setInterval(updateTimer, 2000); } }); diff --git a/cps/updater.py b/cps/updater.py index fb5219b6..94cb0453 100644 --- a/cps/updater.py +++ b/cps/updater.py @@ -94,14 +94,17 @@ class Updater(threading.Thread): return False self.status = 4 log.debug(u'Replacing files') - self.update_source(foldername, constants.BASE_DIR) - self.status = 6 - log.debug(u'Preparing restart of server') - time.sleep(2) - web_server.stop(True) - self.status = 7 - time.sleep(2) - return True + if self.update_source(foldername, constants.BASE_DIR): + self.status = 6 + log.debug(u'Preparing restart of server') + time.sleep(2) + web_server.stop(True) + self.status = 7 + time.sleep(2) + return True + else: + self.status = 13 + except requests.exceptions.HTTPError as ex: log.error(u'HTTP Error %s', ex) self.status = 8 @@ -181,6 +184,28 @@ class Updater(threading.Thread): rf.append(item) return rf + @classmethod + def check_permissions(cls, root_src_dir, root_dst_dir): + access = True + remove_path = len(root_src_dir) + 1 + for src_dir, __, files in os.walk(root_src_dir): + root_dir = os.path.join(root_dst_dir, src_dir[remove_path:]) + # Skip non existing folders on check + if not os.path.isdir(root_dir): # root_dir.lstrip(os.sep).startswith('.') or + continue + if not os.access(root_dir, os.R_OK|os.W_OK): + log.debug("Missing permissions for {}".format(root_dir)) + access = False + for file_ in files: + curr_file = os.path.join(root_dir, file_) + # Skip non existing files on check + if not os.path.isfile(curr_file): # or curr_file.startswith('.'): + continue + if not os.access(curr_file, os.R_OK|os.W_OK): + log.debug("Missing permissions for {}".format(curr_file)) + access = False + return access + @classmethod def moveallfiles(cls, root_src_dir, root_dst_dir): new_permissions = os.stat(root_dst_dir) @@ -269,20 +294,25 @@ class Updater(threading.Thread): remove_items = self.reduce_dirs(rf, new_list) - self.moveallfiles(source, destination) + if self.check_permissions(source, destination): + self.moveallfiles(source, destination) - for item in remove_items: - item_path = os.path.join(destination, item[1:]) - if os.path.isdir(item_path): - log.debug("Delete dir %s", item_path) - shutil.rmtree(item_path, ignore_errors=True) - else: - try: - os.remove(item_path) - log.debug("Delete file %s", item_path) - except OSError: - log.debug("Could not remove: %s", item_path) - shutil.rmtree(source, ignore_errors=True) + for item in remove_items: + item_path = os.path.join(destination, item[1:]) + if os.path.isdir(item_path): + log.debug("Delete dir %s", item_path) + shutil.rmtree(item_path, ignore_errors=True) + else: + try: + os.remove(item_path) + log.debug("Delete file %s", item_path) + except OSError: + log.debug("Could not remove: %s", item_path) + shutil.rmtree(source, ignore_errors=True) + return True + else: + log.debug("Permissions missing for update") + return False @staticmethod def is_venv(): @@ -572,5 +602,5 @@ class Updater(threading.Thread): status['message'] = _(u'Timeout while establishing connection') except (requests.exceptions.RequestException, ValueError): status['message'] = _(u'General error') - log.debug('Updater status: %s', status['message']) + log.debug('Updater status: {}'.format(status['message'] or "OK")) return status, commit From 1aca1b9fdd7806c29e3120dc8c223efe276fce25 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 6 Jun 2021 16:14:30 +0200 Subject: [PATCH 05/50] Fixed duplicate ids in logviewer --- cps/templates/logviewer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cps/templates/logviewer.html b/cps/templates/logviewer.html index db27bdf4..6c26a5b6 100644 --- a/cps/templates/logviewer.html +++ b/cps/templates/logviewer.html @@ -15,10 +15,10 @@
{% if log_enable %} - {{_('Download Calibre-Web Log')}} + {{_('Download Calibre-Web Log')}} {% endif %} {% if accesslog_enable %} - {{_('Download Access Log')}} + {{_('Download Access Log')}} {% endif %}
From 1833e8fdb411da49247c23230abe6b5a42c4f6cd Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 12 Jun 2021 08:48:55 +0200 Subject: [PATCH 06/50] Success message after database change --- cps/admin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cps/admin.py b/cps/admin.py index f201efc8..587a7531 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -1307,6 +1307,8 @@ def _db_configuration_result(error_flash=None, gdrive_error=None): log.error(error_flash) config.load() flash(error_flash, category="error") + elif request.method == "POST" and not gdrive_error: + flash(_("Database Settings updated"), category="success") return render_title_template("config_db.html", config=config, From 67836006c5d9a225f9c6992a7215d4e8cd6e7efd Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 19 Jun 2021 14:44:57 +0200 Subject: [PATCH 07/50] Successfull testrun --- cps/templates/config_edit.html | 2 +- cps/templates/email_edit.html | 2 +- test/Calibre-Web TestSummary_Linux.html | 494 ++++++++++++------------ 3 files changed, 250 insertions(+), 248 deletions(-) diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html index 6c65fe2d..d2a53200 100644 --- a/cps/templates/config_edit.html +++ b/cps/templates/config_edit.html @@ -31,7 +31,7 @@
- +
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html index 24e503dd..9558671b 100644 --- a/cps/templates/email_edit.html +++ b/cps/templates/email_edit.html @@ -9,7 +9,7 @@
{% if feature_support['gmail'] %}
- + - - @@ -253,13 +250,12 @@ -
{{_("Loading...")}}
-
    +
    From ec7803fa76cd76993b1c40a4107294095661d2a3 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Thu, 8 Jul 2021 19:14:38 +0200 Subject: [PATCH 13/50] Update python search Metadata --- cps/metadata_provider/comicvine.py | 5 +++-- cps/metadata_provider/google.py | 3 ++- cps/metadata_provider/scholar.py | 5 +++-- cps/search_metadata.py | 20 ++++++++++++++++++-- cps/static/js/get_meta.js | 29 +++++++++++++++++++++++++---- cps/templates/book_edit.html | 11 +---------- 6 files changed, 52 insertions(+), 21 deletions(-) diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py index b1b5c9e7..787a316a 100644 --- a/cps/metadata_provider/comicvine.py +++ b/cps/metadata_provider/comicvine.py @@ -21,13 +21,14 @@ import requests from cps.services.Metadata import Metadata -apikey = "57558043c53943d5d1e96a9ad425b0eb85532ee6" class ComicVine(Metadata): __name__ = "ComicVine" + __id__ = "comicvine" def search(self, query): val = list() + apikey = "57558043c53943d5d1e96a9ad425b0eb85532ee6" if self.active: headers = { 'User-Agent': 'Not Evil Browser' # , @@ -53,7 +54,7 @@ class ComicVine(Metadata): v['series'] = seriesTitle v['cover'] = r['image'].get('original_url') v['source'] = { - "id": "comicvine", + "id": self.__id__, "description": "ComicVine Books", "link": "https://comicvine.gamespot.com/" } diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py index 63bc4cf8..b6e4036b 100644 --- a/cps/metadata_provider/google.py +++ b/cps/metadata_provider/google.py @@ -24,6 +24,7 @@ from cps.services.Metadata import Metadata class Google(Metadata): __name__ = "Google" + __id__ = "google" def search(self, query): if self.active: @@ -44,7 +45,7 @@ class Google(Metadata): else: v['cover'] = "/../../../static/generic_cover.jpg" v['source'] = { - "id": "google", + "id": self.__id__, "description": "Google Books", "link": "https://books.google.com/"} v['url'] = "" diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py index 02c0c4f8..b9875a1b 100644 --- a/cps/metadata_provider/scholar.py +++ b/cps/metadata_provider/scholar.py @@ -29,7 +29,8 @@ from cps.services.Metadata import Metadata class scholar(Metadata): - __name__ = "ComicVine" + __name__ = "Google Scholar" + __id__ = "googlescholar" def search(self, query): val = list() @@ -53,7 +54,7 @@ class scholar(Metadata): v['cover'] = "/../../../static/generic_cover.jpg" v['url'] = "" v['source'] = { - "id": "googlescholar", + "id": self.__id__, "description": "Google Scholar", "link": "https://scholar.google.com/" } diff --git a/cps/search_metadata.py b/cps/search_metadata.py index 9365f1bd..0e69b570 100644 --- a/cps/search_metadata.py +++ b/cps/search_metadata.py @@ -24,6 +24,7 @@ import sys import inspect from flask import Blueprint, request, Response +from flask_login import current_user from flask_login import login_required from . import constants, logger @@ -59,14 +60,29 @@ cl = list_classes(new_list) @meta.route("/metadata/provider") @login_required def metadata_provider(): - return "" + active = current_user.view_settings.get('metadata', {}) + provider = list() + for c in cl: + provider.append({"name": c.__name__, "active": active.get(c.__name__, True), "id": c.__id__}) + return Response(json.dumps(provider), mimetype='application/json') + +@meta.route("/metadata/provider", methods=['POST']) +@login_required +def metadata_change_active_provider(): + active = current_user.view_settings.get('metadata', {}) + provider = list() + for c in cl: + provider.append({"name": c.__name__, "active": active.get(c.__name__, True), "id": c.__id__}) + return Response(json.dumps(provider), mimetype='application/json') @meta.route("/metadata/search", methods=['POST']) @login_required def metadata_search(): query = request.form.to_dict().get('query') data = list() + active = current_user.view_settings.get('metadata', {}) if query: for c in cl: - data.extend(c.search(query)) + if active.get(c.__name__, True): + data.extend(c.search(query)) return Response(json.dumps(data), mimetype='application/json') diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js index c255d309..395eeb69 100644 --- a/cps/static/js/get_meta.js +++ b/cps/static/js/get_meta.js @@ -73,6 +73,28 @@ $(function () { } } + function populate_provider() { + $("#metadata_provider").empty(); + $.ajax({ + url: getPath() + "/metadata/provider", + type: "get", + dataType: "json", + success: function success(data) { + console.log(data); + data.forEach(function(provider) { + //$("#metadata_provider").html("
      "); + var checked = ""; + if (provider.active) { + checked = "checked"; + } + var $provider_button = '' + $("#metadata_provider").append($provider_button); + }); + }, + }); + } + + $("#meta-search").on("submit", function (e) { e.preventDefault(); var keyword = $("#keyword").val(); @@ -80,10 +102,9 @@ $(function () { }); $("#get_meta").click(function () { + populate_provider(); var bookTitle = $("#book_title").val(); - if (bookTitle) { - $("#keyword").val(bookTitle); - doSearch(bookTitle); - } + $("#keyword").val(bookTitle); + doSearch(bookTitle); }); }); diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index a14062d8..4f583a44 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -241,21 +241,12 @@
      {{_('Click the cover to load metadata to the form')}}
      -
      - - - - - - - - +
      {{_("Loading...")}}
      -
      From 259ac94b93172b396e7f3ed9178616b92512db4a Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 11 Jul 2021 09:19:27 +0200 Subject: [PATCH 14/50] Fix error unclosed IO on external binary version query --- cps/converter.py | 4 +--- cps/helper.py | 11 +++++------ cps/subproc_wrapper.py | 12 +++++++++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/cps/converter.py b/cps/converter.py index 2ff73666..f37168c7 100644 --- a/cps/converter.py +++ b/cps/converter.py @@ -39,9 +39,7 @@ def _get_command_version(path, pattern, argument=None): if argument: command.append(argument) try: - for line in process_wait(command): - if re.search(pattern, line): - return line + return process_wait(command, pattern=pattern).string except Exception as ex: log.warning("%s: %s", path, ex) return _EXECUTION_ERROR diff --git a/cps/helper.py b/cps/helper.py index d567e9b3..b6ea6760 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -711,12 +711,11 @@ def check_unrar(unrarLocation): if sys.version_info < (3, 0): unrarLocation = unrarLocation.encode(sys.getfilesystemencoding()) unrarLocation = [unrarLocation] - for lines in process_wait(unrarLocation): - value = re.search('UNRAR (.*) freeware', lines, re.IGNORECASE) - if value: - version = value.group(1) - log.debug("unrar version %s", version) - break + value = process_wait(unrarLocation, pattern='UNRAR (.*) freeware') + if value: + version = value.group(1) + log.debug("unrar version %s", version) + except (OSError, UnicodeDecodeError) as err: log.debug_or_exception(err) return _('Error excecuting UnRar') diff --git a/cps/subproc_wrapper.py b/cps/subproc_wrapper.py index c6c65851..27375686 100644 --- a/cps/subproc_wrapper.py +++ b/cps/subproc_wrapper.py @@ -20,7 +20,7 @@ from __future__ import division, print_function, unicode_literals import sys import os import subprocess - +import re def process_open(command, quotes=(), env=None, sout=subprocess.PIPE, serr=subprocess.PIPE, newlines=True): # Linux py2.7 encode as list without quotes no empty element for parameters @@ -44,12 +44,18 @@ def process_open(command, quotes=(), env=None, sout=subprocess.PIPE, serr=subpro return subprocess.Popen(exc_command, shell=False, stdout=sout, stderr=serr, universal_newlines=newlines, env=env) # nosec -def process_wait(command, serr=subprocess.PIPE): +def process_wait(command, serr=subprocess.PIPE, pattern=""): # Run command, wait for process to terminate, and return an iterator over lines of its output. newlines = os.name != 'nt' + ret_val = "" p = process_open(command, serr=serr, newlines=newlines) p.wait() for line in p.stdout.readlines(): if isinstance(line, bytes): line = line.decode('utf-8') - yield line + match = re.search(pattern, line, re.IGNORECASE) + if match and ret_val == "": + ret_val = match + p.stdout.close() + p.stderr.close() + return ret_val From a1a8a0cf29a680582caf8ff812c76aa12162f944 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 25 Jul 2021 05:24:03 +0200 Subject: [PATCH 15/50] Logout if logged out and don't allow to get logged in afterwards --- cps/admin.py | 7 +++++-- cps/ub.py | 20 +++++++++++++++++++- cps/web.py | 4 ++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index 7507d725..0e5949b2 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -34,6 +34,7 @@ from babel.dates import format_datetime from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response from flask_login import login_required, current_user, logout_user, confirm_login from flask_babel import gettext as _ +from flask import session as flask_session from sqlalchemy import and_ from sqlalchemy.orm.attributes import flag_modified from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError @@ -98,8 +99,10 @@ def admin_required(f): @admi.before_app_request def before_request(): - if current_user.is_authenticated: - confirm_login() + if not ub.check_user_session(current_user.id, flask_session.get('_id')): + logout_user() + # if current_user.is_authenticated: + # confirm_login() g.constants = constants g.user = current_user g.allow_registration = config.config_public_reg diff --git a/cps/ub.py b/cps/ub.py index c334ff59..e98e3dea 100644 --- a/cps/ub.py +++ b/cps/ub.py @@ -60,6 +60,24 @@ app_DB_path = None Base = declarative_base() searched_ids = {} +logged_in = dict() + +def store_user_session(): + if flask_session.get('_user_id', ""): + if logged_in.get(flask_session.get('_user_id', "")): + logged_in[flask_session.get('_user_id', "")].append(flask_session.get('_id', "")) + else: + logged_in[flask_session.get('_user_id', "")] = [flask_session.get('_id', "")] + log.info(flask_session.get('_id', "")) + +def delete_user_session(user_id, session_key): + try: + logged_in.get(str(user_id), []).remove(session_key) + except ValueError: + pass + +def check_user_session(user_id, session_key): + return session_key in logged_in.get(str(user_id), []) def store_ids(result): ids = list() @@ -72,7 +90,7 @@ class UserBase: @property def is_authenticated(self): - return True + return self.is_active def _has_role(self, role_flag): return constants.has_flag(self.role, role_flag) diff --git a/cps/web.py b/cps/web.py index ba3c5ae3..e55a6a29 100644 --- a/cps/web.py +++ b/cps/web.py @@ -1513,6 +1513,7 @@ def login(): login_result, error = services.ldap.bind_user(form['username'], form['password']) if login_result: login_user(user, remember=bool(form.get('remember_me'))) + ub.store_user_session() log.debug(u"You are now logged in as: '%s'", user.name) flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.name), category="success") @@ -1520,6 +1521,7 @@ def login(): elif login_result is None and user and check_password_hash(str(user.password), form['password']) \ and user.name != "Guest": login_user(user, remember=bool(form.get('remember_me'))) + ub.store_user_session() log.info("Local Fallback Login as: '%s'", user.name) flash(_(u"Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known", nickname=user.name), @@ -1549,6 +1551,7 @@ def login(): else: if user and check_password_hash(str(user.password), form['password']) and user.name != "Guest": login_user(user, remember=bool(form.get('remember_me'))) + ub.store_user_session() log.debug(u"You are now logged in as: '%s'", user.name) flash(_(u"You are now logged in as: '%(nickname)s'", nickname=user.name), category="success") config.config_is_initial = False @@ -1572,6 +1575,7 @@ def login(): @login_required def logout(): if current_user is not None and current_user.is_authenticated: + ub.delete_user_session(current_user.id, flask_session.get('_id',"")) logout_user() if feature_support['oauth'] and (config.config_login_type == 2 or config.config_login_type == 3): logout_oauth_user() From 53603f79bd0d193d5e4a5f69cf073718f6923dda Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 31 Jul 2021 09:00:34 +0200 Subject: [PATCH 16/50] Get_meta button unfocused on return to edit books --- cps/metadata_provider/comicvine.py | 2 +- cps/metadata_provider/scholar.py | 4 ++-- cps/static/js/edit_books.js | 1 + cps/static/js/get_meta.js | 5 +++++ cps/templates/book_edit.html | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py index 787a316a..633184af 100644 --- a/cps/metadata_provider/comicvine.py +++ b/cps/metadata_provider/comicvine.py @@ -31,7 +31,7 @@ class ComicVine(Metadata): apikey = "57558043c53943d5d1e96a9ad425b0eb85532ee6" if self.active: headers = { - 'User-Agent': 'Not Evil Browser' # , + 'User-Agent': 'Not Evil Browser' } result = requests.get("https://comicvine.gamespot.com/api/search?api_key=" diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py index b9875a1b..81398840 100644 --- a/cps/metadata_provider/scholar.py +++ b/cps/metadata_provider/scholar.py @@ -17,8 +17,8 @@ # along with this program. If not, see . from scholarly import scholarly +from flask import url_for -import json from cps.services.Metadata import Metadata #try: @@ -51,7 +51,7 @@ class scholar(Metadata): v['tags'] = "" v['ratings'] = 0 v['series'] = "" - v['cover'] = "/../../../static/generic_cover.jpg" + v['cover'] = url_for('static', filename='generic_cover.jpg') v['url'] = "" v['source'] = { "id": self.__id__, diff --git a/cps/static/js/edit_books.js b/cps/static/js/edit_books.js index 7c812ae9..00c971d3 100644 --- a/cps/static/js/edit_books.js +++ b/cps/static/js/edit_books.js @@ -269,3 +269,4 @@ $("#xchange").click(function () { $("#book_title").val($("#bookAuthor").val()); $("#bookAuthor").val(title); }); + diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js index 395eeb69..e53104ea 100644 --- a/cps/static/js/get_meta.js +++ b/cps/static/js/get_meta.js @@ -107,4 +107,9 @@ $(function () { $("#keyword").val(bookTitle); doSearch(bookTitle); }); + $("#metaModal").on("show.bs.modal", function(e) { + $(e.relatedTarget).one('focus', function (e) { + $(this).blur(); + }); + }); }); diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index 9be7558c..20076321 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -232,7 +232,7 @@
      - + @@ -262,7 +262,7 @@ " + src="<%= cover || "{{ url_for('static', filename='img/academicpaper.svg') }}" %>" alt="Cover" >
      From 702e96ddd62f073104a78b70281181eadac97db1 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 31 Jul 2021 09:18:05 +0200 Subject: [PATCH 17/50] Update load metadata --- cps/metadata_provider/comicvine.py | 2 +- cps/metadata_provider/google.py | 2 +- cps/metadata_provider/scholar.py | 2 +- cps/static/js/get_meta.js | 2 +- cps/web.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py index 633184af..2309fc81 100644 --- a/cps/metadata_provider/comicvine.py +++ b/cps/metadata_provider/comicvine.py @@ -58,7 +58,7 @@ class ComicVine(Metadata): "description": "ComicVine Books", "link": "https://comicvine.gamespot.com/" } - v['url'] = "" + v['url'] = r.get('site_detail_url', "") val.append(v) return val diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py index b6e4036b..1c26f74c 100644 --- a/cps/metadata_provider/google.py +++ b/cps/metadata_provider/google.py @@ -48,7 +48,7 @@ class Google(Metadata): "id": self.__id__, "description": "Google Books", "link": "https://books.google.com/"} - v['url'] = "" + v['url'] = "https://books.google.com/books?id=" + r['id'] val.append(v) return val diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py index 81398840..41a0e7f8 100644 --- a/cps/metadata_provider/scholar.py +++ b/cps/metadata_provider/scholar.py @@ -52,7 +52,7 @@ class scholar(Metadata): v['ratings'] = 0 v['series'] = "" v['cover'] = url_for('static', filename='generic_cover.jpg') - v['url'] = "" + v['url'] = publication.get('pub_url') or publication.get('eprint_url') or "", v['source'] = { "id": self.__id__, "description": "Google Scholar", diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js index e53104ea..c1d4d5a0 100644 --- a/cps/static/js/get_meta.js +++ b/cps/static/js/get_meta.js @@ -80,7 +80,7 @@ $(function () { type: "get", dataType: "json", success: function success(data) { - console.log(data); + // console.log(data); data.forEach(function(provider) { //$("#metadata_provider").html("
        "); var checked = ""; diff --git a/cps/web.py b/cps/web.py index 6b98b64e..46897aa9 100644 --- a/cps/web.py +++ b/cps/web.py @@ -84,7 +84,7 @@ except ImportError: @app.after_request def add_security_headers(resp): - # resp.headers['Content-Security-Policy']= "script-src 'self' https://www.googleapis.com https://api.douban.com https://comicvine.gamespot.com;" + resp.headers['Content-Security-Policy']= "script-src 'self'" resp.headers['X-Content-Type-Options'] = 'nosniff' resp.headers['X-Frame-Options'] = 'SAMEORIGIN' resp.headers['X-XSS-Protection'] = '1; mode=block' From ceec1051d5f3d92568a4d0f5f367a48302de9f50 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 1 Aug 2021 13:50:17 +0200 Subject: [PATCH 18/50] Added option to save books with no nenglish characters Imporvements on metadata search --- cps/admin.py | 1 + cps/config_sql.py | 1 + cps/helper.py | 17 ++++++----------- cps/metadata_provider/google.py | 2 +- cps/search_metadata.py | 24 +++++++++++++++++++----- cps/static/css/style.css | 10 +++++++++- cps/static/js/details.js | 2 +- cps/static/js/get_meta.js | 12 +++++++++++- cps/static/js/main.js | 4 ++-- cps/static/js/table.js | 2 +- cps/templates/book_edit.html | 8 ++++---- cps/templates/config_db.html | 2 +- cps/templates/config_edit.html | 6 +++++- cps/templates/layout.html | 8 ++++---- cps/templates/search_form.html | 16 ++++++++-------- cps/templates/user_table.html | 2 +- cps/web.py | 2 +- 17 files changed, 76 insertions(+), 43 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index 0697ad23..93c742df 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -1208,6 +1208,7 @@ def _configuration_update_helper(): return _configuration_result(_('Certfile Location is not Valid, Please Enter Correct Path')) _config_checkbox_int(to_save, "config_uploading") + _config_checkbox_int(to_save, "config_unicode_filename") # Reboot on config_anonbrowse with enabled ldap, as decoraters are changed in this case reboot_required |= (_config_checkbox_int(to_save, "config_anonbrowse") and config.config_login_type == constants.LOGIN_LDAP) diff --git a/cps/config_sql.py b/cps/config_sql.py index f3e82e7e..88107f9b 100644 --- a/cps/config_sql.py +++ b/cps/config_sql.py @@ -133,6 +133,7 @@ class _Settings(_Base): config_calibre = Column(String) config_rarfile_location = Column(String, default=None) config_upload_formats = Column(String, default=','.join(constants.EXTENSIONS_UPLOAD)) + config_unicode_filename =Column(Boolean, default=False) config_updatechannel = Column(Integer, default=constants.UPDATE_STABLE) diff --git a/cps/helper.py b/cps/helper.py index b6ea6760..3f91ca86 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -230,16 +230,14 @@ def get_valid_filename(value, replace_whitespace=True): value = value[:-1]+u'_' value = value.replace("/", "_").replace(":", "_").strip('\0') if use_unidecode: - value = (unidecode.unidecode(value)) + if config.config_unicode_filename: + value = (unidecode.unidecode(value)) else: value = value.replace(u'§', u'SS') value = value.replace(u'ß', u'ss') value = unicodedata.normalize('NFKD', value) re_slugify = re.compile(r'[\W\s-]', re.UNICODE) - if isinstance(value, str): # Python3 str, Python2 unicode - value = re_slugify.sub('', value) - else: - value = unicode(re_slugify.sub('', value)) + value = re_slugify.sub('', value) if replace_whitespace: # *+:\"/<>? are replaced by _ value = re.sub(r'[*+:\\\"/<>?]+', u'_', value, flags=re.U) @@ -248,10 +246,7 @@ def get_valid_filename(value, replace_whitespace=True): value = value[:128].strip() if not value: raise ValueError("Filename cannot be empty") - if sys.version_info.major == 3: - return value - else: - return value.decode('utf-8') + return value def split_authors(values): @@ -838,8 +833,8 @@ def get_download_link(book_id, book_format, client): ub.update_download(book_id, int(current_user.id)) file_name = book.title if len(book.authors) > 0: - file_name = book.authors[0].name + '_' + file_name - file_name = get_valid_filename(file_name) + file_name = file_name + ' - ' + book.authors[0].name + file_name = get_valid_filename(file_name, replace_whitespace=False) headers = Headers() headers["Content-Type"] = mimetypes.types_map.get('.' + book_format, "application/octet-stream") headers["Content-Disposition"] = "attachment; filename=%s.%s; filename*=UTF-8''%s.%s" % ( diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py index 1c26f74c..167ab8a3 100644 --- a/cps/metadata_provider/google.py +++ b/cps/metadata_provider/google.py @@ -41,7 +41,7 @@ class Google(Metadata): v['tags'] = r['volumeInfo'].get('categories', []) v['rating'] = r['volumeInfo'].get('averageRating', 0) if r['volumeInfo'].get('imageLinks'): - v['cover'] = r['volumeInfo']['imageLinks']['thumbnail'] + v['cover'] = r['volumeInfo']['imageLinks']['thumbnail'].replace("http://", "https://") else: v['cover'] = "/../../../static/generic_cover.jpg" v['source'] = { diff --git a/cps/search_metadata.py b/cps/search_metadata.py index 0e69b570..bba22aab 100644 --- a/cps/search_metadata.py +++ b/cps/search_metadata.py @@ -26,8 +26,10 @@ import inspect from flask import Blueprint, request, Response from flask_login import current_user from flask_login import login_required +from sqlalchemy.orm.attributes import flag_modified +from sqlalchemy.exc import OperationalError, InvalidRequestError -from . import constants, logger +from . import constants, logger, ub from cps.services.Metadata import Metadata meta = Blueprint('metadata', __name__) @@ -63,17 +65,29 @@ def metadata_provider(): active = current_user.view_settings.get('metadata', {}) provider = list() for c in cl: - provider.append({"name": c.__name__, "active": active.get(c.__name__, True), "id": c.__id__}) + provider.append({"name": c.__name__, "active": active.get(c.__id__, True), "id": c.__id__}) return Response(json.dumps(provider), mimetype='application/json') @meta.route("/metadata/provider", methods=['POST']) @login_required def metadata_change_active_provider(): + new_state = request.get_json() active = current_user.view_settings.get('metadata', {}) + active[new_state['id']] = new_state['value'] + current_user.view_settings['metadata'] = active + try: + try: + flag_modified(current_user, "view_settings") + except AttributeError: + pass + ub.session.commit() + except (InvalidRequestError, OperationalError): + log.error("Invalid request received: {}".format(request)) + return "Invalid request", 400 provider = list() for c in cl: - provider.append({"name": c.__name__, "active": active.get(c.__name__, True), "id": c.__id__}) - return Response(json.dumps(provider), mimetype='application/json') + provider.append({"name": c.__name__, "active": active.get(c.__id__, True), "id": c.__id__}) + return "" # Response(json.dumps(provider), mimetype='application/json') @meta.route("/metadata/search", methods=['POST']) @login_required @@ -83,6 +97,6 @@ def metadata_search(): active = current_user.view_settings.get('metadata', {}) if query: for c in cl: - if active.get(c.__name__, True): + if active.get(c.__id__, True): data.extend(c.search(query)) return Response(json.dumps(data), mimetype='application/json') diff --git a/cps/static/css/style.css b/cps/static/css/style.css index 5b7715fd..2bbdf370 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -123,6 +123,10 @@ table .bg-dark-danger a { color: #fff; } flex-wrap: wrap; } +.row-fluid.text-center { + margin-top: -20px; +} + .container-fluid img { display: block; max-width: 100%; @@ -166,6 +170,10 @@ table .bg-dark-danger a { color: #fff; } box-shadow: 0 5px 8px -6px #777; } +.datepicker.form-control { + position: static; +} + .container-fluid .book .cover span img { position: relative; top: 0; @@ -322,7 +330,7 @@ table .bg-dark-danger:hover { background-color: #c9302c; } table .bg-primary:hover { background-color: #1c5484; } .block-label { display: block; } -.fake-input { +.form-control.fake-input { position: absolute; pointer-events: none; top: 0; diff --git a/cps/static/js/details.js b/cps/static/js/details.js index 81c1a395..525b0008 100644 --- a/cps/static/js/details.js +++ b/cps/static/js/details.js @@ -30,7 +30,7 @@ $("#have_read_cb").on("change", function() { $("#flash_danger").remove(); if (!jQuery.isEmptyObject(data)) { data.forEach(function (item) { - $(".navbar").after('
        ' + + $(".navbar").after('
        ' + '
        ' + item.message + '
        ' + '
        '); }); diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js index c1d4d5a0..4b7f2873 100644 --- a/cps/static/js/get_meta.js +++ b/cps/static/js/get_meta.js @@ -82,7 +82,6 @@ $(function () { success: function success(data) { // console.log(data); data.forEach(function(provider) { - //$("#metadata_provider").html("
          "); var checked = ""; if (provider.active) { checked = "checked"; @@ -94,6 +93,17 @@ $(function () { }); } + $(document).on("change", ".pill", function () { + var id = $(this).data("control"); + var val = $(this).prop('checked'); + $.ajax({ + method:"post", + contentType: "application/json; charset=utf-8", + dataType: "json", + url: getPath() + "/metadata/provider", + data: JSON.stringify({id : id, value: val}), + }); + }); $("#meta-search").on("submit", function (e) { e.preventDefault(); diff --git a/cps/static/js/main.js b/cps/static/js/main.js index 69788c2e..7b224976 100644 --- a/cps/static/js/main.js +++ b/cps/static/js/main.js @@ -172,7 +172,7 @@ $("#delete_confirm").click(function() { if (item.format != "") { $("button[data-delete-format='"+item.format+"']").addClass('hidden'); } - $( ".navbar" ).after( '
          ' + + $( ".navbar" ).after( '
          ' + '
          '+item.message+'
          ' + '
          '); @@ -543,7 +543,7 @@ $(function() { function handle_response(data) { if (!jQuery.isEmptyObject(data)) { data.forEach(function (item) { - $(".navbar").after('
          ' + + $(".navbar").after('
          ' + '
          ' + item.message + '
          ' + '
          '); }); diff --git a/cps/static/js/table.js b/cps/static/js/table.js index a8a35909..ad46025c 100644 --- a/cps/static/js/table.js +++ b/cps/static/js/table.js @@ -744,7 +744,7 @@ function handleListServerResponse (data) { $("#flash_danger").remove(); if (!jQuery.isEmptyObject(data)) { data.forEach(function(item) { - $(".navbar").after('
          ' + + $(".navbar").after('
          ' + '
          ' + item.message + '
          ' + '
          '); }); diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index 20076321..78a5cdc1 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -111,8 +111,8 @@ {% endif %}
          - - + + @@ -156,11 +156,11 @@ {% if c.datatype == 'datetime' %}
          - 0 %} value="{% if book['custom_column_' ~ c.id][0].value %}{{ book['custom_column_' ~ c.id][0].value|formatdateinput}}{% endif %}" {% endif %}> - 0 %} value="{% if book['custom_column_' ~ c.id][0].value %}{{book['custom_column_' ~ c.id][0].value|formatdate}}{% endif %}" {% endif %}> diff --git a/cps/templates/config_db.html b/cps/templates/config_db.html index e0e1bfd1..c5027abf 100644 --- a/cps/templates/config_db.html +++ b/cps/templates/config_db.html @@ -1,6 +1,6 @@ {% extends "layout.html" %} {% block flash %} -