NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Develop' into Develop

Browse Source 
# Conflicts:
#	optional-requirements.txt
This commit is contained in:
Ozzie Isaacs 2023-08-28 19:38:51 +02:00
commit 4f0f5b1495
12 changed files with 294 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cps/__init__.py
View File

@ -64,7 +64,8 @@ mimetypes.add_type('application/x-mobi8-ebook', '.azw3')
mimetypes.add_type('application/x-cbr', '.cbr') mimetypes.add_type('application/x-cbr', '.cbr')
mimetypes.add_type('application/x-cbz', '.cbz') mimetypes.add_type('application/x-cbz', '.cbz')
mimetypes.add_type('application/x-cbt', '.cbt') mimetypes.add_type('application/x-cbt', '.cbt')
mimetypes.add_type('image/vnd.djvu', '.djvu') mimetypes.add_type('application/x-cb7', '.cb7')
mimetypes.add_type('image/vnd.djv', '.djv')
mimetypes.add_type('application/mpeg', '.mpeg') mimetypes.add_type('application/mpeg', '.mpeg')
mimetypes.add_type('application/mpeg', '.mp3') mimetypes.add_type('application/mpeg', '.mp3')
mimetypes.add_type('application/mp4', '.m4a') mimetypes.add_type('application/mp4', '.m4a')

22
cps/comic.py
View File

@ -52,6 +52,12 @@ except (ImportError, LookupError) as e:
except (ImportError, SyntaxError) as e: except (ImportError, SyntaxError) as e:
log.debug('Cannot import rarfile, extracting cover files from rar files will not work: %s', e) log.debug('Cannot import rarfile, extracting cover files from rar files will not work: %s', e)
use_rarfile = False use_rarfile = False
try:
import py7zr
use_7zip = True
except (ImportError, SyntaxError) as e:
log.debug('Cannot import py7zr, extracting cover files from CB7 files will not work: %s', e)
use_7zip = False
use_comic_meta = False use_comic_meta = False
@ -84,10 +90,22 @@ def _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_exec
if len(ext) > 1: if len(ext) > 1:
extension = ext[1].lower() extension = ext[1].lower()
if extension in cover.COVER_EXTENSIONS: if extension in cover.COVER_EXTENSIONS:
cover_data = cf.read(name) cover_data = cf.read([name])
break break
except Exception as ex: except Exception as ex:
log.debug('Rarfile failed with error: {}'.format(ex)) log.error('Rarfile failed with error: {}'.format(ex))
elif original_file_extension.upper() == '.CB7' and use_7zip:
cf = py7zr.SevenZipFile(tmp_file_name)
for name in cf.getnames():
ext = os.path.splitext(name)
if len(ext) > 1:
extension = ext[1].lower()
if extension in cover.COVER_EXTENSIONS:
try:
cover_data = cf.read(name)[name].read()
except (py7zr.Bad7zFile, OSError) as ex:
log.error('7Zip file failed with error: {}'.format(ex))
break
return cover_data, extension return cover_data, extension

2
cps/constants.py
View File

@ -147,7 +147,7 @@ EXTENSIONS_CONVERT_FROM = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2',
'txt', 'htmlz', 'rtf', 'odt', 'cbz', 'cbr'] 'txt', 'htmlz', 'rtf', 'odt', 'cbz', 'cbr']
EXTENSIONS_CONVERT_TO = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', EXTENSIONS_CONVERT_TO = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2',
'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt'] 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt']
EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'kepub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'djv', EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'kepub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'cb7', 'djvu', 'djv',
'prc', 'doc', 'docx', 'fb2', 'html', 'rtf', 'lit', 'odt', 'mp3', 'mp4', 'ogg', 'prc', 'doc', 'docx', 'fb2', 'html', 'rtf', 'lit', 'odt', 'mp3', 'mp4', 'ogg',
'opus', 'wav', 'flac', 'm4a', 'm4b'} 'opus', 'wav', 'flac', 'm4a', 'm4b'}

2
cps/editbooks.py
View File

@ -1214,7 +1214,7 @@ def upload_single_file(file_request, book, book_id):
return uploader.process( return uploader.process(
saved_filename, *os.path.splitext(requested_file.filename), saved_filename, *os.path.splitext(requested_file.filename),
rarExecutable=config.config_rarfile_location) rar_executable=config.config_rarfile_location)
return None return None

