Merge pull request #18 from deldesir/aug4mergeConflict

aug4mergeConflict: Resolve using 'git pull https://github.com/janeczku/calibre-web --no-rebase'aug4mergeConflict: Resolve using 'git pull https://github.com/janeczku/calibre-web --no-rebase'
pull/2909/head
Blondel MONDESIR 10 months ago committed by GitHub
commit 142a50aff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1296,7 +1296,7 @@ def update_mailsettings():
else:
_config_int(to_save, "mail_port")
_config_int(to_save, "mail_use_ssl")
if "mail_password_e" in to_save:
if to_save.get("mail_password_e", ""):
_config_string(to_save, "mail_password_e")
_config_int(to_save, "mail_size", lambda y: int(y) * 1024 * 1024)
config.mail_server = to_save.get('mail_server', "").strip()
@ -1781,7 +1781,7 @@ def _configuration_update_helper():
# Goodreads configuration
_config_checkbox(to_save, "config_use_goodreads")
_config_string(to_save, "config_goodreads_api_key")
if "config_goodreads_api_secret_e" in to_save:
if to_save.get("config_goodreads_api_secret_e", ""):
_config_string(to_save, "config_goodreads_api_secret_e")
if services.goodreads_support:
services.goodreads_support.connect(config.config_goodreads_api_key,

@ -36,6 +36,12 @@ try:
from comicapi import __version__ as comic_version
except ImportError:
comic_version = ''
try:
from comicapi.comicarchive import load_archive_plugins
import comicapi.utils
comicapi.utils.add_rar_paths()
except ImportError:
load_archive_plugins = None
except (ImportError, LookupError) as e:
log.debug('Cannot import comicapi, extracting comic metadata will not work: %s', e)
import zipfile
@ -88,7 +94,10 @@ def _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_exec
def _extract_cover(tmp_file_name, original_file_extension, rar_executable):
cover_data = extension = None
if use_comic_meta:
archive = ComicArchive(tmp_file_name, rar_exe_path=rar_executable)
try:
archive = ComicArchive(tmp_file_name, rar_exe_path=rar_executable)
except TypeError:
archive = ComicArchive(tmp_file_name)
name_list = archive.getPageNameList if hasattr(archive, "getPageNameList") else archive.get_page_name_list
for index, name in enumerate(name_list()):
ext = os.path.splitext(name)
@ -105,7 +114,11 @@ def _extract_cover(tmp_file_name, original_file_extension, rar_executable):
def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rar_executable):
if use_comic_meta:
archive = ComicArchive(tmp_file_path, rar_exe_path=rar_executable)
try:
archive = ComicArchive(tmp_file_path, rar_exe_path=rar_executable)
except TypeError:
load_archive_plugins(force=True, rar=rar_executable)
archive = ComicArchive(tmp_file_path)
if hasattr(archive, "seemsToBeAComicArchive"):
seems_archive = archive.seemsToBeAComicArchive
else:

@ -173,6 +173,9 @@ class Identifiers(Base):
return "https://www.databazeknih.cz/knihy/{0}".format(self.val)
elif self.val.lower().startswith("javascript:"):
return quote(self.val)
elif self.val.lower().startswith("data:"):
link , __, __ = str.partition(self.val, ",")
return link
else:
return "{0}".format(self.val)

@ -29,9 +29,10 @@ from shutil import copyfile
from uuid import uuid4
from markupsafe import escape # dependency of flask
from functools import wraps
import re
try:
from lxml.html.clean import clean_html
from lxml.html.clean import clean_html, Cleaner
except ImportError:
clean_html = None
@ -601,6 +602,8 @@ def identifier_list(to_save, book):
val_key = id_val_prefix + type_key[len(id_type_prefix):]
if val_key not in to_save.keys():
continue
if to_save[val_key].startswith("data:"):
to_save[val_key], __, __ = str.partition(to_save[val_key], ",")
result.append(db.Identifiers(to_save[val_key], type_value, book.id))
return result

