Compare commits

..

No commits in common. "0b3938c13f4348590bfb0d2c5094a39fc7fcd212" and "f24453093225df10d67eef6639643dd23423acf9" have entirely different histories.

3 changed files with 10 additions and 34 deletions

View File

@ -11,26 +11,19 @@ mvn package
## run ## run
```shell ```shell
./target/dist/bin/bioformats-imageinfo "[OPTION]" "[path to image file]" ./target/dist/bin/bioformats-imageinfo "[path to image file]"
``` ```
### run by jar ### run by jar
```shell ```shell
java -jar ./target/dist/lib/bioformats-imageinfo-1.2.4.jar "[OPTION]" "[path to image file]" java -jar ./target/dist/lib/bioformats-imageinfo-1.2.3.jar "[path to image file]"
``` ```
### run by fat jar ### run by fat jar
```shell ```shell
java -jar ./target/bioformats-imageinfo-1.2.4-jar-with-dependencies.jar "[OPTION]" "[path to image file]" java -jar ./target/bioformats-imageinfo-1.2.3-jar-with-dependencies.jar "[path to image file]"
```
### OPTION
```shell
-M output metadata
-T output thumbnail
``` ```
## library usage ## library usage

View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>jp.riken.neurodata.tools.BioFormatsImageInfo</groupId> <groupId>jp.riken.neurodata.tools.BioFormatsImageInfo</groupId>
<artifactId>bioformats-imageinfo</artifactId> <artifactId>bioformats-imageinfo</artifactId>
<version>1.2.4</version> <version>1.2.3</version>
<name>bioformats-imageinfo</name> <name>bioformats-imageinfo</name>
<url>https://neurodata.riken.jp</url> <url>https://neurodata.riken.jp</url>

View File

@ -248,34 +248,17 @@ public class BioFormatsImageInfo {
boolean status = true; boolean status = true;
String message = ""; String message = "";
String format = ""; String format = "";
boolean metadataON = true;
boolean thumbnailON = true;
String path = "";
final Map<String, Object> metadata = new LinkedHashMap<String, Object>(); final Map<String, Object> metadata = new LinkedHashMap<String, Object>();
final Map<String, Object> thumbnail = new LinkedHashMap<String, Object>(); final Map<String, Object> thumbnail = new LinkedHashMap<String, Object>();
if (args.length == 1) { if (args.length != 1) {
path = args[0];
} else if (args.length == 2) {
if (args[0].startsWith("-")) {
metadataON = args[0].toUpperCase().contains("M");
thumbnailON = args[0].toUpperCase().contains("T");
}
path = args[1];
} else {
status = false; status = false;
message = "invalid parameters"; message = "filename argument required";
message += "\nUsage ./target/dist/bin/bioformats-imageinfo \"[OPTION]\" \"[path to image file]\""; } else {
message += "\n-M output metadata\n-T output thumbnail"; final String path = args[0];
}
if (status) {
try { try {
DebugTools.enableLogging("OFF"); DebugTools.enableLogging("OFF");
if (metadataON) { format = readMetadata(path, metadata);
format = readMetadata(path, metadata); BioFormatsImageThumbnail.readThumbnail(path, thumbnail);
}
if (thumbnailON) {
BioFormatsImageThumbnail.readThumbnail(path, thumbnail);
}
} catch (Throwable t) { } catch (Throwable t) {
status = false; status = false;
message = t.getMessage(); message = t.getMessage();