2
cps/kobo.py
View File

@ -1047,7 +1047,7 @@ def make_calibre_web_auth_response():
"RefreshToken": RefreshToken, "RefreshToken": RefreshToken,
"TokenType": "Bearer", "TokenType": "Bearer",
"TrackingId": str(uuid.uuid4()), "TrackingId": str(uuid.uuid4()),
"UserKey": content['UserKey'], "UserKey": content.get('UserKey',""),
} }
) )
) )

14
cps/opds.py
View File

@ -21,9 +21,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import datetime import datetime
import json
from urllib.parse import unquote_plus from urllib.parse import unquote_plus
from flask import Blueprint, request, render_template, make_response, abort from flask import Blueprint, request, render_template, make_response, abort, Response
from flask_login import current_user from flask_login import current_user
from flask_babel import get_locale from flask_babel import get_locale
from flask_babel import gettext as _ from flask_babel import gettext as _
@ -412,6 +413,17 @@ def get_metadata_calibre_companion(uuid, library):
return "" return ""
@opds.route("/opds/stats")
@requires_basic_auth_if_no_ano
def get_database_stats():
stat = dict()
stat['books'] = calibre_db.session.query(db.Books).count()
stat['authors'] = calibre_db.session.query(db.Authors).count()
stat['categories'] = calibre_db.session.query(db.Tags).count()
stat['series'] = calibre_db.session.query(db.Series).count()
return Response(json.dumps(stat), mimetype="application/json")
@opds.route("/opds/thumb_240_240/<book_id>") @opds.route("/opds/thumb_240_240/<book_id>")
@opds.route("/opds/cover_240_240/<book_id>") @opds.route("/opds/cover_240_240/<book_id>")
@opds.route("/opds/cover_90_90/<book_id>") @opds.route("/opds/cover_90_90/<book_id>")

2
cps/templates/grid.html
View File

@ -28,7 +28,7 @@
<div class="cover"> <div class="cover">
<a href="{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].series[0].id )}}"> <a href="{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].series[0].id )}}">
<span class="img" title="{{entry[0].series[0].name}}"> <span class="img" title="{{entry[0].series[0].name}}">
{{ image.series(entry[0].series[0], alt=entry[0].series[0].name|shortentitle) }} {{ image.book_cover(entry[0])}}
<span class="badge">{{entry.count}}</span> <span class="badge">{{entry.count}}</span>
</span> </span>
</a> </a>

2
cps/uploader.py
View File

@ -79,7 +79,7 @@ def process(tmp_file_path, original_file_name, original_file_extension, rar_exec
meta = epub.get_epub_info(tmp_file_path, original_file_name, original_file_extension) meta = epub.get_epub_info(tmp_file_path, original_file_name, original_file_extension)
elif ".FB2" == extension_upper and use_fb2_meta is True: elif ".FB2" == extension_upper and use_fb2_meta is True:
meta = fb2.get_fb2_info(tmp_file_path, original_file_extension) meta = fb2.get_fb2_info(tmp_file_path, original_file_extension)
elif extension_upper in ['.CBZ', '.CBT', '.CBR']: elif extension_upper in ['.CBZ', '.CBT', '.CBR', ".CB7"]:
meta = comic.get_comic_info(tmp_file_path, meta = comic.get_comic_info(tmp_file_path,
original_file_name, original_file_name,
original_file_extension, original_file_extension,

20
cps/web.py
View File

@ -1002,13 +1002,21 @@ def series_list():
if no_series_count: if no_series_count:
entries.append([db.Category(_("None"), "-1"), no_series_count]) entries.append([db.Category(_("None"), "-1"), no_series_count])
entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no) entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list, return render_title_template('list.html',
title=_("Series"), page="serieslist", data="series", order=order_no) entries=entries,
folder='web.books_list',
charlist=char_list,
title=_("Series"),
page="serieslist",
data="series", order=order_no)
else: else:
entries = calibre_db.session.query(db.Books, func.count('books_series_link').label('count'), entries = (calibre_db.session.query(db.Books, func.count('books_series_link').label('count'),
func.max(db.Books.series_index), db.Books.id) \ func.max(db.Books.series_index), db.Books.id)
.join(db.books_series_link).join(db.Series).filter(calibre_db.common_filters()) \ .join(db.books_series_link).join(db.Series).filter(calibre_db.common_filters())
.group_by(text('books_series_link.series')).order_by(order).all() .group_by(text('books_series_link.series'))
.having(func.max(db.Books.series_index))
.order_by(order)
.all())
return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=char_list, return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=char_list,
title=_("Series"), page="serieslist", data="series", bodyClass="grid-view", title=_("Series"), page="serieslist", data="series", bodyClass="grid-view",
order=order_no) order=order_no)