@ -21,10 +21,11 @@ import zipfile
from lxml import etree
from . import isoLanguages, cover
from . import config
from . import config, logger
from .helper import split_authors
from .constants import BookMeta
log = logger.create()
def _extract_cover(zip_file, cover_file, cover_path, tmp_file_name):
if cover_file is None:
@ -49,15 +50,20 @@ def get_epub_layout(book, book_data):
}
file_path = os.path.normpath(os.path.join(config.config_calibre_dir, book.path, book_data.name + "." + book_data.format.lower()))
epubZip = zipfile.ZipFile(file_path)
txt = epubZip.read('META-INF/container.xml')
tree = etree.fromstring(txt)
cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
cf = epubZip.read(cfname)
tree = etree.fromstring(cf)
p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0]
try:
epubZip = zipfile.ZipFile(file_path)
txt = epubZip.read('META-INF/container.xml')
tree = etree.fromstring(txt)
cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
cf = epubZip.read(cfname)
tree = etree.fromstring(cf)
p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0]
layout = p.xpath('pkg:meta[@property="rendition:layout"]/text()', namespaces=ns)
layout = p.xpath('pkg:meta[@property="rendition:layout"]/text()', namespaces=ns)
except (etree.XMLSyntaxError, KeyError, IndexError) as e:
log.error("Could not parse epub metadata of book {} during kobo sync: {}".format(book.id, e))
layout = []
if len(layout) == 0:
return None

@ -732,28 +732,27 @@ def delete_book(book, calibrepath, book_format):
return delete_book_file(book, calibrepath, book_format)
def get_cover_on_failure(use_generic_cover):
if use_generic_cover:
try:
return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
except PermissionError:
log.error("No permission to access generic_cover.jpg file.")
abort(403)
abort(404)
def get_cover_on_failure():
try:
return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
except PermissionError:
log.error("No permission to access generic_cover.jpg file.")
abort(403)
def get_book_cover(book_id, resolution=None):
book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
return get_book_cover_internal(book, resolution=resolution)
# Called only by kobo sync -> cover not found should be answered with 404 and not with default cover
def get_book_cover_with_uuid(book_uuid, resolution=None):
book = calibre_db.get_book_by_uuid(book_uuid)
return get_book_cover_internal(book, use_generic_cover_on_failure=False, resolution=resolution)
if not book:
return # allows kobo.HandleCoverImageRequest to proxy request
return get_book_cover_internal(book, resolution=resolution)
def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
def get_book_cover_internal(book, resolution=None):
if book and book.has_cover:
# Send the book cover thumbnail if it exists in cache
@ -769,16 +768,16 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None)
if config.config_use_google_drive:
try:
if not gd.is_gdrive_ready():
return get_cover_on_failure(use_generic_cover_on_failure)
return get_cover_on_failure()
path = gd.get_cover_via_gdrive(book.path)
if path:
return redirect(path)
else:
log.error('{}/cover.jpg not found on Google Drive'.format(book.path))
return get_cover_on_failure(use_generic_cover_on_failure)
return get_cover_on_failure()
except Exception as ex:
log.error_or_exception(ex)
return get_cover_on_failure(use_generic_cover_on_failure)
return get_cover_on_failure()
# Send the book cover from the Calibre directory
else:
@ -786,9 +785,9 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None)
if os.path.isfile(os.path.join(cover_file_path, "cover.jpg")):
return send_from_directory(cover_file_path, "cover.jpg")
else:
return get_cover_on_failure(use_generic_cover_on_failure)
return get_cover_on_failure()
else:
return get_cover_on_failure(use_generic_cover_on_failure)
return get_cover_on_failure()
def get_book_cover_thumbnail(book, resolution):
@ -811,7 +810,7 @@ def get_series_thumbnail_on_failure(series_id, resolution):
.filter(db.Books.has_cover == 1) \
.first()
return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
return get_book_cover_internal(book, resolution=resolution)
def get_series_cover_thumbnail(series_id, resolution=None):
@ -1042,7 +1041,7 @@ def get_download_link(book_id, book_format, client):
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" % (
quote(file_name.encode('utf-8')), book_format, quote(file_name.encode('utf-8')), book_format)
quote(file_name), book_format, quote(file_name), book_format)
return do_download_file(book, book_format, client, data1, headers)
else:
abort(404)

