Commit 22c93e23 authored by Ozzie Isaacs's avatar Ozzie Isaacs

Merge branch 'master' into development

parents f77d72fd 8c751eb5
...@@ -384,14 +384,14 @@ class Custom_Columns(Base): ...@@ -384,14 +384,14 @@ class Custom_Columns(Base):
class AlchemyEncoder(json.JSONEncoder): class AlchemyEncoder(json.JSONEncoder):
def default(self, obj): def default(self, o):
if isinstance(obj.__class__, DeclarativeMeta): if isinstance(o.__class__, DeclarativeMeta):
# an SQLAlchemy class # an SQLAlchemy class
fields = {} fields = {}
for field in [x for x in dir(obj) if not x.startswith('_') and x != 'metadata']: for field in [x for x in dir(o) if not x.startswith('_') and x != 'metadata']:
if field == 'books': if field == 'books':
continue continue
data = obj.__getattribute__(field) data = o.__getattribute__(field)
try: try:
if isinstance(data, str): if isinstance(data, str):
data = data.replace("'", "\'") data = data.replace("'", "\'")
...@@ -411,12 +411,12 @@ class AlchemyEncoder(json.JSONEncoder): ...@@ -411,12 +411,12 @@ class AlchemyEncoder(json.JSONEncoder):
else: else:
json.dumps(data) json.dumps(data)
fields[field] = data fields[field] = data
except: except Exception:
fields[field] = "" fields[field] = ""
# a json-encodable dict # a json-encodable dict
return fields return fields
return json.JSONEncoder.default(self, obj) return json.JSONEncoder.default(self, o)
class CalibreDB(): class CalibreDB():
...@@ -563,8 +563,8 @@ class CalibreDB(): ...@@ -563,8 +563,8 @@ class CalibreDB():
def get_book_by_uuid(self, book_uuid): def get_book_by_uuid(self, book_uuid):
return self.session.query(Books).filter(Books.uuid == book_uuid).first() return self.session.query(Books).filter(Books.uuid == book_uuid).first()
def get_book_format(self, book_id, format): def get_book_format(self, book_id, file_format):
return self.session.query(Data).filter(Data.book == book_id).filter(Data.format == format).first() return self.session.query(Data).filter(Data.book == book_id).filter(Data.format == file_format).first()
# Language and content filters for displaying in the UI # Language and content filters for displaying in the UI
def common_filters(self, allow_show_archived=False): def common_filters(self, allow_show_archived=False):
...@@ -742,7 +742,7 @@ class CalibreDB(): ...@@ -742,7 +742,7 @@ class CalibreDB():
if old_session: if old_session:
try: try:
old_session.close() old_session.close()
except: except Exception:
pass pass
if old_session.bind: if old_session.bind:
try: try:
......
...@@ -47,7 +47,7 @@ except ImportError as err: ...@@ -47,7 +47,7 @@ except ImportError as err:
current_milli_time = lambda: int(round(time() * 1000)) current_milli_time = lambda: int(round(time() * 1000))
gdrive_watch_callback_token = 'target=calibreweb-watch_files' gdrive_watch_callback_token = 'target=calibreweb-watch_files' #nosec
@gdrive.route("/authenticate") @gdrive.route("/authenticate")
......
...@@ -42,8 +42,7 @@ from flask import ( ...@@ -42,8 +42,7 @@ from flask import (
from flask_login import current_user from flask_login import current_user
from werkzeug.datastructures import Headers from werkzeug.datastructures import Headers
from sqlalchemy import func from sqlalchemy import func
from sqlalchemy.sql.expression import and_, or_ from sqlalchemy.sql.expression import and_
from sqlalchemy.orm import load_only
from sqlalchemy.exc import StatementError from sqlalchemy.exc import StatementError
import requests import requests
...@@ -893,17 +892,6 @@ def HandleProductsRequest(dummy=None): ...@@ -893,17 +892,6 @@ def HandleProductsRequest(dummy=None):
return redirect_or_proxy_request() return redirect_or_proxy_request()
'''@kobo.errorhandler(404)
def handle_404(err):
# This handler acts as a catch-all for endpoints that we don't have an interest in
# implementing (e.g: v1/analytics/gettests, v1/user/recommendations, etc)
if err:
print('404')
return jsonify(error=str(err)), 404
log.debug("Unknown Request received: %s, method: %s, data: %s", request.base_url, request.method, request.data)
return redirect_or_proxy_request()'''
def make_calibre_web_auth_response(): def make_calibre_web_auth_response():
# As described in kobo_auth.py, CalibreWeb doesn't make use practical use of this auth/device API call for # As described in kobo_auth.py, CalibreWeb doesn't make use practical use of this auth/device API call for
# authentation (nor for authorization). We return a dummy response just to keep the device happy. # authentation (nor for authorization). We return a dummy response just to keep the device happy.
...@@ -947,7 +935,7 @@ def HandleInitRequest(): ...@@ -947,7 +935,7 @@ def HandleInitRequest():
store_response_json = store_response.json() store_response_json = store_response.json()
if "Resources" in store_response_json: if "Resources" in store_response_json:
kobo_resources = store_response_json["Resources"] kobo_resources = store_response_json["Resources"]
except: except Exception:
log.error("Failed to receive or parse response from Kobo's init endpoint. Falling back to un-proxied mode.") log.error("Failed to receive or parse response from Kobo's init endpoint. Falling back to un-proxied mode.")
if not kobo_resources: if not kobo_resources:
kobo_resources = NATIVE_KOBO_RESOURCES() kobo_resources = NATIVE_KOBO_RESOURCES()
......
...@@ -138,7 +138,7 @@ class WebServer(object): ...@@ -138,7 +138,7 @@ class WebServer(object):
return sock, _readable_listen_address(*address) return sock, _readable_listen_address(*address)
@staticmethod @staticmethod
def _get_args_for_reloading(self): def _get_args_for_reloading():
"""Determine how the script was executed, and return the args needed """Determine how the script was executed, and return the args needed
to execute it again in a new process. to execute it again in a new process.
Code from https://github.com/pyload/pyload. Author GammaC0de, voulter Code from https://github.com/pyload/pyload. Author GammaC0de, voulter
......
body.serieslist.grid-view div.container-fluid > div > div.col-sm-10:before{ body.serieslist.grid-view div.container-fluid > div > div.col-sm-10::before {
display: none; display: none;
} }
.cover .badge{ .cover .badge {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
...@@ -10,15 +10,15 @@ body.serieslist.grid-view div.container-fluid > div > div.col-sm-10:before{ ...@@ -10,15 +10,15 @@ body.serieslist.grid-view div.container-fluid > div > div.col-sm-10:before{
background-color: #cc7b19; background-color: #cc7b19;
border-radius: 0; border-radius: 0;
padding: 0 8px; padding: 0 8px;
box-shadow: 0 0 4px rgba(0, 0, 0, .6); box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
line-height: 24px; line-height: 24px;
} }
.cover { .cover {
box-shadow: 0 0 4px rgba(0, 0, 0, .6); box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
} }
.cover .read { .cover .read {
padding: 0px 0px; padding: 0 0;
line-height: 15px; line-height: 15px;
} }
...@@ -370,7 +370,7 @@ input:-moz-placeholder { color: #454545; } ...@@ -370,7 +370,7 @@ input:-moz-placeholder { color: #454545; }
} }
#searchResults li { #searchResults li {
margin-bottom:10px; margin-bottom: 10px;
width: 225px; width: 225px;
font-family: Georgia, "Times New Roman", Times, serif; font-family: Georgia, "Times New Roman", Times, serif;
list-style: none; list-style: none;
......
...@@ -36,7 +36,6 @@ $("#desc").click(function() { ...@@ -36,7 +36,6 @@ $("#desc").click(function() {
sortBy: "name", sortBy: "name",
sortAscending: true sortAscending: true
}); });
return;
}); });
$("#asc").click(function() { $("#asc").click(function() {
...@@ -52,19 +51,20 @@ $("#asc").click(function() { ...@@ -52,19 +51,20 @@ $("#asc").click(function() {
sortBy: "name", sortBy: "name",
sortAscending: false sortAscending: false
}); });
return;
}); });
$("#all").click(function() { $("#all").click(function() {
// go through all elements and make them visible // go through all elements and make them visible
$list.isotope({ filter: function() { $list.isotope({ filter: function() {
return true; return true;
} }) }
});
}); });
$(".char").click(function() { $(".char").click(function() {
var character = this.innerText; var character = this.innerText;
$list.isotope({ filter: function() { $list.isotope({ filter: function() {
return this.attributes["data-id"].value.charAt(0).toUpperCase() == character; return this.attributes["data-id"].value.charAt(0).toUpperCase() == character;
} }) }
});
}); });
...@@ -138,8 +138,8 @@ $(function () { ...@@ -138,8 +138,8 @@ $(function () {
seriesTitle = result.series.title; seriesTitle = result.series.title;
} }
var dateFomers = result.pubdate.split("-"); var dateFomers = result.pubdate.split("-");
var publishedYear = parseInt(dateFomers[0]); var publishedYear = parseInt(dateFomers[0], 10);
var publishedMonth = parseInt(dateFomers[1]); var publishedMonth = parseInt(dateFomers[1], 10);
var publishedDate = new Date(publishedYear, publishedMonth - 1, 1); var publishedDate = new Date(publishedYear, publishedMonth - 1, 1);
publishedDate = formatDate(publishedDate); publishedDate = formatDate(publishedDate);
...@@ -194,8 +194,8 @@ $(function () { ...@@ -194,8 +194,8 @@ $(function () {
} else { } else {
dateFomers = result.date_added.split("-"); dateFomers = result.date_added.split("-");
} }
var publishedYear = parseInt(dateFomers[0]); var publishedYear = parseInt(dateFomers[0], 10);
var publishedMonth = parseInt(dateFomers[1]); var publishedMonth = parseInt(dateFomers[1], 10);
var publishedDate = new Date(publishedYear, publishedMonth - 1, 1); var publishedDate = new Date(publishedYear, publishedMonth - 1, 1);
publishedDate = formatDate(publishedDate); publishedDate = formatDate(publishedDate);
......
...@@ -114,7 +114,7 @@ $(document).ready(function() { ...@@ -114,7 +114,7 @@ $(document).ready(function() {
} }
}); });
function ConfirmDialog(id, dataValue, yesFn, noFn) { function confirmDialog(id, dataValue, yesFn, noFn) {
var $confirm = $("#GeneralDeleteModal"); var $confirm = $("#GeneralDeleteModal");
// var dataValue= e.data('value'); // target.data('value'); // var dataValue= e.data('value'); // target.data('value');
$confirm.modal('show'); $confirm.modal('show');
...@@ -481,7 +481,7 @@ $(function() { ...@@ -481,7 +481,7 @@ $(function() {
}); });
$("#config_delete_kobo_token").click(function() { $("#config_delete_kobo_token").click(function() {
ConfirmDialog( confirmDialog(
$(this).attr('id'), $(this).attr('id'),
$(this).data('value'), $(this).data('value'),
function (value) { function (value) {
...@@ -509,7 +509,7 @@ $(function() { ...@@ -509,7 +509,7 @@ $(function() {
}); });
$("#btndeluser").click(function() { $("#btndeluser").click(function() {
ConfirmDialog( confirmDialog(
$(this).attr('id'), $(this).attr('id'),
$(this).data('value'), $(this).data('value'),
function(value){ function(value){
...@@ -527,7 +527,7 @@ $(function() { ...@@ -527,7 +527,7 @@ $(function() {
}); });
$("#delete_shelf").click(function() { $("#delete_shelf").click(function() {
ConfirmDialog( confirmDialog(
$(this).attr('id'), $(this).attr('id'),
$(this).data('value'), $(this).data('value'),
function(value){ function(value){
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
*/ */
/* exported TableActions, RestrictionActions, EbookActions, responseHandler */ /* exported TableActions, RestrictionActions, EbookActions, responseHandler */
/* global getPath, ConfirmDialog */ /* global getPath, confirmDialog */
var selections = []; var selections = [];
...@@ -210,7 +210,7 @@ $(function() { ...@@ -210,7 +210,7 @@ $(function() {
striped: false striped: false
}); });
function domain_handle(domainId) { function domainHandle(domainId) {
$.ajax({ $.ajax({
method:"post", method:"post",
url: window.location.pathname + "/../../ajax/deletedomain", url: window.location.pathname + "/../../ajax/deletedomain",
...@@ -237,12 +237,12 @@ $(function() { ...@@ -237,12 +237,12 @@ $(function() {
} }
$("#domain-allow-table").on("click-cell.bs.table", function (field, value, row, $element) { $("#domain-allow-table").on("click-cell.bs.table", function (field, value, row, $element) {
if (value === 2) { if (value === 2) {
ConfirmDialog("btndeletedomain", $element.id, domain_handle); confirmDialog("btndeletedomain", $element.id, domainHandle);
} }
}); });
$("#domain-deny-table").on("click-cell.bs.table", function (field, value, row, $element) { $("#domain-deny-table").on("click-cell.bs.table", function (field, value, row, $element) {
if (value === 2) { if (value === 2) {
ConfirmDialog("btndeletedomain", $element.id, domain_handle); confirmDialog("btndeletedomain", $element.id, domainHandle);
} }
}); });
...@@ -256,12 +256,12 @@ $(function() { ...@@ -256,12 +256,12 @@ $(function() {
$("#h3").addClass("hidden"); $("#h3").addClass("hidden");
$("#h4").addClass("hidden"); $("#h4").addClass("hidden");
}); });
function startTable(type, user_id) { function startTable(type, userId) {
$("#restrict-elements-table").bootstrapTable({ $("#restrict-elements-table").bootstrapTable({
formatNoMatches: function () { formatNoMatches: function () {
return ""; return "";
}, },
url: getPath() + "/ajax/listrestriction/" + type + "/" + user_id, url: getPath() + "/ajax/listrestriction/" + type + "/" + userId,
rowStyle: function(row) { rowStyle: function(row) {
// console.log('Reihe :' + row + " Index :" + index); // console.log('Reihe :' + row + " Index :" + index);
if (row.id.charAt(0) === "a") { if (row.id.charAt(0) === "a") {
...@@ -275,13 +275,13 @@ $(function() { ...@@ -275,13 +275,13 @@ $(function() {
$.ajax ({ $.ajax ({
type: "Post", type: "Post",
data: "id=" + row.id + "&type=" + row.type + "&Element=" + encodeURIComponent(row.Element), data: "id=" + row.id + "&type=" + row.type + "&Element=" + encodeURIComponent(row.Element),
url: getPath() + "/ajax/deleterestriction/" + type + "/" + user_id, url: getPath() + "/ajax/deleterestriction/" + type + "/" + userId,
async: true, async: true,
timeout: 900, timeout: 900,
success:function() { success:function() {
$.ajax({ $.ajax({
method:"get", method:"get",
url: getPath() + "/ajax/listrestriction/" + type + "/" + user_id, url: getPath() + "/ajax/listrestriction/" + type + "/" + userId,
async: true, async: true,
timeout: 900, timeout: 900,
success:function(data) { success:function(data) {
...@@ -297,7 +297,7 @@ $(function() { ...@@ -297,7 +297,7 @@ $(function() {
$("#restrict-elements-table").removeClass("table-hover"); $("#restrict-elements-table").removeClass("table-hover");
$("#restrict-elements-table").on("editable-save.bs.table", function (e, field, row) { $("#restrict-elements-table").on("editable-save.bs.table", function (e, field, row) {
$.ajax({ $.ajax({
url: getPath() + "/ajax/editrestriction/" + type + "/" + user_id, url: getPath() + "/ajax/editrestriction/" + type + "/" + userId,
type: "Post", type: "Post",
data: row data: row
}); });
...@@ -305,13 +305,13 @@ $(function() { ...@@ -305,13 +305,13 @@ $(function() {
$("[id^=submit_]").click(function() { $("[id^=submit_]").click(function() {
$(this)[0].blur(); $(this)[0].blur();
$.ajax({ $.ajax({
url: getPath() + "/ajax/addrestriction/" + type + "/" + user_id, url: getPath() + "/ajax/addrestriction/" + type + "/" + userId,
type: "Post", type: "Post",
data: $(this).closest("form").serialize() + "&" + $(this)[0].name + "=", data: $(this).closest("form").serialize() + "&" + $(this)[0].name + "=",
success: function () { success: function () {
$.ajax ({ $.ajax ({
method:"get", method:"get",
url: getPath() + "/ajax/listrestriction/" + type + "/" + user_id, url: getPath() + "/ajax/listrestriction/" + type + "/" + userId,
async: true, async: true,
timeout: 900, timeout: 900,
success:function(data) { success:function(data) {
...@@ -333,12 +333,12 @@ $(function() { ...@@ -333,12 +333,12 @@ $(function() {
$("#h1").removeClass("hidden"); $("#h1").removeClass("hidden");
}); });
$("#get_user_column_values").on("click", function() { $("#get_user_column_values").on("click", function() {
startTable(3, $(this).data('id')); startTable(3, $(this).data("id"));
$("#h4").removeClass("hidden"); $("#h4").removeClass("hidden");
}); });
$("#get_user_tags").on("click", function() { $("#get_user_tags").on("click", function() {
startTable(2, $(this).data('id')); startTable(2, $(this).data("id"));
$(this)[0].blur(); $(this)[0].blur();
$("#h3").removeClass("hidden"); $("#h3").removeClass("hidden");
}); });
......
...@@ -610,7 +610,7 @@ def migrate_Database(session): ...@@ -610,7 +610,7 @@ def migrate_Database(session):
"locale VARCHAR(2)," "locale VARCHAR(2),"
"sidebar_view INTEGER," "sidebar_view INTEGER,"
"default_language VARCHAR(3)," "default_language VARCHAR(3),"
"view_settings VARCHAR," "view_settings VARCHAR,"
"UNIQUE (nickname)," "UNIQUE (nickname),"
"UNIQUE (email))") "UNIQUE (email))")
conn.execute("INSERT INTO user_id(id, nickname, email, role, password, kindle_mail,locale," conn.execute("INSERT INTO user_id(id, nickname, email, role, password, kindle_mail,locale,"
......
...@@ -272,7 +272,8 @@ class Updater(threading.Thread): ...@@ -272,7 +272,8 @@ class Updater(threading.Thread):
log.debug("Could not remove: %s", item_path) log.debug("Could not remove: %s", item_path)
shutil.rmtree(source, ignore_errors=True) shutil.rmtree(source, ignore_errors=True)
def is_venv(self): @staticmethod
def is_venv():
if (hasattr(sys, 'real_prefix')) or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix): if (hasattr(sys, 'real_prefix')) or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
return os.sep + os.path.relpath(sys.prefix, constants.BASE_DIR) return os.sep + os.path.relpath(sys.prefix, constants.BASE_DIR)
else: else:
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment