knut/album
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deal better with empty directories.

Browse source
This commit is contained in:
Knut Forkalsrud 2014-01-04 17:19:22 -08:00
parent 87429b018c
commit 322c86e3a2
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
View file

@ -182,7 +182,6 @@ public class DirectoryEntry extends EntryWithChildren<Entry> {
boolean hidden = Boolean.parseBoolean(props.getProperty("dir." + name + ".hidden")); boolean hidden = Boolean.parseBoolean(props.getProperty("dir." + name + ".hidden"));
if (!hidden) { if (!hidden) {
DirectoryEntry dir = new DirectoryEntry(services, this, new File(file, name)); DirectoryEntry dir = new DirectoryEntry(services, this, new File(file, name));
children.add(dir);
if (name != null && name.equals(coverFileName)) { if (name != null && name.equals(coverFileName)) {
setThumbnail(dir.getThumbnail()); setThumbnail(dir.getThumbnail());
} }
@ -191,6 +190,9 @@ public class DirectoryEntry extends EntryWithChildren<Entry> {
oldest = fileDate; oldest = fileDate;
} }
dir.setCaption(props.getProperty("dir." + name + ".caption")); dir.setCaption(props.getProperty("dir." + name + ".caption"));
if (!dir.getContents().isEmpty()) {
children.add(dir);
}
} }
} }
} }