@ -931,19 +931,20 @@ def get_current_bookmark_response(current_bookmark):
@requires_kobo_auth
def HandleCoverImageRequest(book_uuid, width, height, Quality, isGreyscale):
book_cover = helper.get_book_cover_with_uuid(book_uuid, resolution=COVER_THUMBNAIL_SMALL)
if not book_cover:
if config.config_kobo_proxy:
log.debug("Cover for unknown book: %s proxied to kobo" % book_uuid)
return redirect(KOBO_IMAGEHOST_URL +
"/{book_uuid}/{width}/{height}/false/image.jpg".format(book_uuid=book_uuid,
width=width,
height=height), 307)
else:
log.debug("Cover for unknown book: %s requested" % book_uuid)
# additional proxy request make no sense, -> direct return
return make_response(jsonify({}))
log.debug("Cover request received for book %s" % book_uuid)
return book_cover
if book_cover:
log.debug("Serving local cover image of book %s" % book_uuid)
return book_cover
if not config.config_kobo_proxy:
log.debug("Returning 404 for cover image of unknown book %s" % book_uuid)
# additional proxy request make no sense, -> direct return
return abort(404)
log.debug("Redirecting request for cover image of unknown book %s to Kobo" % book_uuid)
return redirect(KOBO_IMAGEHOST_URL +
"/{book_uuid}/{width}/{height}/false/image.jpg".format(book_uuid=book_uuid,
width=width,
height=height), 307)
@kobo.route("")

@ -98,7 +98,7 @@ class Amazon(Metadata):
try:
match.authors = [next(
filter(lambda i: i != " " and i != "\n" and not i.startswith("{"),
x.findAll(text=True))).strip()
x.findAll(string=True))).strip()
for x in soup2.findAll("span", attrs={"class": "author"})]
except (AttributeError, TypeError, StopIteration):
match.authors = ""

@ -102,7 +102,7 @@ class LubimyCzytac(Metadata):
PUBLISH_DATE = "//dt[contains(@title,'Data pierwszego wydania"
FIRST_PUBLISH_DATE = f"{DETAILS}{PUBLISH_DATE} oryginalnego')]{SIBLINGS}[1]/text()"
FIRST_PUBLISH_DATE_PL = f"{DETAILS}{PUBLISH_DATE} polskiego')]{SIBLINGS}[1]/text()"
TAGS = "//nav[@aria-label='breadcrumb']//a[contains(@href,'/ksiazki/k/')]/text()"
TAGS = "//nav[@aria-label='breadcrumbs']//a[contains(@href,'/ksiazki/k/')]/span/text()"
RATING = "//meta[@property='books:rating:value']/@content"
COVER = "//meta[@property='og:image']/@content"

@ -7279,6 +7279,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
float: right
}
body.blur #main-nav + #scnd-nav .create-shelf, body.blur #main-nav + .col-sm-2 #scnd-nav .create-shelf {
float: none;
margin: 5px 0 10px -10px;
}
#main-nav + #scnd-nav .nav-head.hidden-xs {
display: list-item !important;
width: 225px

