Merge remote-tracking branch 'metadata/Develop' into Develop
Update logger for updater
This commit is contained in:
commit
de58d0a4d8
|
@ -25,9 +25,6 @@ except ImportError:
|
||||||
import pickle as cPickle
|
import pickle as cPickle
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
mimetypes.init()
|
mimetypes.init()
|
||||||
mimetypes.add_type('application/xhtml+xml', '.xhtml')
|
mimetypes.add_type('application/xhtml+xml', '.xhtml')
|
||||||
mimetypes.add_type('application/epub+zip', '.epub')
|
mimetypes.add_type('application/epub+zip', '.epub')
|
||||||
|
@ -56,7 +53,6 @@ lm.anonymous_user = ub.Anonymous
|
||||||
ub.init_db()
|
ub.init_db()
|
||||||
config = Config()
|
config = Config()
|
||||||
|
|
||||||
|
|
||||||
import db
|
import db
|
||||||
|
|
||||||
with open(os.path.join(config.get_main_dir, 'cps/translations/iso639.pickle'), 'rb') as f:
|
with open(os.path.join(config.get_main_dir, 'cps/translations/iso639.pickle'), 'rb') as f:
|
||||||
|
@ -90,8 +86,8 @@ def create_app():
|
||||||
app.logger.setLevel(config.config_log_level)
|
app.logger.setLevel(config.config_log_level)
|
||||||
|
|
||||||
app.logger.info('Starting Calibre Web...')
|
app.logger.info('Starting Calibre Web...')
|
||||||
logging.getLogger("book_formats").addHandler(file_handler)
|
# logging.getLogger("uploader").addHandler(file_handler)
|
||||||
logging.getLogger("book_formats").setLevel(config.config_log_level)
|
# logging.getLogger("uploader").setLevel(config.config_log_level)
|
||||||
Principal(app)
|
Principal(app)
|
||||||
lm.init_app(app)
|
lm.init_app(app)
|
||||||
app.secret_key = os.getenv('SECRET_KEY', 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT')
|
app.secret_key = os.getenv('SECRET_KEY', 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT')
|
||||||
|
|
|
@ -494,7 +494,7 @@ def configuration_helper(origin):
|
||||||
flash(_(u"Calibre-Web configuration updated"), category="success")
|
flash(_(u"Calibre-Web configuration updated"), category="success")
|
||||||
config.loadSettings()
|
config.loadSettings()
|
||||||
app.logger.setLevel(config.config_log_level)
|
app.logger.setLevel(config.config_log_level)
|
||||||
logging.getLogger("uploader").setLevel(config.config_log_level)
|
# logging.getLogger("uploader").setLevel(config.config_log_level)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
flash(e, category="error")
|
flash(e, category="error")
|
||||||
return render_title_template("config_edit.html", content=config, origin=origin,
|
return render_title_template("config_edit.html", content=config, origin=origin,
|
||||||
|
|
|
@ -103,6 +103,16 @@ input.pill:not(:checked) + label .glyphicon {
|
||||||
|
|
||||||
.tags_click, .serie_click, .language_click {margin-right: 5px;}
|
.tags_click, .serie_click, .language_click {margin-right: 5px;}
|
||||||
|
|
||||||
|
#meta-info {
|
||||||
|
height:600px;
|
||||||
|
overflow-y:scroll;
|
||||||
|
}
|
||||||
|
.media-list {
|
||||||
|
padding-right:15px;
|
||||||
|
}
|
||||||
|
.media-body p {
|
||||||
|
text-align: justify;
|
||||||
|
}
|
||||||
#meta-info img { max-height: 150px; max-width: 100px; cursor: pointer; }
|
#meta-info img { max-height: 150px; max-width: 100px; cursor: pointer; }
|
||||||
|
|
||||||
.padded-bottom { margin-bottom: 15px; }
|
.padded-bottom { margin-bottom: 15px; }
|
||||||
|
|
|
@ -219,7 +219,7 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<div>{{_('Click the cover to load metadata to the form')}}</div>
|
<div class="text-center"><strong>{{_('Click the cover to load metadata to the form')}}</strong></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="text-center padded-bottom">
|
<div class="text-center padded-bottom">
|
||||||
|
|
|
@ -25,12 +25,13 @@ import logging
|
||||||
import os
|
import os
|
||||||
from flask_babel import gettext as _
|
from flask_babel import gettext as _
|
||||||
import comic
|
import comic
|
||||||
|
from cps import app
|
||||||
try:
|
try:
|
||||||
from lxml.etree import LXML_VERSION as lxmlversion
|
from lxml.etree import LXML_VERSION as lxmlversion
|
||||||
except ImportError:
|
except ImportError:
|
||||||
lxmlversion = None
|
lxmlversion = None
|
||||||
|
|
||||||
logger = logging.getLogger("book_formats")
|
# logger = logging.getLogger("uploader")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from wand.image import Image
|
from wand.image import Image
|
||||||
|
@ -38,28 +39,28 @@ try:
|
||||||
from wand.exceptions import PolicyError
|
from wand.exceptions import PolicyError
|
||||||
use_generic_pdf_cover = False
|
use_generic_pdf_cover = False
|
||||||
except (ImportError, RuntimeError) as e:
|
except (ImportError, RuntimeError) as e:
|
||||||
logger.warning('cannot import Image, generating pdf covers for pdf uploads will not work: %s', e)
|
app.logger.warning('cannot import Image, generating pdf covers for pdf uploads will not work: %s', e)
|
||||||
use_generic_pdf_cover = True
|
use_generic_pdf_cover = True
|
||||||
try:
|
try:
|
||||||
from PyPDF2 import PdfFileReader
|
from PyPDF2 import PdfFileReader
|
||||||
from PyPDF2 import __version__ as PyPdfVersion
|
from PyPDF2 import __version__ as PyPdfVersion
|
||||||
use_pdf_meta = True
|
use_pdf_meta = True
|
||||||
except ImportError as e:
|
except ImportError as e:
|
||||||
logger.warning('cannot import PyPDF2, extracting pdf metadata will not work: %s', e)
|
app.logger.warning('cannot import PyPDF2, extracting pdf metadata will not work: %s', e)
|
||||||
use_pdf_meta = False
|
use_pdf_meta = False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import epub
|
import epub
|
||||||
use_epub_meta = True
|
use_epub_meta = True
|
||||||
except ImportError as e:
|
except ImportError as e:
|
||||||
logger.warning('cannot import epub, extracting epub metadata will not work: %s', e)
|
app.logger.warning('cannot import epub, extracting epub metadata will not work: %s', e)
|
||||||
use_epub_meta = False
|
use_epub_meta = False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import fb2
|
import fb2
|
||||||
use_fb2_meta = True
|
use_fb2_meta = True
|
||||||
except ImportError as e:
|
except ImportError as e:
|
||||||
logger.warning('cannot import fb2, extracting fb2 metadata will not work: %s', e)
|
app.logger.warning('cannot import fb2, extracting fb2 metadata will not work: %s', e)
|
||||||
use_fb2_meta = False
|
use_fb2_meta = False
|
||||||
|
|
||||||
__author__ = 'lemmsh'
|
__author__ = 'lemmsh'
|
||||||
|
@ -84,7 +85,7 @@ def process(tmp_file_path, original_file_name, original_file_extension):
|
||||||
meta = comic.get_comic_info(tmp_file_path, original_file_name, original_file_extension)
|
meta = comic.get_comic_info(tmp_file_path, original_file_name, original_file_extension)
|
||||||
|
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
logger.warning('cannot parse metadata, using default: %s', ex)
|
app.logger.warning('cannot parse metadata, using default: %s', ex)
|
||||||
|
|
||||||
if meta and meta.title.strip() and meta.author.strip():
|
if meta and meta.title.strip() and meta.author.strip():
|
||||||
return meta
|
return meta
|
||||||
|
|
Loading…
Reference in New Issue
Block a user