projects
/
meviz.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
631a59f
)
Code refactoring. Generate image thumbnails with same extension as original image.
author
Svjatoslav Agejenko
<svjatoslav@svjatoslav.eu>
Sun, 5 Jan 2020 15:56:44 +0000
(17:56 +0200)
committer
Svjatoslav Agejenko
<svjatoslav@svjatoslav.eu>
Sun, 5 Jan 2020 15:56:44 +0000
(17:56 +0200)
src/main/java/eu/svjatoslav/meviz/htmlindexer/indexer/FilesystemIndexer.java
patch
|
blob
|
history
src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java
patch
|
blob
|
history
diff --git
a/src/main/java/eu/svjatoslav/meviz/htmlindexer/indexer/FilesystemIndexer.java
b/src/main/java/eu/svjatoslav/meviz/htmlindexer/indexer/FilesystemIndexer.java
index
6add6be
..
a26f157
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/meviz/htmlindexer/indexer/FilesystemIndexer.java
+++ b/
src/main/java/eu/svjatoslav/meviz/htmlindexer/indexer/FilesystemIndexer.java
@@
-25,6
+25,11
@@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.HashSet;
import java.util.List;
+import static eu.svjatoslav.meviz.htmlindexer.Constants.THUMBNAILS_DIRECTORY_NAME;
+import static eu.svjatoslav.meviz.htmlindexer.Utils.getThumbnailsDirectoryPath;
+import static eu.svjatoslav.meviz.htmlindexer.Utils.urlEncode;
+import static eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture.makeThumbnail;
+
/**
* Main class of HTML indexer.
*/
/**
* Main class of HTML indexer.
*/
@@
-83,7
+88,6
@@
public class FilesystemIndexer extends AbstractIndexer {
}
private void generateHtmlFromMetadata(final HashSet<Layout> layouts) {
}
private void generateHtmlFromMetadata(final HashSet<Layout> layouts) {
- // Generate HTML from metadata
for (final Layout layout : layouts)
try {
final File indexFile = Utils.getLayoutIndexFile(layout,
for (final Layout layout : layouts)
try {
final File indexFile = Utils.getLayoutIndexFile(layout,
@@
-113,7
+117,7
@@
public class FilesystemIndexer extends AbstractIndexer {
@Override
public String getDirectoryUrl(final AbstractFile directory,
final IndexingContext context) {
@Override
public String getDirectoryUrl(final AbstractFile directory,
final IndexingContext context) {
- return
Utils.
urlEncode(directory.fileName) + "/index.html";
+ return urlEncode(directory.fileName) + "/index.html";
}
@Override
}
@Override
@@
-135,20
+139,16
@@
public class FilesystemIndexer extends AbstractIndexer {
validMetadataFiles.add(thumbnailFileName);
final File thumbnailFile = new File(
validMetadataFiles.add(thumbnailFileName);
final File thumbnailFile = new File(
- Utils.getThumbnailsDirectoryPath(directoryToIndex)
- + thumbnailFileName);
+ getThumbnailsDirectoryPath(directoryToIndex) + thumbnailFileName);
if (!thumbnailFile.exists()) {
final File originalFile = new File(
directoryToIndex.getAbsolutePath() + "/" + picture.fileName);
if (!thumbnailFile.exists()) {
final File originalFile = new File(
directoryToIndex.getAbsolutePath() + "/" + picture.fileName);
- // generate new thumbnail
- Picture.makeThumbnail(originalFile, thumbnailFile,
- desiredDimension.getAwtDimension());
+ makeThumbnail(originalFile, thumbnailFile, desiredDimension.getAwtDimension());
}
}
- return Constants.THUMBNAILS_DIRECTORY_NAME + "/"
- + Utils.urlEncode(thumbnailFileName);
+ return THUMBNAILS_DIRECTORY_NAME + "/" + urlEncode(thumbnailFileName);
}
private void initializeLayouts() {
}
private void initializeLayouts() {
@@
-173,7
+173,7
@@
public class FilesystemIndexer extends AbstractIndexer {
private void loadOrCreateMetadata() {
metadataFile = new File(
private void loadOrCreateMetadata() {
metadataFile = new File(
-
Utils.
getThumbnailsDirectoryPath(directoryToIndex)
+ getThumbnailsDirectoryPath(directoryToIndex)
+ Constants.METADATA_FILE_NAME);
metadata = MetadadaHelper.initDirectoryMetadata(metadataFile);
+ Constants.METADATA_FILE_NAME);
metadata = MetadadaHelper.initDirectoryMetadata(metadataFile);
diff --git
a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java
b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java
index
ae22071
..
9f35743
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java
+++ b/
src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java
@@
-28,6
+28,7
@@
import java.util.ArrayList;
import java.util.List;
import static eu.svjatoslav.meviz.htmlindexer.Utils.getBufferedImage;
import java.util.List;
import static eu.svjatoslav.meviz.htmlindexer.Utils.getBufferedImage;
+import static java.awt.image.BufferedImage.TYPE_INT_RGB;
public class Picture extends AbstractFile {
public class Picture extends AbstractFile {
@@
-122,7
+123,7
@@
public class Picture extends AbstractFile {
final BufferedImage bufferedImage = new BufferedImage(
scaledImage.getWidth(null), scaledImage.getHeight(null),
final BufferedImage bufferedImage = new BufferedImage(
scaledImage.getWidth(null), scaledImage.getHeight(null),
-
BufferedImage.
TYPE_INT_RGB);
+ TYPE_INT_RGB);
final Graphics2D g = bufferedImage.createGraphics();
g.drawImage(scaledImage, 0, 0, null);
final Graphics2D g = bufferedImage.createGraphics();
g.drawImage(scaledImage, 0, 0, null);
@@
-158,9
+159,9
@@
public class Picture extends AbstractFile {
// compute new thumbnails hash number
final String forMagicHash = fileName + " "
// compute new thumbnails hash number
final String forMagicHash = fileName + " "
- +
String.valueOf(targetDimension.width)
+ " "
- +
String.valueOf(targetDimension.height)
+ " "
- +
String.valueOf(getFileLength()
) + " "
+ +
targetDimension.width
+ " "
+ +
targetDimension.height
+ " "
+ +
getFileLength(
) + " "
+ Constants.THUMBNAIL_VERSION;
// System.out.println("Computing hash from: " + forMagicHash);
+ Constants.THUMBNAIL_VERSION;
// System.out.println("Computing hash from: " + forMagicHash);
@@
-177,7
+178,7
@@
public class Picture extends AbstractFile {
*/
public String getRelativeThumbnailFileName(final Dimension targetDimension) {
return FilePathParser.getFileNameWithoutExtension(fileName) + " ("
*/
public String getRelativeThumbnailFileName(final Dimension targetDimension) {
return FilePathParser.getFileNameWithoutExtension(fileName) + " ("
- + computeThumbnailHash(targetDimension) + ").
jpeg"
;
+ + computeThumbnailHash(targetDimension) + ").
" + getFileExtension()
;
}
@Override
}
@Override