1
optional-requirements.txt
View File

@ -35,6 +35,7 @@ html2text>=2020.1.16,<2022.1.1
python-dateutil>=2.1,<2.9.0 python-dateutil>=2.1,<2.9.0
beautifulsoup4>=4.0.1,<4.13.0 beautifulsoup4>=4.0.1,<4.13.0
faust-cchardet>=2.1.18,<2.1.20 faust-cchardet>=2.1.18,<2.1.20
py7zr>=0.15.0,<0.21.0
# Comics # Comics
natsort>=2.2.0,<8.4.0 natsort>=2.2.0,<8.4.0

1
setup.cfg
View File

@ -92,6 +92,7 @@ metadata =
python-dateutil>=2.1,<2.9.0 python-dateutil>=2.1,<2.9.0
beautifulsoup4>=4.0.1,<4.12.0 beautifulsoup4>=4.0.1,<4.12.0
faust-cchardet>=2.1.18 faust-cchardet>=2.1.18
py7zr>=0.15.0,<0.21.0
comics = comics =
natsort>=2.2.0,<8.4.0 natsort>=2.2.0,<8.4.0
comicapi>=2.2.0,<3.3.0 comicapi>=2.2.0,<3.3.0

456
test/Calibre-Web TestSummary_Linux.html
View File

