projects
/
meviz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
on modern linux, media has directory for every user
[meviz.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
meviz
/
htmlindexer
/
metadata
/
DirectoryMetadata.java
diff --git
a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
index
110f2bd
..
5c560b0
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
+++ b/
src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
@@
-57,7
+57,7
@@
public class DirectoryMetadata implements Serializable {
}
public void ensureFileMetainfoIsUpToDate(final File parentDirectory,
}
public void ensureFileMetainfoIsUpToDate(final File parentDirectory,
- final File file) throws
IOException, ImageFormatError
{
+ final File file) throws
Exception
{
final String fileName = file.getName();
final String fileName = file.getName();
@@
-73,8
+73,7
@@
public class DirectoryMetadata implements Serializable {
}
private AbstractFile getAbstractFile(final File parentDirectory,
}
private AbstractFile getAbstractFile(final File parentDirectory,
- final File file, final String fileName) throws IOException,
- ImageFormatError {
+ final File file, final String fileName) throws Exception {
if (file.isDirectory())
return new DirectoryFile(parentDirectory, fileName);
if (file.isDirectory())
return new DirectoryFile(parentDirectory, fileName);
@@
-83,7
+82,12
@@
public class DirectoryMetadata implements Serializable {
.toLowerCase();
if (AbstractIndexer.isImage(fileExtension))
.toLowerCase();
if (AbstractIndexer.isImage(fileExtension))
- return new Picture(parentDirectory, fileName);
+ try {
+ return new Picture(parentDirectory, fileName);
+ } catch (final Exception exception) {
+ // in case image decoding failed, handle image as general file
+ return new GeneralFile(parentDirectory, fileName);
+ }
if (fileExtension.equals("meviz"))
return new MevizSpecialFile(parentDirectory, fileName);
if (fileExtension.equals("meviz"))
return new MevizSpecialFile(parentDirectory, fileName);
@@
-112,7
+116,7
@@
public class DirectoryMetadata implements Serializable {
}
public AbstractFile registerFile(final File parentDirectory, final File file)
}
public AbstractFile registerFile(final File parentDirectory, final File file)
- throws
IOException, ImageFormatError
{
+ throws
Exception
{
final String fileName = file.getName();
final String fileName = file.getName();