@ -40,6 +40,7 @@ $(".sendbtn-form").click(function() {
$.ajax({
method: 'post',
url: $(this).data('href'),
data: {csrf_token: $("input[name='csrf_token']").val()},
success: function (data) {
handleResponse(data)
}

@ -18,6 +18,7 @@
import os
import smtplib
import ssl
import threading
import socket
import mimetypes
@ -192,8 +193,9 @@ class TaskEmail(CalibreTask):
# on python3 debugoutput is caught with overwritten _print_debug function
log.debug("Start sending e-mail")
if use_ssl == 2:
context = ssl.create_default_context()
self.asyncSMTP = EmailSSL(self.settings["mail_server"], self.settings["mail_port"],
timeout=timeout)
timeout=timeout, context=context)
else:
self.asyncSMTP = Email(self.settings["mail_server"], self.settings["mail_port"], timeout=timeout)
@ -201,7 +203,8 @@ class TaskEmail(CalibreTask):
if logger.is_debug_enabled():
self.asyncSMTP.set_debuglevel(1)
if use_ssl == 1:
self.asyncSMTP.starttls()
context = ssl.create_default_context()
self.asyncSMTP.starttls(context=context)
if self.settings["mail_password_e"]:
self.asyncSMTP.login(str(self.settings["mail_login"]), str(self.settings["mail_password_e"]))

@ -43,30 +43,30 @@
{% endif %}
</div>
{% endif %}
{% endif %}
{% if current_user.kindle_mail and entry.email_share_list %}
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
{% if entry.email_share_list.__len__() == 1 %}
<div class="btn-group" role="group">
<button id="sendbtn" class="btn btn-primary sendbtn-form" data-href="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=entry.email_share_list[0]['format'], convert=entry.email_share_list[0]['convert'])}}">
<span class="glyphicon glyphicon-send"></span> {{entry.email_share_list[0]['text']}}
</button>
</div>
{% else %}
<div class="btn-group" role="group">
<button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-send"></span>{{ _('Send to eReader') }}
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="send-to-ereader">
{% for format in entry.email_share_list %}
<li>
<a class="sendbtn-form" data-href="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{ format['text'] }}</a>
</li>
{% endfor %}
</ul>
</div>
{% if current_user.kindle_mail and entry.email_share_list %}
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
{% if entry.email_share_list.__len__() == 1 %}
<div class="btn-group" role="group">
<button id="sendbtn" class="btn btn-primary sendbtn-form" data-href="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=entry.email_share_list[0]['format'], convert=entry.email_share_list[0]['convert'])}}">
<span class="glyphicon glyphicon-send"></span> {{entry.email_share_list[0]['text']}}
</button>
</div>
{% else %}
<div class="btn-group" role="group">
<button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-send"></span>{{ _('Send to eReader') }}
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="send-to-ereader">
{% for format in entry.email_share_list %}
<li>
<a class="sendbtn-form" data-href="{{url_for('web.send_to_ereader', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{ format['text'] }}</a>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endif %}
{% endif %}
{% if entry.reader_list and current_user.role_viewer() %}
@ -218,7 +218,7 @@
<p>
<span class="glyphicon glyphicon-link"></span>
{% for identifier in entry.identifiers %}
<a href="{{ identifier }}" target="_blank" class="btn btn-xs btn-success"
<a href="{{ identifier|escape }}" target="_blank" class="btn btn-xs btn-success"
role="button">{{ identifier.format_type() }}</a>
{% endfor %}
</p>

@ -41,7 +41,7 @@
{% if issue %}
<div class="row">
<div class="col errorlink">Please report this issue with all related information:
<a href="https://github.com/janeczku/calibre-web/issues/new/choose=">{{_('Create Issue')}}</a>
<a href="https://github.com/janeczku/calibre-web/issues/new/choose">{{_('Create Issue')}}</a>
</div>
</div>
{% endif %}

@ -37,7 +37,7 @@
<a class="navbar-brand" href="{{url_for('web.index')}}">{{instance}}</a>
</div>
{% if g.current_theme == 1 %}
<div class="home-btn"><a class="home-btn-tooltip" href="/" data-toggle="tooltip" title="" data-placement="bottom" data-original-title="Home"></a></div>
<div class="home-btn"><a class="home-btn-tooltip" href="{{url_for("web.index",page=1)}}" data-toggle="tooltip" title="" data-placement="bottom" data-original-title="Home"></a></div>
<div class="plexBack"><a href="{{url_for('web.index')}}"></a></div>
{% endif %}
{% if current_user.is_authenticated or g.allow_anonymous %}

@ -71,7 +71,7 @@ except ImportError as e:
use_fb2_meta = False
def process(tmp_file_path, original_file_name, original_file_extension, rarExecutable):
def process(tmp_file_path, original_file_name, original_file_extension, rar_executable):
meta = default_meta(tmp_file_path, original_file_name, original_file_extension)
extension_upper = original_file_extension.upper()
try:
@ -85,7 +85,7 @@ def process(tmp_file_path, original_file_name, original_file_extension, rarExecu
meta = comic.get_comic_info(tmp_file_path,
original_file_name,
original_file_extension,
rarExecutable)
rar_executable)
elif extension_upper in ['.MP4', '.WEBM', '.AVI', '.MKV', '.M4V', '.MPG', '.MPEG','.OGV']:
meta = video_metadata(tmp_file_path, original_file_name, original_file_extension)
elif extension_upper in ['.JPG', '.JPEG', '.PNG', '.GIF', '.SVG', '.WEBP']:
@ -312,7 +312,7 @@ def get_magick_version():
return ret
def upload(uploadfile, rarExcecutable):
def upload(uploadfile, rar_excecutable):
tmp_dir = os.path.join(gettempdir(), 'calibre_web')
if not os.path.isdir(tmp_dir):
@ -324,4 +324,4 @@ def upload(uploadfile, rarExcecutable):
tmp_file_path = os.path.join(tmp_dir, md5)
log.debug("Temporary file: %s", tmp_file_path)
uploadfile.save(tmp_file_path)
return process(tmp_file_path, filename_root, file_extension, rarExcecutable)
return process(tmp_file_path, filename_root, file_extension, rar_excecutable)

@ -38,7 +38,7 @@ faust-cchardet>=2.1.18
# Comics
natsort>=2.2.0,<8.4.0
comicapi>=2.2.0,<2.3.0
comicapi>=2.2.0,<3.3.0
# Kobo integration
jsonschema>=3.2.0,<4.18.0

@ -67,8 +67,8 @@ gdrive =
httplib2>=0.9.2,<0.23.0
oauth2client>=4.0.0,<4.1.4
uritemplate>=3.0.0,<4.2.0
pyasn1-modules>=0.0.8,<0.3.0
pyasn1>=0.1.9,<0.5.0
pyasn1-modules>=0.0.8,<0.4.0
pyasn1>=0.1.9,<0.6.0
PyDrive2>=1.3.1,<1.16.0
PyYAML>=3.12
rsa>=3.4.2,<4.10.0
@ -94,7 +94,7 @@ metadata =
faust-cchardet>=2.1.18
comics =
natsort>=2.2.0,<8.4.0
comicapi>=2.2.0,<2.3.0
comicapi>=2.2.0,<3.3.0
kobo =
jsonschema>=3.2.0,<4.18.0

@ -37,20 +37,20 @@
<div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
<p class='text-justify attribute'><strong>Start Time: </strong>2023-06-18 11:18:49</p>
<p class='text-justify attribute'><strong>Start Time: </strong>2023-07-26 21:47:14</p>
</div>
</div>
<div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3">
<p class='text-justify attribute'><strong>Stop Time: </strong>2023-06-18 17:27:42</p>
<p class='text-justify attribute'><strong>Stop Time: </strong>2023-07-27 04:10:01</p>
</div>
</div>
<div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3">
<p class='text-justify attribute'><strong>Duration: </strong>5h 10 min</p>
<p class='text-justify attribute'><strong>Duration: </strong>5h 21 min</p>
</div>
</div>
</div>
@ -234,12 +234,12 @@
<tr id="su" class="passClass">
<tr id="su" class="errorClass">
<td>TestBackupMetadata</td>
<td class="text-center">22</td>
<td class="text-center">22</td>
<td class="text-center">0</td>
<td class="text-center">0</td>
<td class="text-center">20</td>
<td class="text-center">1</td>
<td class="text-center">1</td>
<td class="text-center">0</td>
<td class="text-center">
<a onclick="showClassDetail('c2', 22)">Detail</a>
@ -293,11 +293,32 @@
<tr id='pt2.6' class='hiddenRow bg-success'>
<tr id="ft2.6" class="none bg-danger">
<td>
<div class='testcase'>TestBackupMetadata - test_backup_change_book_publisher</div>
</td>
<td colspan='6' align='center'>PASS</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft2.6')">FAIL</a>
</div>
<!--css div popup start-->
<div id="div_ft2.6" class="popup_window test_output" style="display:block;">
<div class='close_button pull-right'>
<button type="button" class="close" aria-label="Close" onfocus="this.blur();"
onclick="document.getElementById('div_ft2.6').style.display='none'"><span
aria-hidden="true">&times;</span></button>
</div>
<div class="text-left pull-left">
<pre class="text-left">Traceback (most recent call last):
File &#34;/home/ozzie/Development/calibre-web-test/test/test_backup_metadata.py&#34;, line 150, in test_backup_change_book_publisher
self.assertEqual(metadata[&#39;publisher&#39;], &#39;Lo,执|1u&#39;)
AssertionError: &#39;&#39; != &#39;Lo,执|1u&#39;
+ Lo,执|1u</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr>
@ -374,11 +395,33 @@
<tr id='pt2.15' class='hiddenRow bg-success'>
<tr id="et2.15" class="none bg-info">
<td>
<div class='testcase'>TestBackupMetadata - test_backup_change_custom_categories</div>
</td>
<td colspan='6' align='center'>PASS</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et2.15')">ERROR</a>
</div>
<!--css div popup start-->
<div id="div_et2.15" class="popup_window test_output" style="display:block;">
<div class='close_button pull-right'>
<button type="button" class="close" aria-label="Close" onfocus="this.blur();"
onclick="document.getElementById('div_et2.15').style.display='none'"><span
aria-hidden="true">&times;</span></button>
</div>
<div class="text-left pull-left">
<pre class="text-left">Traceback (most recent call last):
File &#34;/home/ozzie/Development/calibre-web-test/test/test_backup_metadata.py&#34;, line 538, in test_backup_change_custom_categories
self.assertCountEqual(custom[&#34;#value#&#34;], [&#34;Kulo&#34;, &#34;Smudo&#34;])
File &#34;/usr/lib/python3.10/unittest/case.py&#34;, line 1188, in assertCountEqual
first_seq, second_seq = list(first), list(second)
TypeError: &#39;NoneType&#39; object is not iterable</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr>
@ -972,11 +1015,11 @@
<tr id="su" class="passClass">
<tr id="su" class="failClass">
<td>TestEbookConvertGDriveKepubify</td>
<td class="text-center">3</td>
<td class="text-center">3</td>
<td class="text-center">0</td>
<td class="text-center">2</td>
<td class="text-center">1</td>
<td class="text-center">0</td>
<td class="text-center">0</td>
<td class="text-center">
@ -995,11 +1038,33 @@
<tr id='pt11.2' class='hiddenRow bg-success'>
<tr id="ft11.2" class="none bg-danger">
<td>
<div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
</td>
<td colspan='6' align='center'>PASS</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.2')">FAIL</a>
</div>
<!--css div popup start-->
<div id="div_ft11.2" class="popup_window test_output" style="display:block;">
<div class='close_button pull-right'>
<button type="button" class="close" aria-label="Close" onfocus="this.blur();"
onclick="document.getElementById('div_ft11.2').style.display='none'"><span
aria-hidden="true">&times;</span></button>
</div>
<div class="text-left pull-left">
<pre class="text-left">Traceback (most recent call last):
File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 176, in test_convert_only
self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
AssertionError: &#39;Started&#39; != &#39;Finished&#39;
- Started
+ Finished</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr>
@ -1903,11 +1968,11 @@
<tr id="su" class="passClass">
<tr id="su" class="failClass">
<td>TestEditBooksOnGdrive</td>
<td class="text-center">18</td>
<td class="text-center">18</td>
<td class="text-center">0</td>
<td class="text-center">17</td>
<td class="text-center">1</td>
<td class="text-center">0</td>
<td class="text-center">0</td>
<td class="text-center">
@ -2070,11 +2135,31 @@
<tr id='pt18.18' class='hiddenRow bg-success'>
<tr id="ft18.18" class="none bg-danger">
<td>
<div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
</td>
<td colspan='6' align='center'>PASS</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.18')">FAIL</a>
</div>
<!--css div popup start-->
<div id="div_ft18.18" class="popup_window test_output" style="display:block;">
<div class='close_button pull-right'>
<button type="button" class="close" aria-label="Close" onfocus="this.blur();"
onclick="document.getElementById('div_ft18.18').style.display='none'"><span
aria-hidden="true">&times;</span></button>
</div>
<div class="text-left pull-left">
<pre class="text-left">Traceback (most recent call last):
File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 916, in test_watch_metadata
self.assertTrue(button)
AssertionError: False is not true</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr>
@ -3479,60 +3564,53 @@
<tr id="su" class="errorClass">
<td>_FailedTest</td>
<td class="text-center">1</td>
<tr id="su" class="passClass">
<td>TestPipInstall</td>
<td class="text-center">3</td>
<td class="text-center">3</td>
<td class="text-center">0</td>
<td class="text-center">0</td>
<td class="text-center">1</td>
<td class="text-center">0</td>
<td class="text-center">
<a onclick="showClassDetail('c38', 1)">Detail</a>
<a onclick="showClassDetail('c38', 3)">Detail</a>
</td>
</tr>
<tr id="et38.1" class="none bg-info">
<tr id='pt38.1' class='hiddenRow bg-success'>
<td>
<div class='testcase'>_FailedTest - test_pip_install</div>
<div class='testcase'>TestPipInstall - test_command_start</div>
</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et38.1')">ERROR</a>
</div>
<!--css div popup start-->
<div id="div_et38.1" class="popup_window test_output" style="display:block;">
<div class='close_button pull-right'>
<button type="button" class="close" aria-label="Close" onfocus="this.blur();"
onclick="document.getElementById('div_et38.1').style.display='none'"><span
aria-hidden="true">&times;</span></button>
</div>
<div class="text-left pull-left">
<pre class="text-left">ImportError: Failed to import test module: test_pip_install
Traceback (most recent call last):
File &#34;/usr/lib/python3.10/unittest/loader.py&#34;, line 436, in _find_test_path
module = self._get_module_from_name(name)
File &#34;/usr/lib/python3.10/unittest/loader.py&#34;, line 377, in _get_module_from_name
__import__(name)
File &#34;/home/ozzie/Development/calibre-web-test/test/test_pip_install.py&#34;, line 14, in &lt;module&gt;
from build import make_release
ModuleNotFoundError: No module named &#39;build&#39;</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
<td colspan='6' align='center'>PASS</td>
</tr>
<tr id='pt38.2' class='hiddenRow bg-success'>
<td>
<div class='testcase'>TestPipInstall - test_foldername_database_location</div>
</td>
<td colspan='6' align='center'>PASS</td>
</tr>
<tr id='pt38.3' class='hiddenRow bg-success'>
<td>
<div class='testcase'>TestPipInstall - test_module_start</div>
</td>
<td colspan='6' align='center'>PASS</td>
</tr>
<tr id="su" class="passClass">
<tr id="su" class="failClass">
<td>TestReader</td>
<td class="text-center">6</td>
<td class="text-center">6</td>
<td class="text-center">0</td>
<td class="text-center">5</td>
<td class="text-center">1</td>
<td class="text-center">0</td>
<td class="text-center">0</td>
<td class="text-center">
@ -3578,11 +3656,37 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr id='pt39.5' class='hiddenRow bg-success'>
<tr id="ft39.5" class="none bg-danger">
<td>
<div class='testcase'>TestReader - test_sound_listener</div>
</td>
<td colspan='6' align='center'>PASS</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.5')">FAIL</a>
</div>
<!--css div popup start-->
<div id="div_ft39.5" class="popup_window test_output" style="display:block;">
<div class='close_button pull-right'>
<button type="button" class="close" aria-label="Close" onfocus="this.blur();"
onclick="document.getElementById('div_ft39.5').style.display='none'"><span
aria-hidden="true">&times;</span></button>
</div>
<div class="text-left pull-left">
<pre class="text-left">Traceback (most recent call last):
File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 272, in test_sound_listener
self.sound_test(&#39;music.mp3&#39;, &#39;Unknown - music&#39;, &#39;0:03&#39;)
File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 260, in sound_test
self.assertEqual(duration, duration_item.text)
AssertionError: &#39;0:03&#39; != &#39;0:02&#39;
- 0:03
? ^
+ 0:02
? ^</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr>
@ -3950,11 +4054,11 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr id="su" class="skipClass">
<tr id="su" class="failClass">
<td>TestThumbnails</td>
<td class="text-center">8</td>
<td class="text-center">7</td>
<td class="text-center">0</td>
<td class="text-center">6</td>
<td class="text-center">1</td>
<td class="text-center">0</td>
<td class="text-center">1</td>
<td class="text-center">
@ -3991,11 +4095,31 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr id='pt45.4' class='hiddenRow bg-success'>
<tr id="ft45.4" class="none bg-danger">
<td>
<div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
</td>
<td colspan='6' align='center'>PASS</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft45.4')">FAIL</a>
</div>
<!--css div popup start-->
<div id="div_ft45.4" class="popup_window test_output" style="display:block;">
<div class='close_button pull-right'>
<button type="button" class="close" aria-label="Close" onfocus="this.blur();"
onclick="document.getElementById('div_ft45.4').style.display='none'"><span
aria-hidden="true">&times;</span></button>
</div>
<div class="text-left pull-left">
<pre class="text-left">Traceback (most recent call last):
File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 135, in test_cover_change_on_upload_new_cover
self.assertGreaterEqual(diff(BytesIO(updated_cover), BytesIO(original_cover), delete_diff_file=True), 0.03)
AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr>
@ -5105,9 +5229,9 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr id='total_row' class="text-center bg-grey">
<td>Total</td>
<td>455</td>
<td>446</td>
<td>0</td>
<td>457</td>
<td>443</td>
<td>5</td>
<td>1</td>
<td>8</td>
<td>&nbsp;</td>
@ -5137,7 +5261,7 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>Platform</th>
<td>Linux 5.19.0-45-generic #46~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Wed Jun 7 15:06:04 UTC 20 x86_64 x86_64</td>
<td>Linux 6.2.0-25-generic #25~22.04.2-Ubuntu SMP PREEMPT_DYNAMIC Wed Jun 28 09:55:23 UTC 2 x86_64 x86_64</td>
<td>Basic</td>
</tr>
@ -5227,7 +5351,7 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>lxml</th>
<td>4.9.2</td>
<td>4.9.3</td>
<td>Basic</td>
</tr>
@ -5257,7 +5381,7 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>SQLAlchemy</th>
<td>1.4.48</td>
<td>1.4.49</td>
<td>Basic</td>
</tr>
@ -5287,7 +5411,7 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>google-api-python-client</th>
<td>2.89.0</td>
<td>2.95.0</td>
<td>TestBackupMetadataGdrive</td>
</tr>
@ -5305,19 +5429,19 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>PyDrive2</th>
<td>1.15.4</td>
<td>1.16.1</td>
<td>TestBackupMetadataGdrive</td>
</tr>
<tr>
<th>PyYAML</th>
<td>6.0</td>
<td>6.0.1</td>
<td>TestBackupMetadataGdrive</td>
</tr>
<tr>
<th>google-api-python-client</th>
<td>2.89.0</td>
<td>2.95.0</td>
<td>TestCliGdrivedb</td>
</tr>
@ -5335,19 +5459,19 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>PyDrive2</th>
<td>1.15.4</td>
<td>1.16.1</td>
<td>TestCliGdrivedb</td>
</tr>
<tr>
<th>PyYAML</th>
<td>6.0</td>
<td>6.0.1</td>
<td>TestCliGdrivedb</td>
</tr>
<tr>
<th>google-api-python-client</th>
<td>2.89.0</td>
<td>2.95.0</td>
<td>TestEbookConvertCalibreGDrive</td>
</tr>
@ -5365,19 +5489,19 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>PyDrive2</th>
<td>1.15.4</td>
<td>1.16.1</td>
<td>TestEbookConvertCalibreGDrive</td>
</tr>
<tr>
<th>PyYAML</th>
<td>6.0</td>
<td>6.0.1</td>
<td>TestEbookConvertCalibreGDrive</td>
</tr>
<tr>
<th>google-api-python-client</th>
<td>2.89.0</td>
<td>2.95.0</td>
<td>TestEbookConvertGDriveKepubify</td>
</tr>
@ -5395,19 +5519,19 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>PyDrive2</th>
<td>1.15.4</td>
<td>1.16.1</td>
<td>TestEbookConvertGDriveKepubify</td>
</tr>
<tr>
<th>PyYAML</th>
<td>6.0</td>
<td>6.0.1</td>
<td>TestEbookConvertGDriveKepubify</td>
</tr>
<tr>
<th>comicapi</th>
<td>3.0.0</td>
<td>3.2.0</td>
<td>TestEditAdditionalBooks</td>
</tr>
@ -5419,7 +5543,7 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>google-api-python-client</th>
<td>2.89.0</td>
<td>2.95.0</td>
<td>TestEditAuthorsGdrive</td>
</tr>
@ -5437,13 +5561,13 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>PyDrive2</th>
<td>1.15.4</td>
<td>1.16.1</td>
<td>TestEditAuthorsGdrive</td>
</tr>
<tr>
<th>PyYAML</th>
<td>6.0</td>
<td>6.0.1</td>
<td>TestEditAuthorsGdrive</td>
</tr>
@ -5455,7 +5579,7 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>google-api-python-client</th>
<td>2.89.0</td>
<td>2.95.0</td>
<td>TestEditBooksOnGdrive</td>
</tr>
@ -5473,13 +5597,13 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>PyDrive2</th>
<td>1.15.4</td>
<td>1.16.1</td>
<td>TestEditBooksOnGdrive</td>
</tr>
<tr>
<th>PyYAML</th>
<td>6.0</td>
<td>6.0.1</td>
<td>TestEditBooksOnGdrive</td>
</tr>
@ -5497,7 +5621,7 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>google-api-python-client</th>
<td>2.89.0</td>
<td>2.95.0</td>
<td>TestSetupGdrive</td>
</tr>
@ -5515,13 +5639,13 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>PyDrive2</th>
<td>1.15.4</td>
<td>1.16.1</td>
<td>TestSetupGdrive</td>
</tr>
<tr>
<th>PyYAML</th>
<td>6.0</td>
<td>6.0.1</td>
<td>TestSetupGdrive</td>
</tr>
@ -5539,13 +5663,13 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>jsonschema</th>
<td>4.17.3</td>
<td>4.18.4</td>
<td>TestKoboSync</td>
</tr>
<tr>
<th>jsonschema</th>
<td>4.17.3</td>
<td>4.18.4</td>
<td>TestKoboSyncBig</td>
</tr>
@ -5557,7 +5681,7 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
<tr>
<th>jsonschema</th>
<td>4.17.3</td>
<td>4.18.4</td>
<td>TestLdapLogin</td>
</tr>
@ -5587,7 +5711,7 @@ ModuleNotFoundError: No module named &#39;build&#39;</pre>
</div>
<script>
drawCircle(446, 0, 1, 8);
drawCircle(443, 5, 1, 8);
showCase(5);
</script>

Loading…
Cancel
Save