martin/PbDbFixer
2
1
Fork 0
Code Issues Pull requests Projects Releases 15 Wiki Activity

Compare commits

base: martin:8b38cee7b888dace02d2248c6f6019c7fddc17b7
Branches Tags
martin:master
martin:perf
martin:wip
martin:v0.9.0
martin:v0.8.3
martin:v0.8.2
martin:v0.8.1
martin:v0.8.0
martin:v0.7.2
martin:v0.7.1
martin:v0.7.0
martin:v0.6.0
martin:v0.5.0
martin:v0.4.0
martin:v0.3.1
martin:v0.3.0
martin:v0.2.0
martin:v0.1.0
..
compare: martin:b02ede51820d9293cc6152f2a821f4687ff5ecb8
Branches Tags
martin:master
martin:perf
martin:wip
martin:v0.9.0
martin:v0.8.3
martin:v0.8.2
martin:v0.8.1
martin:v0.8.0
martin:v0.7.2
martin:v0.7.1
martin:v0.7.0
martin:v0.6.0
martin:v0.5.0
martin:v0.4.0
martin:v0.3.1
martin:v0.3.0
martin:v0.2.0
martin:v0.1.0

2 commits
8b38cee7b8 ... b02ede5182

Author SHA1 Message Date
Martin Brodbeck
b02ede5182 get_epub_metadata() simplified. 2024-11-12 10:57:03 +01:00
Martin Brodbeck
da77983228 get_rootfile() simplified 2024-11-12 10:37:01 +01:00
2 changed files with 32 additions and 35 deletions
Show stats Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -396,7 +396,7 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]] [[package]]
name = "pbdbfixer" name = "pbdbfixer"
version = "0.8.3" version = "0.9.0"
dependencies = [ dependencies = [
"quick-xml", "quick-xml",
"rusqlite", "rusqlite",

65
src/epub.rs
View file

@ -1,5 +1,4 @@
use std::{ use std::{
borrow::Borrow,
collections::HashMap, collections::HashMap,
fs::{self, File}, fs::{self, File},
io::Read, io::Read,
@ -61,18 +60,17 @@ fn get_rootfile(archive: &mut ZipArchive<File>) -> String {
loop { loop {
match reader.read_event_into(&mut buf) { match reader.read_event_into(&mut buf) {
Ok(Event::Start(ref e)) | Ok(Event::Empty(ref e)) Ok(Event::Start(ref e)) | Ok(Event::Empty(ref e))
if e.local_name().into_inner() == b"rootfile" => if e.name().as_ref() == b"rootfile" =>
{ {
opf_filename = String::from_utf8( opf_filename = e
e.attributes() .attributes()
.filter(|attr| attr.as_ref().unwrap().key.into_inner() == b"full-path") .filter(|attr| attr.as_ref().unwrap().key.as_ref() == b"full-path")
.next() .next()
.unwrap() .unwrap()
.unwrap() .unwrap()
.value .unescape_value()
.to_vec(), .unwrap()
) .to_string();
.unwrap();
break; break;
} }
Ok(Event::Eof) => break, Ok(Event::Eof) => break,
@ -133,20 +131,20 @@ pub fn get_epub_metadata(filename: &str) -> Option<EpubMetadata> {
loop { loop {
match reader.read_event_into(&mut buf) { match reader.read_event_into(&mut buf) {
// See if we have EPUB3 or EPUB2 // See if we have EPUB3 or EPUB2
Ok(Event::Start(ref e)) if e.local_name().into_inner() == b"package" => { Ok(Event::Start(ref e)) if e.name().as_ref() == b"package" => {
if e.attributes().any(|attr| { if e.attributes().any(|attr| {
attr.as_ref().unwrap().key.into_inner() == b"version" attr.as_ref().unwrap().key.as_ref() == b"version"
&& attr.as_ref().unwrap().value.starts_with(b"3") && attr.as_ref().unwrap().value.starts_with(b"3")
}) { }) {
is_epub3 = true; is_epub3 = true;
} }
} }
Ok(Event::Start(ref e)) if e.local_name().into_inner() == b"creator" => { Ok(Event::Start(ref e)) if e.local_name().as_ref() == b"creator" => {
creator_found = true; creator_found = true;
if is_epub3 { if is_epub3 {
if let Some(idval) = e if let Some(idval) = e
.attributes() .attributes()
.filter(|attr| attr.as_ref().unwrap().key.into_inner() == b"id") .filter(|attr| attr.as_ref().unwrap().key.as_ref() == b"id")
.next() .next()
{ {
curr_id = "#".to_string() curr_id = "#".to_string()
@ -166,7 +164,7 @@ pub fn get_epub_metadata(filename: &str) -> Option<EpubMetadata> {
attr.as_ref() attr.as_ref()
.unwrap() .unwrap()
.key .key
.into_inner() .as_ref()
.ends_with(b"file-as") .ends_with(b"file-as")
}) })
.next() .next()
@ -175,13 +173,13 @@ pub fn get_epub_metadata(filename: &str) -> Option<EpubMetadata> {
let entry = xml_authors.entry(curr_id.clone()).or_insert(XmlAut::new()); let entry = xml_authors.entry(curr_id.clone()).or_insert(XmlAut::new());
entry.sort = file_as_val entry.sort = file_as_val
.unwrap() .unwrap()
.decode_and_unescape_value(*reader.decoder().borrow()) .unescape_value()
.unwrap_or_default() .unwrap_or_default()
.to_string(); .to_string();
entry.role = "aut".to_string(); entry.role = "aut".to_string();
} else if let Some(_role_val) = e } else if let Some(_role_val) = e
.attributes() .attributes()
.filter(|attr| attr.as_ref().unwrap().key.into_inner().ends_with(b"role")) .filter(|attr| attr.as_ref().unwrap().key.as_ref().ends_with(b"role"))
.next() .next()
{ {
curr_id = "none".to_string() + xml_authors.len().to_string().as_str(); curr_id = "none".to_string() + xml_authors.len().to_string().as_str();
@ -200,33 +198,33 @@ pub fn get_epub_metadata(filename: &str) -> Option<EpubMetadata> {
creator_found = false; creator_found = false;
} }
Ok(Event::Start(ref e)) if e.local_name().into_inner() == b"meta" && is_epub3 => { Ok(Event::Start(ref e)) if e.local_name().as_ref() == b"meta" && is_epub3 => {
if let Some(refines) = e if let Some(refines) = e
.attributes() .attributes()
.filter(|attr| attr.as_ref().unwrap().key.into_inner() == b"refines") .filter(|attr| attr.as_ref().unwrap().key.as_ref() == b"refines")
.next() .next()
{ {
if e.attributes().any(|attr| { if e.attributes().any(|attr| {
attr.as_ref().unwrap().key.into_inner() == b"property" attr.as_ref().unwrap().key.as_ref() == b"property"
&& attr.as_ref().unwrap().value.ends_with(b"file-as") && attr.as_ref().unwrap().value.ends_with(b"file-as")
}) { }) {
curr_id = String::from_utf8(refines.unwrap().value.to_vec()).unwrap(); curr_id = String::from_utf8(refines.unwrap().value.to_vec()).unwrap();
file_as_found = true; file_as_found = true;
} else if e.attributes().any(|attr| { } else if e.attributes().any(|attr| {
attr.as_ref().unwrap().key.into_inner() == b"property" attr.as_ref().unwrap().key.as_ref() == b"property"
&& attr.as_ref().unwrap().value.ends_with(b"role") && attr.as_ref().unwrap().value.ends_with(b"role")
}) { }) {
curr_id = String::from_utf8(refines.unwrap().value.to_vec()).unwrap(); curr_id = String::from_utf8(refines.unwrap().value.to_vec()).unwrap();
role_found = true; role_found = true;
} else if e.attributes().any(|attr| { } else if e.attributes().any(|attr| {
attr.as_ref().unwrap().key.into_inner() == b"property" attr.as_ref().unwrap().key.as_ref() == b"property"
&& attr.as_ref().unwrap().value.ends_with(b"group-position") && attr.as_ref().unwrap().value.ends_with(b"group-position")
}) { }) {
series_index_found = true; series_index_found = true;
} }
} }
if e.attributes().any(|attr| { if e.attributes().any(|attr| {
attr.as_ref().unwrap().key.into_inner() == b"property" attr.as_ref().unwrap().key.as_ref() == b"property"
&& attr && attr
.as_ref() .as_ref()
.unwrap() .unwrap()
@ -236,9 +234,9 @@ pub fn get_epub_metadata(filename: &str) -> Option<EpubMetadata> {
series_found = true; series_found = true;
} }
} }
Ok(Event::Empty(ref e)) if e.local_name().into_inner() == b"meta" && !is_epub3 => { Ok(Event::Empty(ref e)) if e.local_name().as_ref() == b"meta" && !is_epub3 => {
if e.attributes().any(|attr| { if e.attributes().any(|attr| {
attr.as_ref().unwrap().key.into_inner() == b"name" attr.as_ref().unwrap().key.as_ref() == b"name"
&& attr && attr
.as_ref() .as_ref()
.unwrap() .unwrap()
@ -248,15 +246,15 @@ pub fn get_epub_metadata(filename: &str) -> Option<EpubMetadata> {
}) { }) {
epub_meta.series.name = e epub_meta.series.name = e
.attributes() .attributes()
.filter(|attr| attr.as_ref().unwrap().key.into_inner() == b"content") .filter(|attr| attr.as_ref().unwrap().key.as_ref() == b"content")
.next() .next()
.unwrap() .unwrap()
.unwrap() .unwrap()
.decode_and_unescape_value(*reader.decoder().borrow()) .unescape_value()
.unwrap_or_default() .unwrap_or_default()
.to_string(); .to_string();
} else if e.attributes().any(|attr| { } else if e.attributes().any(|attr| {
attr.as_ref().unwrap().key.into_inner() == b"name" attr.as_ref().unwrap().key.as_ref() == b"name"
&& attr && attr
.as_ref() .as_ref()
.unwrap() .unwrap()
@ -266,11 +264,11 @@ pub fn get_epub_metadata(filename: &str) -> Option<EpubMetadata> {
}) { }) {
let index_float = e let index_float = e
.attributes() .attributes()
.filter(|attr| attr.as_ref().unwrap().key.into_inner() == b"content") .filter(|attr| attr.as_ref().unwrap().key.as_ref() == b"content")
.next() .next()
.unwrap() .unwrap()
.unwrap() .unwrap()
.decode_and_unescape_value(*reader.decoder().borrow()) .unescape_value()
.unwrap_or_default() .unwrap_or_default()
.parse::<f32>() .parse::<f32>()
.unwrap_or_default(); .unwrap_or_default();
@ -302,11 +300,10 @@ pub fn get_epub_metadata(filename: &str) -> Option<EpubMetadata> {
series_index_found = false; series_index_found = false;
} }
Ok(Event::Start(ref e)) if e.local_name().into_inner() == b"subject" => { Ok(Event::Start(ref e)) if e.local_name().as_ref() == b"subject" => {
genre_found = true; genre_found = true;
} }
Ok(Event::Text(ref e)) if genre_found => { Ok(Event::Text(ref e)) if genre_found => {
//epub_meta.genre = e.unescape_and_decode(&reader).unwrap();
epub_meta.genre = e.unescape().unwrap().to_string(); epub_meta.genre = e.unescape().unwrap().to_string();
genre_found = false; genre_found = false;
} }