git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Android compatibility
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
library
/
LocalLibrary.java
diff --git
a/src/be/nikiroo/fanfix/library/LocalLibrary.java
b/src/be/nikiroo/fanfix/library/LocalLibrary.java
index 11c36630adcef96ea73d17c8712d84495260299a..041db1013dbf85bfd0a41112676dcc6e4f31c055 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/LocalLibrary.java
+++ b/
src/be/nikiroo/fanfix/library/LocalLibrary.java
@@
-1,6
+1,5
@@
package be.nikiroo.fanfix.library;
package be.nikiroo.fanfix.library;
-import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
@@
-11,8
+10,6
@@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.List;
import java.util.Map;
-import javax.imageio.ImageIO;
-
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.data.MetaData;
@@
-22,7
+19,7
@@
import be.nikiroo.fanfix.output.BasicOutput.OutputType;
import be.nikiroo.fanfix.output.InfoCover;
import be.nikiroo.fanfix.supported.InfoReader;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.fanfix.output.InfoCover;
import be.nikiroo.fanfix.supported.InfoReader;
import be.nikiroo.utils.IOUtils;
-import be.nikiroo.utils.Image
Utils
;
+import be.nikiroo.utils.Image;
import be.nikiroo.utils.MarkableFileInputStream;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.MarkableFileInputStream;
import be.nikiroo.utils.Progress;
@@
-34,7
+31,7
@@
import be.nikiroo.utils.Progress;
public class LocalLibrary extends BasicLibrary {
private int lastId;
private Map<MetaData, File[]> stories; // Files: [ infoFile, TargetFile ]
public class LocalLibrary extends BasicLibrary {
private int lastId;
private Map<MetaData, File[]> stories; // Files: [ infoFile, TargetFile ]
- private Map<String,
Buffered
Image> sourceCovers;
+ private Map<String, Image> sourceCovers;
private File baseDir;
private OutputType text;
private File baseDir;
private OutputType text;
@@
-90,7
+87,7
@@
public class LocalLibrary extends BasicLibrary {
this.lastId = 0;
this.stories = null;
this.lastId = 0;
this.stories = null;
- this.sourceCovers = new HashMap<String,
Buffered
Image>();
+ this.sourceCovers = new HashMap<String, Image>();
baseDir.mkdirs();
}
baseDir.mkdirs();
}
@@
-111,7
+108,7
@@
public class LocalLibrary extends BasicLibrary {
}
@Override
}
@Override
- public
Buffered
Image getCover(String luid) {
+ public Image getCover(String luid) {
MetaData meta = getInfo(luid);
if (meta != null) {
File[] files = getStories(null).get(meta);
MetaData meta = getInfo(luid);
if (meta != null) {
File[] files = getStories(null).get(meta);
@@
-122,7
+119,7
@@
public class LocalLibrary extends BasicLibrary {
meta = InfoReader.readMeta(infoFile, true);
return meta.getCover();
} catch (IOException e) {
meta = InfoReader.readMeta(infoFile, true);
return meta.getCover();
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
}
}
}
}
}
}
@@
-131,9
+128,9
@@
public class LocalLibrary extends BasicLibrary {
}
@Override
}
@Override
- protected void
clearCache(
) {
+ protected void
invalidateInfo(String luid
) {
stories = null;
stories = null;
- sourceCovers = new HashMap<String,
Buffered
Image>();
+ sourceCovers = new HashMap<String, Image>();
}
@Override
}
@Override
@@
-147,6
+144,7
@@
public class LocalLibrary extends BasicLibrary {
for (File file : getRelatedFiles(luid)) {
// TODO: throw an IOException if we cannot delete the files?
IOUtils.deltree(file);
for (File file : getRelatedFiles(luid)) {
// TODO: throw an IOException if we cannot delete the files?
IOUtils.deltree(file);
+ file.getParentFile().delete();
}
}
}
}
@@
-157,7
+155,7
@@
public class LocalLibrary extends BasicLibrary {
File expectedTarget = getExpectedFile(meta);
expectedTarget.getParentFile().mkdirs();
File expectedTarget = getExpectedFile(meta);
expectedTarget.getParentFile().mkdirs();
- BasicOutput it = BasicOutput.getOutput(getOutputType(meta), true);
+ BasicOutput it = BasicOutput.getOutput(getOutputType(meta), true
, true
);
it.process(story, expectedTarget.getPath(), pg);
return story;
it.process(story, expectedTarget.getPath(), pg);
return story;
@@
-182,19
+180,21
@@
public class LocalLibrary extends BasicLibrary {
"\\.info$", "");
InfoCover.writeInfo(newDir, name, meta);
relatedFile.delete();
"\\.info$", "");
InfoCover.writeInfo(newDir, name, meta);
relatedFile.delete();
+ relatedFile.getParentFile().delete();
} catch (IOException e) {
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
}
} else {
relatedFile.renameTo(new File(newDir, relatedFile.getName()));
}
} else {
relatedFile.renameTo(new File(newDir, relatedFile.getName()));
+ relatedFile.getParentFile().delete();
}
}
}
}
-
clearCache
();
+
invalidateInfo
();
}
@Override
}
@Override
- public
Buffered
Image getSourceCover(String source) {
+ public Image getSourceCover(String source) {
if (!sourceCovers.containsKey(source)) {
sourceCovers.put(source, super.getSourceCover(source));
}
if (!sourceCovers.containsKey(source)) {
sourceCovers.put(source, super.getSourceCover(source));
}
@@
-207,9
+207,10
@@
public class LocalLibrary extends BasicLibrary {
sourceCovers.put(source, getCover(luid));
File cover = new File(getExpectedDir(source), ".cover.png");
try {
sourceCovers.put(source, getCover(luid));
File cover = new File(getExpectedDir(source), ".cover.png");
try {
- ImageIO.write(sourceCovers.get(source), "png", cover);
+ Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
+ true);
} catch (IOException e) {
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
sourceCovers.remove(source);
}
}
sourceCovers.remove(source);
}
}
@@
-261,7
+262,7
@@
public class LocalLibrary extends BasicLibrary {
pg.add(1);
}
pg.add(1);
}
-
clearCache
();
+
invalidateInfo
();
pg.done();
return;
}
pg.done();
return;
}
@@
-269,7
+270,7
@@
public class LocalLibrary extends BasicLibrary {
super.imprt(other, luid, pg);
super.imprt(other, luid, pg);
-
clearCache
();
+
invalidateInfo
();
}
/**
}
/**
@@
-383,7
+384,8
@@
public class LocalLibrary extends BasicLibrary {
}
String coverExt = "."
}
String coverExt = "."
- + Instance.getConfig().getString(Config.IMAGE_FORMAT_COVER);
+ + Instance.getConfig().getString(Config.IMAGE_FORMAT_COVER)
+ .toLowerCase();
File coverFile = new File(path + coverExt);
if (!coverFile.exists()) {
coverFile = new File(path.substring(0,
File coverFile = new File(path + coverExt);
if (!coverFile.exists()) {
coverFile = new File(path.substring(0,
@@
-403,7
+405,7
@@
public class LocalLibrary extends BasicLibrary {
* {@link LocalLibrary#baseDir}.
* <p>
* Will use a cached list when possible (see
* {@link LocalLibrary#baseDir}.
* <p>
* Will use a cached list when possible (see
- * {@link BasicLibrary#
clearCache
()}).
+ * {@link BasicLibrary#
invalidateInfo
()}).
*
* @param pg
* the optional {@link Progress}
*
* @param pg
* the optional {@link Progress}
@@
-472,8
+474,10
@@
public class LocalLibrary extends BasicLibrary {
} catch (IOException e) {
// We should not have not-supported files in the
// library
} catch (IOException e) {
// We should not have not-supported files in the
// library
- Instance.syserr(new IOException(
- "Cannot load file from library: " + infoFile, e));
+ Instance.getTraceHandler().error(
+ new IOException(
+ "Cannot load file from library: "
+ + infoFile, e));
}
pgFiles.add(1);
}
}
pgFiles.add(1);
}
@@
-481,15
+485,14
@@
public class LocalLibrary extends BasicLibrary {
File cover = new File(dir, ".cover.png");
if (cover.exists()) {
try {
File cover = new File(dir, ".cover.png");
if (cover.exists()) {
try {
- InputStream in = new MarkableFileInputStream(
- new FileInputStream(cover));
+ InputStream in = new FileInputStream(cover);
try {
try {
- sourceCovers.put(source,
ImageUtils.fromStream
(in));
+ sourceCovers.put(source,
new Image
(in));
} finally {
in.close();
}
} catch (IOException e) {
} finally {
in.close();
}
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
}
}
}
}
@@
-510,13
+513,14
@@
public class LocalLibrary extends BasicLibrary {
* @param coverImage
* the cover image
*/
* @param coverImage
* the cover image
*/
- void setSourceCover(String source,
Buffered
Image coverImage) {
+ void setSourceCover(String source, Image coverImage) {
sourceCovers.put(source, coverImage);
File cover = new File(getExpectedDir(source), ".cover.png");
try {
sourceCovers.put(source, coverImage);
File cover = new File(getExpectedDir(source), ".cover.png");
try {
- ImageIO.write(sourceCovers.get(source), "png", cover);
+ Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
+ true);
} catch (IOException e) {
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
sourceCovers.remove(source);
}
}
sourceCovers.remove(source);
}
}