Merge branch 'master' into development
# Conflicts: # cps/static/css/style.css
This commit is contained in:
Ozzie Isaacs
commit
f77d72fd86
34
cps/comic.py
34
cps/comic.py
|
|
@ -74,19 +74,8 @@ def _cover_processing(tmp_file_name, img, extension):
|
|||
return tmp_cover_name
|
||||
|
||||
|
||||
|
||||
def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
|
||||
cover_data = extension = None
|
||||
if use_comic_meta:
|
||||
archive = ComicArchive(tmp_file_name, rar_exe_path=rarExecutable)
|
||||
for index, name in enumerate(archive.getPageNameList()):
|
||||
ext = os.path.splitext(name)
|
||||
if len(ext) > 1:
|
||||
extension = ext[1].lower()
|
||||
if extension in COVER_EXTENSIONS:
|
||||
cover_data = archive.getPage(index)
|
||||
break
|
||||
else:
|
||||
def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable):
|
||||
cover_data = None
|
||||
if original_file_extension.upper() == '.CBZ':
|
||||
cf = zipfile.ZipFile(tmp_file_name)
|
||||
for name in cf.namelist():
|
||||
|
|
@ -118,6 +107,22 @@ def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
|
|||
break
|
||||
except Exception as e:
|
||||
log.debug('Rarfile failed with error: %s', e)
|
||||
return cover_data
|
||||
|
||||
|
||||
def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
|
||||
cover_data = extension = None
|
||||
if use_comic_meta:
|
||||
archive = ComicArchive(tmp_file_name, rar_exe_path=rarExecutable)
|
||||
for index, name in enumerate(archive.getPageNameList()):
|
||||
ext = os.path.splitext(name)
|
||||
if len(ext) > 1:
|
||||
extension = ext[1].lower()
|
||||
if extension in COVER_EXTENSIONS:
|
||||
cover_data = archive.getPage(index)
|
||||
break
|
||||
else:
|
||||
cover_data = _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable)
|
||||
return _cover_processing(tmp_file_name, cover_data, extension)
|
||||
|
||||
|
||||
|
|
@ -142,7 +147,8 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
|
|||
file_path=tmp_file_path,
|
||||
extension=original_file_extension,
|
||||
title=loadedMetadata.title or original_file_name,
|
||||
author=" & ".join([credit["person"] for credit in loadedMetadata.credits if credit["role"] == "Writer"]) or u'Unknown',
|
||||
author=" & ".join([credit["person"]
|
||||
for credit in loadedMetadata.credits if credit["role"] == "Writer"]) or u'Unknown',
|
||||
cover=_extractCover(tmp_file_path, original_file_extension, rarExecutable),
|
||||
description=loadedMetadata.comments or "",
|
||||
tags="",
|
||||
|
|
|
|||
|
|
@ -146,15 +146,16 @@ class _ConfigSQL(object):
|
|||
self.load()
|
||||
|
||||
change = False
|
||||
if self.config_converterpath == None:
|
||||
if self.config_converterpath == None: # pylint: disable=access-member-before-definition
|
||||
change = True
|
||||
self.config_converterpath = autodetect_calibre_binary()
|
||||
|
||||
if self.config_kepubifypath == None:
|
||||
if self.config_kepubifypath == None: # pylint: disable=access-member-before-definition
|
||||
|
||||
change = True
|
||||
self.config_kepubifypath = autodetect_kepubify_binary()
|
||||
|
||||
if self.config_rarfile_location == None:
|
||||
if self.config_rarfile_location == None: # pylint: disable=access-member-before-definition
|
||||
change = True
|
||||
self.config_rarfile_location = autodetect_unrar_binary()
|
||||
if change:
|
||||
|
|
@ -181,7 +182,8 @@ class _ConfigSQL(object):
|
|||
return None
|
||||
return self.config_keyfile
|
||||
|
||||
def get_config_ipaddress(self):
|
||||
@staticmethod
|
||||
def get_config_ipaddress():
|
||||
return cli.ipadress or ""
|
||||
|
||||
def _has_role(self, role_flag):
|
||||
|
|
@ -299,6 +301,7 @@ class _ConfigSQL(object):
|
|||
have_metadata_db = os.path.isfile(db_file)
|
||||
self.db_configured = have_metadata_db
|
||||
constants.EXTENSIONS_UPLOAD = [x.lstrip().rstrip().lower() for x in self.config_upload_formats.split(',')]
|
||||
# pylint: disable=access-member-before-definition
|
||||
logfile = logger.setup(self.config_logfile, self.config_log_level)
|
||||
if logfile != self.config_logfile:
|
||||
log.warning("Log path %s not valid, falling back to default", self.config_logfile)
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ LDAP_AUTH_SIMPLE = 0
|
|||
|
||||
DEFAULT_MAIL_SERVER = "mail.example.org"
|
||||
|
||||
DEFAULT_PASSWORD = "admin123"
|
||||
DEFAULT_PASSWORD = "admin123" # nosec # noqa
|
||||
DEFAULT_PORT = 8083
|
||||
env_CALIBRE_PORT = os.environ.get("CALIBRE_PORT", DEFAULT_PORT)
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -156,10 +156,8 @@ class Identifiers(Base):
|
|||
return u"https://portal.issn.org/resource/ISSN/{0}".format(self.val)
|
||||
elif format_type == "isfdb":
|
||||
return u"http://www.isfdb.org/cgi-bin/pl.cgi?{0}".format(self.val)
|
||||
elif format_type == "url":
|
||||
return u"{0}".format(self.val)
|
||||
else:
|
||||
return u""
|
||||
return u"{0}".format(self.val)
|
||||
|
||||
|
||||
class Comments(Base):
|
||||
|
|
|
|||
|
|
@ -134,17 +134,11 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
|
|||
taskMessage=_(u"Registration e-mail for user: %(name)s", name=user_name),
|
||||
text=txt
|
||||
))
|
||||
|
||||
return
|
||||
|
||||
|
||||
def check_send_to_kindle(entry):
|
||||
"""
|
||||
returns all available book formats for sending to Kindle
|
||||
"""
|
||||
if len(entry.data):
|
||||
def check_send_to_kindle_without_converter(entry):
|
||||
bookformats = list()
|
||||
if not config.config_converterpath:
|
||||
# no converter - only for mobi and pdf formats
|
||||
for ele in iter(entry.data):
|
||||
if ele.uncompressed_size < config.mail_size:
|
||||
|
|
@ -160,7 +154,10 @@ def check_send_to_kindle(entry):
|
|||
bookformats.append({'format': 'Azw',
|
||||
'convert': 0,
|
||||
'text': _('Send %(format)s to Kindle', format='Azw')})
|
||||
else:
|
||||
return bookformats
|
||||
|
||||
def check_send_to_kindle_with_converter(entry):
|
||||
bookformats = list()
|
||||
formats = list()
|
||||
for ele in iter(entry.data):
|
||||
if ele.uncompressed_size < config.mail_size:
|
||||
|
|
@ -177,7 +174,6 @@ def check_send_to_kindle(entry):
|
|||
bookformats.append({'format': 'Pdf',
|
||||
'convert': 0,
|
||||
'text': _('Send %(format)s to Kindle', format='Pdf')})
|
||||
if config.config_converterpath:
|
||||
if 'EPUB' in formats and 'MOBI' not in formats:
|
||||
bookformats.append({'format': 'Mobi',
|
||||
'convert': 1,
|
||||
|
|
@ -191,6 +187,18 @@ def check_send_to_kindle(entry):
|
|||
orig='Azw3',
|
||||
format='Mobi')})
|
||||
return bookformats
|
||||
|
||||
|
||||
def check_send_to_kindle(entry):
|
||||
"""
|
||||
returns all available book formats for sending to Kindle
|
||||
"""
|
||||
if len(entry.data):
|
||||
if not config.config_converterpath:
|
||||
book_formats = check_send_to_kindle_with_converter(entry)
|
||||
else:
|
||||
book_formats = check_send_to_kindle_with_converter(entry)
|
||||
return book_formats
|
||||
else:
|
||||
log.error(u'Cannot find book entry %d', entry.id)
|
||||
return None
|
||||
|
|
@ -742,7 +750,7 @@ def format_runtime(runtime):
|
|||
# helper function to apply localize status information in tasklist entries
|
||||
def render_task_status(tasklist):
|
||||
renderedtasklist = list()
|
||||
for num, user, added, task in tasklist:
|
||||
for __, user, added, task in tasklist:
|
||||
if user == current_user.nickname or current_user.role_admin():
|
||||
ret = {}
|
||||
if task.start_time:
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ def get_valid_language_codes(locale, language_names, remainder=None):
|
|||
languages = list()
|
||||
if "" in language_names:
|
||||
language_names.remove("")
|
||||
for k, v in get_language_names(locale).items():
|
||||
for k, __ in get_language_names(locale).items():
|
||||
if k in language_names:
|
||||
languages.append(k)
|
||||
language_names.remove(k)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
from __future__ import division, print_function, unicode_literals
|
||||
from flask import session
|
||||
|
||||
|
||||
try:
|
||||
from flask_dance.consumer.backend.sqla import SQLAlchemyBackend, first, _get_real_user
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
|
|
@ -34,7 +33,7 @@ except ImportError:
|
|||
except ImportError:
|
||||
pass
|
||||
|
||||
try:
|
||||
|
||||
class OAuthBackend(SQLAlchemyBackend):
|
||||
"""
|
||||
Stores and retrieves OAuth tokens using a relational database through
|
||||
|
|
@ -162,6 +161,3 @@ try:
|
|||
self.cache.delete(self.make_cache_key(
|
||||
blueprint=blueprint, user=user, user_id=user_id,
|
||||
))
|
||||
|
||||
except Exception:
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -35,7 +35,10 @@ from sqlalchemy.orm.exc import NoResultFound
|
|||
|
||||
from . import constants, logger, config, app, ub
|
||||
|
||||
try:
|
||||
from .oauth import OAuthBackend, backend_resultcode
|
||||
except NameError:
|
||||
pass
|
||||
|
||||
|
||||
oauth_check = {}
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ class WebServer(object):
|
|||
|
||||
return sock, _readable_listen_address(*address)
|
||||
|
||||
|
||||
@staticmethod
|
||||
def _get_args_for_reloading(self):
|
||||
"""Determine how the script was executed, and return the args needed
|
||||
to execute it again in a new process.
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ class SyncToken:
|
|||
books_last_modified: Datetime representing the last modified book that the device knows about.
|
||||
"""
|
||||
|
||||
SYNC_TOKEN_HEADER = "x-kobo-synctoken"
|
||||
SYNC_TOKEN_HEADER = "x-kobo-synctoken" # nosec
|
||||
VERSION = "1-1-0"
|
||||
LAST_MODIFIED_ADDED_VERSION = "1-1-0"
|
||||
MIN_VERSION = "1-0-0"
|
||||
|
|
@ -91,7 +91,7 @@ class SyncToken:
|
|||
|
||||
def __init__(
|
||||
self,
|
||||
raw_kobo_store_token="",
|
||||
raw_kobo_store_token="", # nosec
|
||||
books_last_created=datetime.min,
|
||||
books_last_modified=datetime.min,
|
||||
archive_last_modified=datetime.min,
|
||||
|
|
@ -110,7 +110,7 @@ class SyncToken:
|
|||
@staticmethod
|
||||
def from_headers(headers):
|
||||
sync_token_header = headers.get(SyncToken.SYNC_TOKEN_HEADER, "")
|
||||
if sync_token_header == "":
|
||||
if sync_token_header == "": # nosec
|
||||
return SyncToken()
|
||||
|
||||
# On the first sync from a Kobo device, we may receive the SyncToken
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
body.serieslist.grid-view div.container-fluid > div > div.col-sm-10:before{
|
||||
display: none;
|
||||
}
|
||||
|
||||
.cover .badge{
|
||||
position: absolute;
|
||||
top: 0;
|
||||
|
|
@ -12,11 +13,12 @@ body.serieslist.grid-view div.container-fluid>div>div.col-sm-10:before{
|
|||
box-shadow: 0 0 4px rgba(0, 0, 0, .6);
|
||||
line-height: 24px;
|
||||
}
|
||||
|
||||
.cover {
|
||||
box-shadow: 0 0 4px rgba(0, 0, 0, .6);
|
||||
}
|
||||
|
||||
.cover .read {
|
||||
padding: 0 0px;
|
||||
padding: 0px 0px;
|
||||
line-height: 15px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ body {
|
|||
position: relative;
|
||||
cursor: pointer;
|
||||
padding: 4px;
|
||||
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
|
|
@ -45,7 +44,7 @@ body {
|
|||
|
||||
#sidebar a.active,
|
||||
#sidebar a.active img + span {
|
||||
background-color: #45B29D;
|
||||
background-color: #45b29d;
|
||||
}
|
||||
|
||||
#sidebar li img {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ body {
|
|||
height: 8%;
|
||||
min-height: 20px;
|
||||
padding: 10px;
|
||||
/* margin: 0 50px 0 50px; */
|
||||
position: relative;
|
||||
color: #4f4f4f;
|
||||
font-weight: 100;
|
||||
|
|
@ -114,7 +113,7 @@ body {
|
|||
top: 50%;
|
||||
margin-top: -192px;
|
||||
font-size: 64px;
|
||||
color: #E2E2E2;
|
||||
color: #e2e2e2;
|
||||
font-family: arial, sans-serif;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
|
|
@ -148,12 +147,6 @@ body {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
#sidebar.open {
|
||||
/* left: 0; */
|
||||
/* -webkit-transform: translate(0, 0);
|
||||
-moz-transform: translate(0, 0); */
|
||||
}
|
||||
|
||||
#main.closed {
|
||||
/* left: 300px; */
|
||||
-webkit-transform: translate(300px, 0);
|
||||
|
|
@ -238,7 +231,7 @@ input:-moz-placeholder { color: #454545; }
|
|||
left: 50%;
|
||||
margin-left: -1px;
|
||||
top: 10%;
|
||||
opacity: .15;
|
||||
opacity: 0.15;
|
||||
box-shadow: -2px 0 15px rgba(0, 0, 0, 1);
|
||||
display: none;
|
||||
}
|
||||
|
|
@ -299,8 +292,7 @@ input:-moz-placeholder { color: #454545; }
|
|||
}
|
||||
|
||||
#tocView li:active,
|
||||
#tocView li.currentChapter
|
||||
{
|
||||
#tocView li.currentChapter {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
|
|
@ -319,7 +311,7 @@ input:-moz-placeholder { color: #454545; }
|
|||
|
||||
.list_item.currentChapter > a,
|
||||
.list_item a:hover {
|
||||
color: #f1f1f1
|
||||
color: #f1f1f1;
|
||||
}
|
||||
|
||||
/* #tocView li.openChapter > a, */
|
||||
|
|
@ -449,7 +441,8 @@ input:-moz-placeholder { color: #454545; }
|
|||
border-radius: 5px;
|
||||
}
|
||||
|
||||
#note-text[disabled], #note-text[disabled="disabled"]{
|
||||
#note-text[disabled],
|
||||
#note-text[disabled="disabled"]{
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
|
|
@ -484,20 +477,18 @@ input:-moz-placeholder { color: #454545; }
|
|||
#settingsPanel .large { font-size: large; }
|
||||
#settingsPanel .xlarge { font-size: x-large; }
|
||||
|
||||
.highlight { background-color: yellow }
|
||||
.highlight { background-color: yellow; }
|
||||
|
||||
.modal {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
// width: 50%;
|
||||
width: 630px;
|
||||
height: auto;
|
||||
z-index: 2000;
|
||||
visibility: hidden;
|
||||
margin-left: -320px;
|
||||
margin-top: -160px;
|
||||
|
||||
}
|
||||
|
||||
.overlay {
|
||||
|
|
@ -593,7 +584,6 @@ input:-moz-placeholder { color: #454545; }
|
|||
}
|
||||
|
||||
.md-content > .closer {
|
||||
//font-size: 18px;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
|
|
@ -653,9 +643,9 @@ input:-moz-placeholder { color: #454545; }
|
|||
-webkit-transform: translate(0, 0);
|
||||
-moz-transform: translate(0, 0);
|
||||
-ms-transform: translate(0, 0);
|
||||
-webkit-transition: -webkit-transform .3s;
|
||||
-moz-transition: -moz-transform .3s;
|
||||
transition: -moz-transform .3s;
|
||||
-webkit-transition: -webkit-transform 0.3s;
|
||||
-moz-transition: -moz-transform 0.3s;
|
||||
transition: -moz-transform 0.3s;
|
||||
}
|
||||
|
||||
#main.closed {
|
||||
|
|
@ -686,7 +676,6 @@ input:-moz-placeholder { color: #454545; }
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/* For iPad portrait layouts only */
|
||||
@media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: portrait) {
|
||||
#viewer iframe {
|
||||
|
|
@ -694,13 +683,6 @@ input:-moz-placeholder { color: #454545; }
|
|||
height: 740px;
|
||||
}
|
||||
}
|
||||
/*For iPad landscape layouts only *//*
|
||||
@media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: landscape) {
|
||||
#viewer iframe {
|
||||
width: 460px;
|
||||
height: 415px;
|
||||
}
|
||||
}*/
|
||||
|
||||
@media only screen
|
||||
and (min-device-width : 768px)
|
||||
|
|
|
|||
|
|
@ -51,7 +51,11 @@ body h2 {
|
|||
color: #444;
|
||||
}
|
||||
|
||||
a, .danger, .book-remove, .user-remove, .editable-empty, .editable-empty:hover { color: #45b29d; }
|
||||
a,
|
||||
.danger,
|
||||
.book-remove,
|
||||
.editable-empty,
|
||||
.editable-empty:hover { color: #45b29d; }
|
||||
|
||||
.book-remove:hover { color: #23527c; }
|
||||
|
||||
|
|
@ -68,7 +72,9 @@ a, .danger, .book-remove, .user-remove, .editable-empty, .editable-empty:hover {
|
|||
color: #45b29d;
|
||||
}
|
||||
|
||||
.editable-click, a.editable-click, a.editable-click:hover { border-bottom: None; }
|
||||
.editable-click,
|
||||
a.editable-click,
|
||||
a.editable-click:hover { border-bottom: None; }
|
||||
|
||||
.navigation .nav-head {
|
||||
text-transform: uppercase;
|
||||
|
|
@ -124,6 +130,7 @@ a, .danger, .book-remove, .user-remove, .editable-empty, .editable-empty:hover {
|
|||
.container-fluid .discover { margin-bottom: 50px; }
|
||||
.container-fluid .new-books { border-top: 1px solid #ccc; }
|
||||
.container-fluid .new-books h2 { margin: 50px 0 0 0; }
|
||||
|
||||
.container-fluid .book {
|
||||
margin-top: 20px;
|
||||
display: flex;
|
||||
|
|
@ -176,9 +183,10 @@ a, .danger, .book-remove, .user-remove, .editable-empty, .editable-empty:hover {
|
|||
.container-fluid .book .meta .rating { margin-top: 5px; }
|
||||
.rating .glyphicon-star-empty { color: #444; }
|
||||
.rating .glyphicon-star.good { color: #444; }
|
||||
.rating-clear .glyphicon-remove { color: #333 }
|
||||
.rating-clear .glyphicon-remove { color: #333; }
|
||||
|
||||
.container-fluid .author .author-hidden, .container-fluid .author .author-hidden-divider { display: none; }
|
||||
.container-fluid .author .author-hidden,
|
||||
.container-fluid .author .author-hidden-divider { display: none; }
|
||||
|
||||
.navbar-brand {
|
||||
font-family: 'Grand Hotel', cursive;
|
||||
|
|
@ -225,6 +233,7 @@ span.glyphicon.glyphicon-tags {
|
|||
border-radius: 10px;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.cover .read {
|
||||
left: auto;
|
||||
right: 2px;
|
||||
|
|
@ -240,7 +249,10 @@ span.glyphicon.glyphicon-tags {
|
|||
max-height: 200px;
|
||||
}
|
||||
|
||||
.btn-file {position: relative; overflow: hidden;}
|
||||
.btn-file {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.btn-file input[type=file] {
|
||||
position: absolute;
|
||||
|
|
@ -258,24 +270,62 @@ span.glyphicon.glyphicon-tags {
|
|||
display: block;
|
||||
}
|
||||
|
||||
.btn-toolbar .btn,.discover .btn { margin-bottom: 5px; }
|
||||
.btn-toolbar .btn,
|
||||
.discover .btn { margin-bottom: 5px; }
|
||||
.button-link { color: #fff; }
|
||||
.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ background-color: #1C5484; }
|
||||
.btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #89B9E2; }
|
||||
.btn-toolbar>.btn+.btn, .btn-toolbar>.btn-group+.btn, .btn-toolbar>.btn+.btn-group, .btn-toolbar>.btn-group+.btn-group { margin-left: 0; }
|
||||
|
||||
.btn-primary:hover,
|
||||
.btn-primary:focus,
|
||||
.btn-primary:active,
|
||||
.btn-primary.active,
|
||||
.open .dropdown-toggle.btn-primary { background-color: #1c5484; }
|
||||
|
||||
.btn-primary.disabled,
|
||||
.btn-primary[disabled],
|
||||
fieldset[disabled] .btn-primary,
|
||||
.btn-primary.disabled:hover,
|
||||
.btn-primary[disabled]:hover,
|
||||
fieldset[disabled] .btn-primary:hover,
|
||||
.btn-primary.disabled:focus,
|
||||
.btn-primary[disabled]:focus,
|
||||
fieldset[disabled] .btn-primary:focus,
|
||||
.btn-primary.disabled:active,
|
||||
.btn-primary[disabled]:active,
|
||||
fieldset[disabled] .btn-primary:active,
|
||||
.btn-primary.disabled.active,
|
||||
.btn-primary[disabled].active,
|
||||
fieldset[disabled] .btn-primary.active { background-color: #89b9e2; }
|
||||
|
||||
.btn-toolbar > .btn + .btn,
|
||||
.btn-toolbar > .btn-group + .btn,
|
||||
.btn-toolbar > .btn + .btn-group,
|
||||
.btn-toolbar > .btn-group + .btn-group { margin-left: 0; }
|
||||
|
||||
.panel-body { background-color: #f5f5f5; }
|
||||
.spinner { margin: 0 41%; }
|
||||
.spinner2 { margin: 0 41%; }
|
||||
.intend-form { margin-left: 20px; }
|
||||
table .bg-dark-danger {background-color: #d9534f; color: #fff; }
|
||||
|
||||
table .bg-dark-danger {
|
||||
background-color: #d9534f;
|
||||
color: #fff;
|
||||
}
|
||||
table .bg-dark-danger a { color: #fff; }
|
||||
table .bg-dark-danger:hover { background-color: #c9302c; }
|
||||
table .bg-primary:hover {background-color: #1C5484; }
|
||||
table .bg-primary:hover { background-color: #1c5484; }
|
||||
table .bg-primary a { color: #fff; }
|
||||
.block-label { display: block; }
|
||||
.fake-input {position: absolute; pointer-events: none; top: 0; }
|
||||
|
||||
input.pill { position: absolute; opacity: 0; }
|
||||
.fake-input {
|
||||
position: absolute;
|
||||
pointer-events: none;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
input.pill {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
input.pill + label {
|
||||
border: 2px solid #45b29d;
|
||||
|
|
@ -298,11 +348,24 @@ input.pill:checked + label {
|
|||
input.pill:not(:checked) + label .glyphicon { display: none; }
|
||||
|
||||
.author-bio img { margin: 0 1em 1em 0; }
|
||||
.author-link { display: inline-block; margin-top: 10px; width: 100px; }
|
||||
.author-link img { display: block; height: 100%; }
|
||||
#remove-from-shelves .btn, #shelf-action-errors { margin-left: 5px; }
|
||||
|
||||
.tags_click, .serie_click, .language_click { margin-right: 5px; }
|
||||
.author-link {
|
||||
display: inline-block;
|
||||
margin-top: 10px;
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
.author-link img {
|
||||
display: block;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
#remove-from-shelves .btn,
|
||||
#shelf-action-errors { margin-left: 5px; }
|
||||
|
||||
.tags_click,
|
||||
.serie_click,
|
||||
.language_click { margin-right: 5px; }
|
||||
|
||||
#meta-info {
|
||||
height: 600px;
|
||||
|
|
|
|||
|
|
@ -677,7 +677,7 @@ $(".navbar-collapse.collapse.in").before('<div class="sidebar-backdrop"></div>')
|
|||
// Get rid of leading white space
|
||||
recentlyAdded = $("#nav_new a:contains('Recently')").text().trim();
|
||||
$("#nav_new a:contains('Recently')").contents().filter(function () {
|
||||
return this.nodeType == 3
|
||||
return this.nodeType === 3
|
||||
}).each(function () {
|
||||
this.textContent = this.textContent.replace(" Recently Added", recentlyAdded);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/**
|
||||
* Created by SpeedProg on 05.04.2015.
|
||||
*/
|
||||
/* global Bloodhound, language, Modernizr, tinymce */
|
||||
/* global Bloodhound, language, Modernizr, tinymce, getPath */
|
||||
|
||||
if ($("#description").length) {
|
||||
tinymce.init({
|
||||
|
|
@ -250,7 +250,7 @@ promisePublishers.done(function() {
|
|||
});
|
||||
|
||||
$("#search").on("change input.typeahead:selected", function(event) {
|
||||
if (event.target.type == "search" && event.target.tagName == "INPUT") {
|
||||
if (event.target.type === "search" && event.target.tagName === "INPUT") {
|
||||
return;
|
||||
}
|
||||
var form = $("form").serialize();
|
||||
|
|
@ -267,8 +267,8 @@ $("#search").on("change input.typeahead:selected", function(event) {
|
|||
$("#include_tag option:selected").each(function () {
|
||||
$("#exclude_tag").find("[value="+$(this).val() + "]").prop("disabled", true);
|
||||
});
|
||||
$('#include_tag').selectpicker("refresh");
|
||||
$('#exclude_tag').selectpicker("refresh");
|
||||
$("#include_tag").selectpicker("refresh");
|
||||
$("#exclude_tag").selectpicker("refresh");
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ $("#desc").click(function() {
|
|||
// Find count of middle element
|
||||
var count = $(".row:visible").length;
|
||||
if (count > 20) {
|
||||
middle = parseInt(count / 2) + (count % 2);
|
||||
middle = parseInt(count / 2, 10) + (count % 2);
|
||||
|
||||
//var middle = parseInt(count / 2) + (count % 2);
|
||||
// search for the middle of all visible elements
|
||||
|
|
@ -135,7 +135,7 @@ $("#asc").click(function() {
|
|||
// Find count of middle element
|
||||
var count = $(".row:visible").length;
|
||||
if (count > 20) {
|
||||
var middle = parseInt(count / 2) + (count % 2);
|
||||
var middle = parseInt(count / 2, 10) + (count % 2);
|
||||
|
||||
//var middle = parseInt(count / 2) + (count % 2);
|
||||
// search for the middle of all visible elements
|
||||
|
|
|
|||
|
|
@ -146,6 +146,9 @@ kthoom.ImageFile = function(file) {
|
|||
case "jpeg":
|
||||
this.mimeType = "image/jpeg";
|
||||
break;
|
||||
case "png":
|
||||
this.mimeType = "image/png";
|
||||
break;
|
||||
case "gif":
|
||||
this.mimeType = "image/gif";
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ $(document).on("change", "input[type=\"checkbox\"][data-control]", function () {
|
|||
$(document).on("change", "select[data-control]", function() {
|
||||
var $this = $(this);
|
||||
var name = $this.data("control");
|
||||
var showOrHide = parseInt($this.val());
|
||||
var showOrHide = parseInt($this.val(), 10);
|
||||
// var showOrHideLast = $("#" + name + " option:last").val()
|
||||
for (var i = 0; i < $(this)[0].length; i++) {
|
||||
var element = parseInt($(this)[0][i].value);
|
||||
var element = parseInt($(this)[0][i].value, 10);
|
||||
if (element === showOrHide) {
|
||||
$("[data-related^=" + name + "][data-related*=-" + element + "]").show();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
*/
|
||||
|
||||
/* exported TableActions, RestrictionActions, EbookActions, responseHandler */
|
||||
/* global getPath, ConfirmDialog */
|
||||
|
||||
var selections = [];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ class TaskUpload(CalibreTask):
|
|||
|
||||
def run(self, worker_thread):
|
||||
"""Upload task doesn't have anything to do, it's simply a way to add information to the task list"""
|
||||
pass
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
|
|
|
|||
113
cps/ub.py
113
cps/ub.py
|
|
@ -138,15 +138,15 @@ class UserBase:
|
|||
mct = self.allowed_column_value or ""
|
||||
return [t.strip() for t in mct.split(",")]
|
||||
|
||||
def get_view_property(self, page, property):
|
||||
def get_view_property(self, page, prop):
|
||||
if not self.view_settings.get(page):
|
||||
return None
|
||||
return self.view_settings[page].get(property)
|
||||
return self.view_settings[page].get(prop)
|
||||
|
||||
def set_view_property(self, page, property, value):
|
||||
def set_view_property(self, page, prop, value):
|
||||
if not self.view_settings.get(page):
|
||||
self.view_settings[page] = dict()
|
||||
self.view_settings[page][property] = value
|
||||
self.view_settings[page][prop] = value
|
||||
try:
|
||||
flag_modified(self, "view_settings")
|
||||
except AttributeError:
|
||||
|
|
@ -437,11 +437,8 @@ class RemoteAuthToken(Base):
|
|||
return '<Token %r>' % self.id
|
||||
|
||||
|
||||
# Migrate database to current version, has to be updated after every database change. Currently migration from
|
||||
# everywhere to current should work. Migration is done by checking if relevant columns are existing, and than adding
|
||||
# rows with SQL commands
|
||||
def migrate_Database(session):
|
||||
engine = session.bind
|
||||
# Add missing tables during migration of database
|
||||
def add_missing_tables(engine, session):
|
||||
if not engine.dialect.has_table(engine.connect(), "book_read_link"):
|
||||
ReadBook.__table__.create(bind=engine)
|
||||
if not engine.dialect.has_table(engine.connect(), "bookmark"):
|
||||
|
|
@ -459,6 +456,10 @@ def migrate_Database(session):
|
|||
with engine.connect() as conn:
|
||||
conn.execute("insert into registration (domain, allow) values('%.%',1)")
|
||||
session.commit()
|
||||
|
||||
|
||||
# migrate all settings missing in registration table
|
||||
def migrate_registration_table(engine, session):
|
||||
try:
|
||||
session.query(exists().where(Registration.allow)).scalar()
|
||||
session.commit()
|
||||
|
|
@ -468,27 +469,29 @@ def migrate_Database(session):
|
|||
conn.execute("update registration set 'allow' = 1")
|
||||
session.commit()
|
||||
try:
|
||||
session.query(exists().where(RemoteAuthToken.token_type)).scalar()
|
||||
session.commit()
|
||||
except exc.OperationalError: # Database is not compatible, some columns are missing
|
||||
# Handle table exists, but no content
|
||||
cnt = session.query(Registration).count()
|
||||
if not cnt:
|
||||
with engine.connect() as conn:
|
||||
conn.execute("ALTER TABLE remote_auth_token ADD column 'token_type' INTEGER DEFAULT 0")
|
||||
conn.execute("update remote_auth_token set 'token_type' = 0")
|
||||
conn.execute("insert into registration (domain, allow) values('%.%',1)")
|
||||
session.commit()
|
||||
except exc.OperationalError: # Database is not writeable
|
||||
print('Settings database is not writeable. Exiting...')
|
||||
sys.exit(2)
|
||||
|
||||
|
||||
# Remove login capability of user Guest
|
||||
def migrate_guest_password(engine, session):
|
||||
try:
|
||||
session.query(exists().where(ReadBook.read_status)).scalar()
|
||||
except exc.OperationalError:
|
||||
with engine.connect() as conn:
|
||||
conn.execute("ALTER TABLE book_read_link ADD column 'read_status' INTEGER DEFAULT 0")
|
||||
conn.execute("UPDATE book_read_link SET 'read_status' = 1 WHERE is_read")
|
||||
conn.execute("ALTER TABLE book_read_link ADD column 'last_modified' DATETIME")
|
||||
conn.execute("ALTER TABLE book_read_link ADD column 'last_time_started_reading' DATETIME")
|
||||
conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")
|
||||
session.commit()
|
||||
test = session.query(ReadBook).filter(ReadBook.last_modified == None).all()
|
||||
for book in test:
|
||||
book.last_modified = datetime.datetime.utcnow()
|
||||
conn.execute("UPDATE user SET password='' where nickname = 'Guest' and password !=''")
|
||||
session.commit()
|
||||
except exc.OperationalError:
|
||||
print('Settings database is not writeable. Exiting...')
|
||||
sys.exit(2)
|
||||
|
||||
|
||||
def migrate_shelfs(engine, session):
|
||||
try:
|
||||
session.query(exists().where(Shelf.uuid)).scalar()
|
||||
except exc.OperationalError:
|
||||
|
|
@ -504,22 +507,51 @@ def migrate_Database(session):
|
|||
for book_shelf in session.query(BookShelf).all():
|
||||
book_shelf.date_added = datetime.datetime.now()
|
||||
session.commit()
|
||||
try:
|
||||
# Handle table exists, but no content
|
||||
cnt = session.query(Registration).count()
|
||||
if not cnt:
|
||||
with engine.connect() as conn:
|
||||
conn.execute("insert into registration (domain, allow) values('%.%',1)")
|
||||
session.commit()
|
||||
except exc.OperationalError: # Database is not writeable
|
||||
print('Settings database is not writeable. Exiting...')
|
||||
sys.exit(2)
|
||||
try:
|
||||
session.query(exists().where(BookShelf.order)).scalar()
|
||||
except exc.OperationalError: # Database is not compatible, some columns are missing
|
||||
with engine.connect() as conn:
|
||||
conn.execute("ALTER TABLE book_shelf_link ADD column 'order' INTEGER DEFAULT 1")
|
||||
session.commit()
|
||||
|
||||
|
||||
def migrate_readBook(engine, session):
|
||||
try:
|
||||
session.query(exists().where(ReadBook.read_status)).scalar()
|
||||
except exc.OperationalError:
|
||||
with engine.connect() as conn:
|
||||
conn.execute("ALTER TABLE book_read_link ADD column 'read_status' INTEGER DEFAULT 0")
|
||||
conn.execute("UPDATE book_read_link SET 'read_status' = 1 WHERE is_read")
|
||||
conn.execute("ALTER TABLE book_read_link ADD column 'last_modified' DATETIME")
|
||||
conn.execute("ALTER TABLE book_read_link ADD column 'last_time_started_reading' DATETIME")
|
||||
conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")
|
||||
session.commit()
|
||||
test = session.query(ReadBook).filter(ReadBook.last_modified == None).all()
|
||||
for book in test:
|
||||
book.last_modified = datetime.datetime.utcnow()
|
||||
session.commit()
|
||||
|
||||
|
||||
def migrate_remoteAuthToken(engine, session):
|
||||
try:
|
||||
session.query(exists().where(RemoteAuthToken.token_type)).scalar()
|
||||
session.commit()
|
||||
except exc.OperationalError: # Database is not compatible, some columns are missing
|
||||
with engine.connect() as conn:
|
||||
conn.execute("ALTER TABLE remote_auth_token ADD column 'token_type' INTEGER DEFAULT 0")
|
||||
conn.execute("update remote_auth_token set 'token_type' = 0")
|
||||
session.commit()
|
||||
|
||||
# Migrate database to current version, has to be updated after every database change. Currently migration from
|
||||
# everywhere to current should work. Migration is done by checking if relevant columns are existing, and than adding
|
||||
# rows with SQL commands
|
||||
def migrate_Database(session):
|
||||
engine = session.bind
|
||||
add_missing_tables(engine, session)
|
||||
migrate_registration_table(engine, session)
|
||||
migrate_readBook(engine, session)
|
||||
migrate_remoteAuthToken(engine, session)
|
||||
migrate_shelfs(engine, session)
|
||||
try:
|
||||
create = False
|
||||
session.query(exists().where(User.sidebar_view)).scalar()
|
||||
|
|
@ -578,7 +610,6 @@ def migrate_Database(session):
|
|||
"locale VARCHAR(2),"
|
||||
"sidebar_view INTEGER,"
|
||||
"default_language VARCHAR(3),"
|
||||
# "series_view VARCHAR(10),"
|
||||
"view_settings VARCHAR,"
|
||||
"UNIQUE (nickname),"
|
||||
"UNIQUE (email))")
|
||||
|
|
@ -590,15 +621,7 @@ def migrate_Database(session):
|
|||
conn.execute("DROP TABLE user")
|
||||
conn.execute("ALTER TABLE user_id RENAME TO user")
|
||||
session.commit()
|
||||
|
||||
# Remove login capability of user Guest
|
||||
try:
|
||||
with engine.connect() as conn:
|
||||
conn.execute("UPDATE user SET password='' where nickname = 'Guest' and password !=''")
|
||||
session.commit()
|
||||
except exc.OperationalError:
|
||||
print('Settings database is not writeable. Exiting...')
|
||||
sys.exit(2)
|
||||
migrate_guest_password(engine, session)
|
||||
|
||||
|
||||
def clean_database(session):
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ def load_user_from_request(request):
|
|||
def load_user_from_auth_header(header_val):
|
||||
if header_val.startswith('Basic '):
|
||||
header_val = header_val.replace('Basic ', '', 1)
|
||||
basic_username = basic_password = ''
|
||||
basic_username = basic_password = '' # nosec
|
||||
try:
|
||||
header_val = base64.b64decode(header_val).decode('utf-8')
|
||||
basic_username = header_val.split(':')[0]
|
||||
|
|
|
|||
59
cps/web.py
59
cps/web.py
|
|
@ -216,7 +216,7 @@ def update_view():
|
|||
for param in to_save[element]:
|
||||
current_user.set_view_property(element, param, to_save[element][param])
|
||||
except Exception as e:
|
||||
log.error("Could not save view_settings: %r %r: e", request, to_save, e)
|
||||
log.error("Could not save view_settings: %r %r: %e", request, to_save, e)
|
||||
return "Invalid request", 400
|
||||
return "1", 200
|
||||
|
||||
|
|
@ -340,7 +340,7 @@ def get_matching_tags():
|
|||
return json_dumps
|
||||
|
||||
|
||||
def render_books_list(data, sort, book_id, page):
|
||||
def get_sort_function(sort, data):
|
||||
order = [db.Books.timestamp.desc()]
|
||||
if sort == 'stored':
|
||||
sort = current_user.get_view_property(data, 'stored')
|
||||
|
|
@ -366,6 +366,11 @@ def render_books_list(data, sort, book_id, page):
|
|||
order = [db.Books.series_index.asc()]
|
||||
if sort == 'seriesdesc':
|
||||
order = [db.Books.series_index.desc()]
|
||||
return order
|
||||
|
||||
|
||||
def render_books_list(data, sort, book_id, page):
|
||||
order = get_sort_function(sort, data)
|
||||
|
||||
if data == "rated":
|
||||
if current_user.check_visibility(constants.SIDEBAR_BEST_RATED):
|
||||
|
|
@ -453,18 +458,11 @@ def render_hot_books(page):
|
|||
|
||||
def render_downloaded_books(page, order):
|
||||
if current_user.check_visibility(constants.SIDEBAR_DOWNLOAD):
|
||||
# order = order or []
|
||||
if current_user.show_detail_random():
|
||||
random = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \
|
||||
.order_by(func.random()).limit(config.config_random_books)
|
||||
else:
|
||||
random = false()
|
||||
# off = int(int(config.config_books_per_page) * (page - 1))
|
||||
'''entries, random, pagination = calibre_db.fill_indexpage(page, 0,
|
||||
db.Books,
|
||||
db_filter,
|
||||
order,
|
||||
ub.ReadBook, db.Books.id==ub.ReadBook.book_id)'''
|
||||
|
||||
entries, __, pagination = calibre_db.fill_indexpage(page,
|
||||
0,
|
||||
|
|
@ -748,7 +746,7 @@ def list_books():
|
|||
search = request.args.get("search")
|
||||
total_count = calibre_db.session.query(db.Books).count()
|
||||
if search:
|
||||
entries, filtered_count, pagination = calibre_db.get_search_results(search, off, order, limit)
|
||||
entries, filtered_count, __ = calibre_db.get_search_results(search, off, order, limit)
|
||||
else:
|
||||
entries, __, __ = calibre_db.fill_indexpage((int(off) / (int(limit)) + 1), limit, db.Books, True, order)
|
||||
filtered_count = total_count
|
||||
|
|
@ -1411,30 +1409,7 @@ def logout():
|
|||
|
||||
|
||||
# ################################### Users own configuration #########################################################
|
||||
|
||||
|
||||
@web.route("/me", methods=["GET", "POST"])
|
||||
@login_required
|
||||
def profile():
|
||||
# downloads = list()
|
||||
languages = calibre_db.speaking_language()
|
||||
translations = babel.list_translations() + [LC('en')]
|
||||
kobo_support = feature_support['kobo'] and config.config_kobo_sync
|
||||
if feature_support['oauth'] and config.config_login_type == 2:
|
||||
oauth_status = get_oauth_status()
|
||||
local_oauth_check = oauth_check
|
||||
else:
|
||||
oauth_status = None
|
||||
local_oauth_check = {}
|
||||
|
||||
'''entries, __, pagination = calibre_db.fill_indexpage(page,
|
||||
0,
|
||||
db.Books,
|
||||
ub.Downloads.user_id == int(current_user.id), # True,
|
||||
[],
|
||||
ub.Downloads, db.Books.id == ub.Downloads.book_id)'''
|
||||
|
||||
if request.method == "POST":
|
||||
def change_profile(kobo_support, local_oauth_check, oauth_status, translations, languages):
|
||||
to_save = request.form.to_dict()
|
||||
current_user.random_books = 0
|
||||
if current_user.role_passwd() or current_user.role_admin():
|
||||
|
|
@ -1495,6 +1470,22 @@ def profile():
|
|||
log.error("Database error: %s", e)
|
||||
flash(_(u"Database error: %(error)s.", error=e), category="error")
|
||||
|
||||
|
||||
@web.route("/me", methods=["GET", "POST"])
|
||||
@login_required
|
||||
def profile():
|
||||
languages = calibre_db.speaking_language()
|
||||
translations = babel.list_translations() + [LC('en')]
|
||||
kobo_support = feature_support['kobo'] and config.config_kobo_sync
|
||||
if feature_support['oauth'] and config.config_login_type == 2:
|
||||
oauth_status = get_oauth_status()
|
||||
local_oauth_check = oauth_check
|
||||
else:
|
||||
oauth_status = None
|
||||
local_oauth_check = {}
|
||||
|
||||
if request.method == "POST":
|
||||
change_profile(kobo_support, local_oauth_check, oauth_status, translations, languages)
|
||||
return render_title_template("user_edit.html",
|
||||
translations=translations,
|
||||
profile=1,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user