Merge branch 'master' into Develop

This commit is contained in:
Ozzie Isaacs 2024-07-06 14:34:45 +02:00
commit f5f16a3dd2
57 changed files with 5580 additions and 5057 deletions

View File

@ -175,7 +175,7 @@ BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, d
'series_id, languages, publisher, pubdate, identifiers') 'series_id, languages, publisher, pubdate, identifiers')
# python build process likes to have x.y.zbw -> b for beta and w a counting number # python build process likes to have x.y.zbw -> b for beta and w a counting number
STABLE_VERSION = {'version': '0.6.22b'} STABLE_VERSION = {'version': '0.6.23b'}
NIGHTLY_VERSION = dict() NIGHTLY_VERSION = dict()
NIGHTLY_VERSION[0] = '$Format:%H$' NIGHTLY_VERSION[0] = '$Format:%H$'

View File

@ -10973,4 +10973,4 @@ LANGUAGE_NAMES = {
"zxx": "No linguistic content", "zxx": "No linguistic content",
"zza": "Zaza" "zza": "Zaza"
} }
} }

View File

@ -285,11 +285,13 @@ class LubimyCzytacParser:
def _parse_tags(self) -> List[str]: def _parse_tags(self) -> List[str]:
tags = self._parse_xpath_node(xpath=LubimyCzytac.TAGS, take_first=False) tags = self._parse_xpath_node(xpath=LubimyCzytac.TAGS, take_first=False)
return [ if tags:
strip_accents(w.replace(", itd.", " itd.")) return [
for w in tags strip_accents(w.replace(", itd.", " itd."))
if isinstance(w, str) for w in tags
] if isinstance(w, str)
]
return None
def _parse_from_summary(self, attribute_name: str) -> Optional[str]: def _parse_from_summary(self, attribute_name: str) -> Optional[str]:
value = None value = None

View File

@ -125,6 +125,7 @@ if ($("body.book").length > 0) {
$("#sendbtn").parent().addClass("sendBtn"); $("#sendbtn").parent().addClass("sendBtn");
$("[id*=btnGroupDrop]").parent().addClass("downloadBtn"); $("[id*=btnGroupDrop]").parent().addClass("downloadBtn");
$("read-in-browser").parent().addClass("readBtn"); $("read-in-browser").parent().addClass("readBtn");
$("listen-in-browser").parent().addClass("listenBtn");
$(".downloadBtn button:first").addClass("download-text"); $(".downloadBtn button:first").addClass("download-text");
// Move all options in book details page to the same group // Move all options in book details page to the same group
@ -138,21 +139,33 @@ if ($("body.book").length > 0) {
.prependTo('[aria-label^="Download, send"]'); .prependTo('[aria-label^="Download, send"]');
$("#have_read_cb") $("#have_read_cb")
.after('<label class="block-label readLbl" for="#have_read_cb"></label>'); .after('<label class="block-label readLbl" for="#have_read_cb"></label>');
$("#have_read_form").next("p").remove();
$("#have_read_form").next("p").remove();
$("#archived_cb") $("#archived_cb")
.after('<label class="block-label readLbl" for="#archived_cb"></label>'); .after('<label class="block-label readLbl" for="#archived_cb"></label>');
$("#shelf-actions").prependTo('[aria-label^="Download, send"]'); $("#shelf-actions").prependTo('[aria-label^="Download, send"]');
$(".more-stuff .col-sm-12 #back").hide()
/* .html("&laquo; Previous")
.addClass("page-link")
.removeClass("btn btn-default")
.prependTo('[aria-label^="Download, send"]');*/
// Move dropdown lists higher in dom, replace bootstrap toggle with own toggle. // Move dropdown lists higher in dom, replace bootstrap toggle with own toggle.
$('ul[aria-labelledby="read-in-browser"]').insertBefore(".blur-wrapper").addClass("readinbrowser-drop"); $('ul[aria-labelledby="read-in-browser"]').insertBefore(".blur-wrapper").addClass("readinbrowser-drop");
$('ul[aria-labelledby="listen-in-browser"]').insertBefore(".blur-wrapper").addClass("readinbrowser-drop");
$('ul[aria-labelledby="send-to-kereader"]').insertBefore(".blur-wrapper").addClass("sendtoereader-drop"); $('ul[aria-labelledby="send-to-kereader"]').insertBefore(".blur-wrapper").addClass("sendtoereader-drop");
$(".leramslist").insertBefore(".blur-wrapper"); $(".leramslist").insertBefore(".blur-wrapper");
$('ul[aria-labelledby="btnGroupDrop1"]').insertBefore(".blur-wrapper").addClass("leramslist"); $('ul[aria-labelledby="btnGroupDrop1"]').insertBefore(".blur-wrapper").addClass("leramslist");
$("#add-to-shelves").insertBefore(".blur-wrapper"); $("#add-to-shelves").insertBefore(".blur-wrapper");
$("#back")
$("#read-in-browser").click(function () { $("#read-in-browser").click(function () {
$(".readinbrowser-drop").toggle(); $(".readinbrowser-drop").toggle();
}); });
$("#listen-in-browser").click(function () {
$(".readinbrowser-drop").toggle();
});
$(".downloadBtn").click(function () { $(".downloadBtn").click(function () {
$(".leramslist").toggle(); $(".leramslist").toggle();
@ -626,6 +639,7 @@ if ($("body.epub").length === 0) {
} }
$("#read-in-browser a").attr("target", ""); $("#read-in-browser a").attr("target", "");
$("#listen-in-browser a").attr("target", "");
if ($(".edit-shelf-btn").length > 1) { if ($(".edit-shelf-btn").length > 1) {
$(".edit-shelf-btn:first").remove(); $(".edit-shelf-btn:first").remove();

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff