projects
/
meviz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated meviz to work with new commandline parsing API
[meviz.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
meviz
/
htmlindexer
/
FilesystemIndexer.java
diff --git
a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
index
c103b68
..
0edea71
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
+++ b/
src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
@@
-51,19
+51,19
@@
public class FilesystemIndexer extends AbstractIndexer {
private DirectoryMetadata metadata;
private DirectoryMetadata metadata;
- private final IndexingOptions indexingOptions;
-
private final List<String> pathElements;
private HashSet<Layout> layouts;
private final List<String> pathElements;
private HashSet<Layout> layouts;
+ private final CommandlineHandler commandlineHandler;
+
public FilesystemIndexer(final File directoryToIndex,
public FilesystemIndexer(final File directoryToIndex,
- final
IndexingOptions indexingOptions
,
+ final
CommandlineHandler commandlineHandler
,
final List<String> pathElements) throws IOException,
ImageFormatError {
this.directoryToIndex = directoryToIndex;
final List<String> pathElements) throws IOException,
ImageFormatError {
this.directoryToIndex = directoryToIndex;
- this.
indexingOptions = indexingOptions
;
+ this.
commandlineHandler = commandlineHandler
;
this.pathElements = pathElements;
if (!directoryToIndex.canRead())
this.pathElements = pathElements;
if (!directoryToIndex.canRead())
@@
-222,9
+222,11
@@
public class FilesystemIndexer extends AbstractIndexer {
layouts = new HashSet<Layout>();
layouts.add(new MixedLayout());
layouts = new HashSet<Layout>();
layouts.add(new MixedLayout());
+ final String galleryTitle = commandlineHandler.getGalleryTitle();
+
for (final Layout layout : layouts)
for (final Layout layout : layouts)
- layout.init(
indexingOptions.galleryTitle, pathElements, this,
-
new IndexingContext(
"", "."));
+ layout.init(
galleryTitle, pathElements, this, new IndexingContext(
+ "", "."));
}
public void initializeThumbnailsDirectory() {
}
public void initializeThumbnailsDirectory() {
@@
-264,7
+266,7
@@
public class FilesystemIndexer extends AbstractIndexer {
metadata.ensureFileMetainfoIsUpToDate(directoryToIndex, file);
if (file.isDirectory())
metadata.ensureFileMetainfoIsUpToDate(directoryToIndex, file);
if (file.isDirectory())
- new FilesystemIndexer(file,
indexingOptions
,
+ new FilesystemIndexer(file,
commandlineHandler
,
getChildPath(file));
}
}
getChildPath(file));
}
}