X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FEpub.java;h=6cfe4f3d38de3b26b6b4392e1d55fedfb82a32c2;hb=57f02339393c9997391b76ffcb22ae72fd0a45cb;hp=437197a5a66cb12cee19a05ef192e9d35622494d;hpb=595dfa7a6a1dc8041b3a5a4fe7ee2fae89029a69;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/supported/Epub.java b/src/be/nikiroo/fanfix/supported/Epub.java index 437197a..6cfe4f3 100644 --- a/src/be/nikiroo/fanfix/supported/Epub.java +++ b/src/be/nikiroo/fanfix/supported/Epub.java @@ -16,6 +16,7 @@ import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.utils.IOUtils; import be.nikiroo.utils.MarkableFileInputStream; +import be.nikiroo.utils.Progress; /** * Support class for EPUB files created with this program (as we need some @@ -60,22 +61,22 @@ class Epub extends InfoText { } @Override - protected List> getChapters(URL source, InputStream in) - throws IOException { + protected List> getChapters(URL source, InputStream in, + Progress pg) throws IOException { if (fakeIn != null) { fakeIn.reset(); - return super.getChapters(fakeSource, fakeIn); + return super.getChapters(fakeSource, fakeIn, pg); } return null; } @Override - protected String getChapterContent(URL source, InputStream in, int number) - throws IOException { + protected String getChapterContent(URL source, InputStream in, int number, + Progress pg) throws IOException { if (fakeIn != null) { fakeIn.reset(); - return super.getChapterContent(fakeSource, fakeIn, number); + return super.getChapterContent(fakeSource, fakeIn, number, pg); } return null; @@ -139,7 +140,7 @@ class Epub extends InfoText { } if (tmpInfo.exists()) { - meta = InfoReader.readMeta(tmpInfo); + meta = InfoReader.readMeta(tmpInfo, true); if (cover != null) { meta.setCover(cover); }