Skip to content

Add OPS/ prefix support and deduplicate prefix list #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inkroom merged 1 commit into from
Feb 24, 2026
Merged

Add OPS/ prefix support and deduplicate prefix list #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions lib/src/epub/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ impl Debug for EpubHtml {
}

impl EpubHtml {
const PREFIXES: [&str; 4] = ["", common::EPUB, common::EPUB3, "OPS/"];

pub fn string_data(&mut self) -> String {
if self._data.is_none() {
self.data_mut();
Expand Down Expand Up @@ -209,9 +211,8 @@ impl EpubHtml {
(None, self.file_name().to_string())
};
let mut f = String::from(self._file_name.as_str());
let prefixs = ["", common::EPUB, common::EPUB3];
if self._data.is_none() && !f.is_empty() {
for prefix in prefixs.iter() {
for prefix in EpubHtml::PREFIXES.iter() {
// 添加 前缀再次读取
f = format!("{prefix}{origin}");
let d = reader.read_string(f.as_str());
Expand Down Expand Up @@ -267,9 +268,8 @@ impl EpubHtml {
(None, self.file_name().to_string())
};
let mut f = String::from(self._file_name.as_str());
let prefixs = ["", common::EPUB, common::EPUB3];
if self._data.is_none() && self.reader.is_some() && !f.is_empty() {
for prefix in prefixs.iter() {
for prefix in EpubHtml::PREFIXES.iter() {
// 添加 前缀再次读取
f = format!("{prefix}{origin}");
let s = self.reader.as_mut().unwrap();
Expand Down Expand Up @@ -334,9 +334,8 @@ impl EpubHtml {
(None, self.file_name().to_string())
};
let mut f = String::from(self._file_name.as_str());
let prefixs = ["", common::EPUB, common::EPUB3];
if self.raw_data.is_none() && self.reader.is_some() && !f.is_empty() {
for prefix in prefixs.iter() {
for prefix in EpubHtml::PREFIXES.iter() {
// 添加 前缀再次读取
f = format!("{prefix}{origin}");
let s = self.reader.as_mut().unwrap();
Expand Down Expand Up @@ -449,9 +448,8 @@ impl EpubAssets {
pub fn data_mut(&mut self) -> Option<&[u8]> {
let mut f = String::from(self._file_name.as_str());
if self._data.is_none() && self.reader.is_some() && !f.is_empty() {
let prefixs = ["", common::EPUB, common::EPUB3];
if self._data.is_none() && self.reader.is_some() && !f.is_empty() {
for prefix in prefixs.iter() {
for prefix in EpubHtml::PREFIXES.iter() {
let s = self.reader.as_mut().unwrap();
// 添加 前缀再次读取
f = format!("{prefix}{}", self._file_name);
Expand Down Expand Up @@ -486,8 +484,7 @@ impl EpubAssets {
pub fn save_to<T: AsRef<str>>(&mut self, file_path: T) -> IResult<()> {
let mut f: String = self._file_name.clone();
if self.reader.is_some() && !f.is_empty() {
let prefixs = ["", common::EPUB, common::EPUB3];
for prefix in prefixs.iter() {
for prefix in EpubHtml::PREFIXES.iter() {
let s = self.reader.as_mut().unwrap();
f = format!("{prefix}{}", self._file_name);
let d: Result<(), IError> = s
Expand Down
Loading