@ -37,20 +37,20 @@
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;"> <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-07-26 21:47:14</p> <p class='text-justify attribute'><strong>Start Time: </strong>2023-08-23 21:16:31</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3"> <div class="col-xs-6 col-md-6 col-sm-offset-3">
<p class='text-justify attribute'><strong>Stop Time: </strong>2023-07-27 04:10:01</p> <p class='text-justify attribute'><strong>Stop Time: </strong>2023-08-24 03:51:45</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3"> <div class="col-xs-6 col-md-6 col-sm-offset-3">
<p class='text-justify attribute'><strong>Duration: </strong>5h 21 min</p> <p class='text-justify attribute'><strong>Duration: </strong>5h 34 min</p>
</div> </div>
</div> </div>
</div> </div>
@ -234,12 +234,12 @@
<tr id="su" class="errorClass"> <tr id="su" class="passClass">
<td>TestBackupMetadata</td> <td>TestBackupMetadata</td>
<td class="text-center">22</td> <td class="text-center">22</td>
<td class="text-center">20</td> <td class="text-center">22</td>
<td class="text-center">1</td> <td class="text-center">0</td>
<td class="text-center">1</td> <td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center"> <td class="text-center">
<a onclick="showClassDetail('c2', 22)">Detail</a> <a onclick="showClassDetail('c2', 22)">Detail</a>
@ -293,32 +293,11 @@
<tr id="ft2.6" class="none bg-danger"> <tr id='pt2.6' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestBackupMetadata - test_backup_change_book_publisher</div> <div class='testcase'>TestBackupMetadata - test_backup_change_book_publisher</div>
</td> </td>
<td colspan='6'> <td colspan='6' align='center'>PASS</td>
<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> </tr>
@ -395,33 +374,11 @@ AssertionError: &#39;&#39; != &#39;Lo,执|1u&#39;
<tr id="et2.15" class="none bg-info"> <tr id='pt2.15' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestBackupMetadata - test_backup_change_custom_categories</div> <div class='testcase'>TestBackupMetadata - test_backup_change_custom_categories</div>
</td> </td>
<td colspan='6'> <td colspan='6' align='center'>PASS</td>
<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> </tr>
@ -1015,11 +972,11 @@ TypeError: &#39;NoneType&#39; object is not iterable</pre>
<tr id="su" class="failClass"> <tr id="su" class="passClass">
<td>TestEbookConvertGDriveKepubify</td> <td>TestEbookConvertGDriveKepubify</td>
<td class="text-center">3</td> <td class="text-center">3</td>
<td class="text-center">2</td> <td class="text-center">3</td>
<td class="text-center">1</td> <td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center"> <td class="text-center">
@ -1038,33 +995,11 @@ TypeError: &#39;NoneType&#39; object is not iterable</pre>
<tr id="ft11.2" class="none bg-danger"> <tr id='pt11.2' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div> <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
</td> </td>
<td colspan='6'> <td colspan='6' align='center'>PASS</td>
<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> </tr>
@ -1079,15 +1014,15 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id="su" class="skipClass"> <tr id="su" class="errorClass">
<td>TestEditAdditionalBooks</td> <td>TestEditAdditionalBooks</td>
<td class="text-center">20</td>
<td class="text-center">17</td> <td class="text-center">17</td>
<td class="text-center">16</td>
<td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center">1</td> <td class="text-center">1</td>
<td class="text-center">2</td>
<td class="text-center"> <td class="text-center">
<a onclick="showClassDetail('c12', 17)">Detail</a> <a onclick="showClassDetail('c12', 20)">Detail</a>
</td> </td>
</tr> </tr>
@ -1201,7 +1136,36 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt12.13' class='hiddenRow bg-success'> <tr id="et12.13" class="none bg-info">
<td>
<div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cb7</div>
</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.13')">ERROR</a>
</div>
<!--css div popup start-->
<div id="div_et12.13" 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_et12.13').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_additional_books.py&#34;, line 225, in test_upload_metadata_cb7
self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr>
<tr id='pt12.14' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div> <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
</td> </td>
@ -1210,7 +1174,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt12.14' class='hiddenRow bg-success'> <tr id='pt12.15' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div> <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
</td> </td>
@ -1219,7 +1183,42 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='st12.15' class='none bg-warning'> <tr id="st12.16" class="none bg-warning">
<td>
<div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.16')">SKIP</a>
</div>
<!--css div popup start-->
<div id="div_st12.16" class="popup_window test_output" style="display:none;">
<div class='close_button pull-right'>
<button type="button" class="close" aria-label="Close" onfocus="this.blur();"
onclick="document.getElementById('div_st12.16').style.display='none'"><span
aria-hidden="true">&times;</span></button>
</div>
<div class="text-left pull-left">
<pre class="text-left">Not implemented</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr>
<tr id='pt12.17' class='hiddenRow bg-success'>
<td>
<div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
</td>
<td colspan='6' align='center'>PASS</td>
</tr>
<tr id='st12.18' class='none bg-warning'>
<td> <td>
<div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div> <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
</td> </td>
@ -1228,7 +1227,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt12.16' class='hiddenRow bg-success'> <tr id='pt12.19' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div> <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
</td> </td>
@ -1237,7 +1236,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt12.17' class='hiddenRow bg-success'> <tr id='pt12.20' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div> <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
</td> </td>
@ -1247,15 +1246,15 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id="su" class="skipClass"> <tr id="su" class="errorClass">
<td>TestEditBooks</td> <td>TestEditBooks</td>
<td class="text-center">37</td> <td class="text-center">38</td>
<td class="text-center">35</td> <td class="text-center">34</td>
<td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center">2</td> <td class="text-center">2</td>
<td class="text-center">2</td>
<td class="text-center"> <td class="text-center">
<a onclick="showClassDetail('c13', 37)">Detail</a> <a onclick="showClassDetail('c13', 38)">Detail</a>
</td> </td>
</tr> </tr>
@ -1538,7 +1537,36 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.28' class='hiddenRow bg-success'> <tr id="et13.28" class="none bg-info">
<td>
<div class='testcase'>TestEditBooks - test_upload_book_cb7</div>
</td>
<td colspan='6'>
<div class="text-center">
<a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.28')">ERROR</a>
</div>
<!--css div popup start-->
<div id="div_et13.28" 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_et13.28').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_books.py&#34;, line 1159, in test_upload_book_cb7
self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr>
<tr id='pt13.29' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_book_cbr</div> <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
</td> </td>
@ -1547,7 +1575,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.29' class='hiddenRow bg-success'> <tr id='pt13.30' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_book_cbt</div> <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
</td> </td>
@ -1556,7 +1584,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.30' class='hiddenRow bg-success'> <tr id='pt13.31' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_book_cbz</div> <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
</td> </td>
@ -1565,7 +1593,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.31' class='hiddenRow bg-success'> <tr id='pt13.32' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_book_epub</div> <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
</td> </td>
@ -1574,7 +1602,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.32' class='hiddenRow bg-success'> <tr id='pt13.33' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_book_fb2</div> <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
</td> </td>
@ -1583,7 +1611,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.33' class='hiddenRow bg-success'> <tr id='pt13.34' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_book_lit</div> <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
</td> </td>
@ -1592,7 +1620,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.34' class='hiddenRow bg-success'> <tr id='pt13.35' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_book_mobi</div> <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
</td> </td>
@ -1601,7 +1629,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.35' class='hiddenRow bg-success'> <tr id='pt13.36' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_book_pdf</div> <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
</td> </td>
@ -1610,7 +1638,7 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.36' class='hiddenRow bg-success'> <tr id='pt13.37' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div> <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
</td> </td>
@ -1619,11 +1647,31 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt13.37' class='hiddenRow bg-success'> <tr id="et13.38" class="none bg-info">
<td> <td>
<div class='testcase'>TestEditBooks - test_upload_cover_hdd</div> <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
</td> </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_et13.38')">ERROR</a>
</div>
<!--css div popup start-->
<div id="div_et13.38" 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_et13.38').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_books.py&#34;, line 866, in test_upload_cover_hdd
self.delete_book(details[&#39;id&#39;])
NameError: name &#39;details&#39; is not defined</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr> </tr>
@ -1944,11 +1992,11 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id="su" class="passClass"> <tr id="su" class="failClass">
<td>TestLoadMetadata</td> <td>TestLoadMetadata</td>
<td class="text-center">1</td> <td class="text-center">1</td>
<td class="text-center">1</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">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center"> <td class="text-center">
@ -1958,21 +2006,47 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id='pt17.1' class='hiddenRow bg-success'> <tr id="ft17.1" class="none bg-danger">
<td> <td>
<div class='testcase'>TestLoadMetadata - test_load_metadata</div> <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
</td> </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_ft17.1')">FAIL</a>
</div>
<!--css div popup start-->
<div id="div_ft17.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_ft17.1').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_books_metadata.py&#34;, line 209, in test_load_metadata
self.assertEqual(old_results, results)
AssertionError: Lists differ: [] != [{&#39;cover_element&#39;: &lt;selenium.webdriver.rem[10121 chars]4/&#39;}]
Second list contains 20 additional elements.
First extra element 0:
{&#39;cover_element&#39;: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;34034d2d-f804-47c1-b9ad-fcf09f75f812&#34;, element=&#34;6dfe81e2-4752-4f1f-bd33-9388d0d529c1&#34;)&gt;, &#39;cover&#39;: &#39;https://books.google.com/books/content?id=Ub8TAQAAIAAJ&amp;printsec=frontcover&amp;img=1&amp;zoom=1&amp;source=gbs_api&amp;fife=w800-h900&#39;, &#39;source&#39;: &#39;https://books.google.com/&#39;, &#39;author&#39;: &#39;Martin Vogt&#39;, &#39;publisher&#39;: &#39;&#39;, &#39;title&#39;: &#39;Der Buchtitel in der römischen Poesie&#39;, &#39;title_link&#39;: &#39;https://books.google.com/books?id=Ub8TAQAAIAAJ&#39;}
Diff is 10795 characters long. Set self.maxDiff to None to see it.</pre>
</div>
<div class="clearfix"></div>
</div>
<!--css div popup end-->
</td>
</tr> </tr>
<tr id="su" class="failClass"> <tr id="su" class="passClass">
<td>TestEditBooksOnGdrive</td> <td>TestEditBooksOnGdrive</td>
<td class="text-center">18</td> <td class="text-center">18</td>
<td class="text-center">17</td> <td class="text-center">18</td>
<td class="text-center">1</td> <td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center"> <td class="text-center">
@ -2135,31 +2209,11 @@ AssertionError: &#39;Started&#39; != &#39;Finished&#39;
<tr id="ft18.18" class="none bg-danger"> <tr id='pt18.18' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div> <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
</td> </td>
<td colspan='6'> <td colspan='6' align='center'>PASS</td>
<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> </tr>
@ -3606,11 +3660,11 @@ AssertionError: False is not true</pre>
<tr id="su" class="failClass"> <tr id="su" class="passClass">
<td>TestReader</td> <td>TestReader</td>
<td class="text-center">6</td> <td class="text-center">6</td>
<td class="text-center">5</td> <td class="text-center">6</td>
<td class="text-center">1</td> <td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center"> <td class="text-center">
@ -3656,37 +3710,11 @@ AssertionError: False is not true</pre>
<tr id="ft39.5" class="none bg-danger"> <tr id='pt39.5' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestReader - test_sound_listener</div> <div class='testcase'>TestReader - test_sound_listener</div>
</td> </td>
<td colspan='6'> <td colspan='6' align='center'>PASS</td>
<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> </tr>
@ -4054,11 +4082,11 @@ AssertionError: &#39;0:03&#39; != &#39;0:02&#39;
<tr id="su" class="failClass"> <tr id="su" class="skipClass">
<td>TestThumbnails</td> <td>TestThumbnails</td>
<td class="text-center">8</td> <td class="text-center">8</td>
<td class="text-center">6</td> <td class="text-center">7</td>
<td class="text-center">1</td> <td class="text-center">0</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center">1</td> <td class="text-center">1</td>
<td class="text-center"> <td class="text-center">
@ -4095,31 +4123,11 @@ AssertionError: &#39;0:03&#39; != &#39;0:02&#39;
<tr id="ft45.4" class="none bg-danger"> <tr id='pt45.4' class='hiddenRow bg-success'>
<td> <td>
<div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div> <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
</td> </td>
<td colspan='6'> <td colspan='6' align='center'>PASS</td>
<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> </tr>
@ -5229,11 +5237,11 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr id='total_row' class="text-center bg-grey"> <tr id='total_row' class="text-center bg-grey">
<td>Total</td> <td>Total</td>
<td>457</td> <td>461</td>
<td>443</td> <td>448</td>
<td>5</td>
<td>1</td> <td>1</td>
<td>8</td> <td>3</td>
<td>9</td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
</table> </table>
@ -5261,13 +5269,13 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>Platform</th> <th>Platform</th>
<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>Linux 6.2.0-26-generic #26~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Thu Jul 13 16:27:29 UTC 2 x86_64 x86_64</td>
<td>Basic</td> <td>Basic</td>
</tr> </tr>
<tr> <tr>
<th>Python</th> <th>Python</th>
<td>3.10.6</td> <td>3.10.12</td>
<td>Basic</td> <td>Basic</td>
</tr> </tr>
@ -5279,7 +5287,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>APScheduler</th> <th>APScheduler</th>
<td>3.10.1</td> <td>3.10.4</td>
<td>Basic</td> <td>Basic</td>
</tr> </tr>
@ -5297,7 +5305,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>Flask</th> <th>Flask</th>
<td>2.3.2</td> <td>2.3.3</td>
<td>Basic</td> <td>Basic</td>
</tr> </tr>
@ -5405,13 +5413,13 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>Werkzeug</th> <th>Werkzeug</th>
<td>2.3.6</td> <td>2.3.7</td>
<td>Basic</td> <td>Basic</td>
</tr> </tr>
<tr> <tr>
<th>google-api-python-client</th> <th>google-api-python-client</th>
<td>2.95.0</td> <td>2.97.0</td>
<td>TestBackupMetadataGdrive</td> <td>TestBackupMetadataGdrive</td>
</tr> </tr>
@ -5429,7 +5437,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>PyDrive2</th> <th>PyDrive2</th>
<td>1.16.1</td> <td>1.17.0</td>
<td>TestBackupMetadataGdrive</td> <td>TestBackupMetadataGdrive</td>
</tr> </tr>
@ -5441,7 +5449,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>google-api-python-client</th> <th>google-api-python-client</th>
<td>2.95.0</td> <td>2.97.0</td>
<td>TestCliGdrivedb</td> <td>TestCliGdrivedb</td>
</tr> </tr>
@ -5459,7 +5467,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>PyDrive2</th> <th>PyDrive2</th>
<td>1.16.1</td> <td>1.17.0</td>
<td>TestCliGdrivedb</td> <td>TestCliGdrivedb</td>
</tr> </tr>
@ -5471,7 +5479,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>google-api-python-client</th> <th>google-api-python-client</th>
<td>2.95.0</td> <td>2.97.0</td>
<td>TestEbookConvertCalibreGDrive</td> <td>TestEbookConvertCalibreGDrive</td>
</tr> </tr>
@ -5489,7 +5497,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>PyDrive2</th> <th>PyDrive2</th>
<td>1.16.1</td> <td>1.17.0</td>
<td>TestEbookConvertCalibreGDrive</td> <td>TestEbookConvertCalibreGDrive</td>
</tr> </tr>
@ -5501,7 +5509,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>google-api-python-client</th> <th>google-api-python-client</th>
<td>2.95.0</td> <td>2.97.0</td>
<td>TestEbookConvertGDriveKepubify</td> <td>TestEbookConvertGDriveKepubify</td>
</tr> </tr>
@ -5519,7 +5527,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>PyDrive2</th> <th>PyDrive2</th>
<td>1.16.1</td> <td>1.17.0</td>
<td>TestEbookConvertGDriveKepubify</td> <td>TestEbookConvertGDriveKepubify</td>
</tr> </tr>
@ -5535,15 +5543,27 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<td>TestEditAdditionalBooks</td> <td>TestEditAdditionalBooks</td>
</tr> </tr>
<tr>
<th>py7zr</th>
<td>0.20.6</td>
<td>TestEditAdditionalBooks</td>
</tr>
<tr> <tr>
<th>rarfile</th> <th>rarfile</th>
<td>4.0</td> <td>4.0</td>
<td>TestEditAdditionalBooks</td> <td>TestEditAdditionalBooks</td>
</tr> </tr>
<tr>
<th>py7zr</th>
<td>0.20.6</td>
<td>TestEditBooks</td>
</tr>
<tr> <tr>
<th>google-api-python-client</th> <th>google-api-python-client</th>
<td>2.95.0</td> <td>2.97.0</td>
<td>TestEditAuthorsGdrive</td> <td>TestEditAuthorsGdrive</td>
</tr> </tr>
@ -5561,7 +5581,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>PyDrive2</th> <th>PyDrive2</th>
<td>1.16.1</td> <td>1.17.0</td>
<td>TestEditAuthorsGdrive</td> <td>TestEditAuthorsGdrive</td>
</tr> </tr>
@ -5579,7 +5599,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>google-api-python-client</th> <th>google-api-python-client</th>
<td>2.95.0</td> <td>2.97.0</td>
<td>TestEditBooksOnGdrive</td> <td>TestEditBooksOnGdrive</td>
</tr> </tr>
@ -5597,7 +5617,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>PyDrive2</th> <th>PyDrive2</th>
<td>1.16.1</td> <td>1.17.0</td>
<td>TestEditBooksOnGdrive</td> <td>TestEditBooksOnGdrive</td>
</tr> </tr>
@ -5621,7 +5641,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>google-api-python-client</th> <th>google-api-python-client</th>
<td>2.95.0</td> <td>2.97.0</td>
<td>TestSetupGdrive</td> <td>TestSetupGdrive</td>
</tr> </tr>
@ -5639,7 +5659,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>PyDrive2</th> <th>PyDrive2</th>
<td>1.16.1</td> <td>1.17.0</td>
<td>TestSetupGdrive</td> <td>TestSetupGdrive</td>
</tr> </tr>
@ -5663,13 +5683,13 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>jsonschema</th> <th>jsonschema</th>
<td>4.18.4</td> <td>4.19.0</td>
<td>TestKoboSync</td> <td>TestKoboSync</td>
</tr> </tr>
<tr> <tr>
<th>jsonschema</th> <th>jsonschema</th>
<td>4.18.4</td> <td>4.19.0</td>
<td>TestKoboSyncBig</td> <td>TestKoboSyncBig</td>
</tr> </tr>
@ -5681,7 +5701,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
<tr> <tr>
<th>jsonschema</th> <th>jsonschema</th>
<td>4.18.4</td> <td>4.19.0</td>
<td>TestLdapLogin</td> <td>TestLdapLogin</td>
</tr> </tr>
@ -5711,7 +5731,7 @@ AssertionError: 0.0288805190529425 not greater than or equal to 0.03</pre>
</div> </div>
<script> <script>
drawCircle(443, 5, 1, 8); drawCircle(448, 1, 3, 9);
showCase(5); showCase(5);
</script> </script>