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

unused code + linting

Browse source
This commit is contained in:
Knut Forkalsrud 2024-11-02 17:01:50 -07:00
parent 2b8f7e474a
commit 4e662b92ff
7 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/forkalsrud/album/editor/Editor.java
View file

@ -367,7 +367,7 @@ public class Editor
int findRegion(int ex, int ey) {
Rectangle r = roi.getScreenRectangle();
int c = 8;
int c;
if (within(ex, r.x + r.width)) {
if (within(ey, r.y + r.height)) {

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

@ -169,7 +169,7 @@ public class DirectoryEntry extends EntryWithChildren<Entry> {
boolean hidden = Boolean.parseBoolean(props.getProperty("file." + name + ".hidden"));
if (!hidden) {
children.add(entry);
if (name != null && name.equals(coverFileName)) {
if (name.equals(coverFileName)) {
setThumbnail(thumbnail);
}
}
@ -183,7 +183,7 @@ public class DirectoryEntry extends EntryWithChildren<Entry> {
boolean hidden = Boolean.parseBoolean(props.getProperty("dir." + name + ".hidden"));
if (!hidden) {
DirectoryEntry dir = new DirectoryEntry(services, this, new File(file, name));
if (name != null && name.equals(coverFileName)) {
if (name.equals(coverFileName)) {
setThumbnail(dir.getThumbnail());
}
Date fileDate = dir.getEarliest();

31
src/main/java/org/forkalsrud/album/exif/DirectoryMetadataGenerator.java
View file

@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory;
import com.drew.metadata.Directory;
import com.drew.metadata.Metadata;
import com.drew.metadata.MetadataException;
import com.drew.metadata.exif.ExifIFD0Directory;
import com.drew.metadata.exif.ExifSubIFDDirectory;
import com.drew.metadata.jpeg.JpegDirectory;
@ -60,6 +59,9 @@ public class DirectoryMetadataGenerator {
private void generateFileEntries(File dir, Properties props) throws IOException, InterruptedException {
File[] files = dir.listFiles();
if (files == null) {
return;
}
for (File f : files) {
if (f.length() == 0) {
@ -134,8 +136,6 @@ public class DirectoryMetadataGenerator {
boolean hasOrientation = false;
boolean hasDim = false;
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd-HHmmss");
NumberFormat nf = new DecimalFormat("0");
Metadata metadata;
try {
@ -208,7 +208,7 @@ public class DirectoryMetadataGenerator {
}
private Date getExifDate(Directory exifDirectory, int tagName) throws MetadataException {
private Date getExifDate(Directory exifDirectory, int tagName) {
String dateStr = exifDirectory.getString(tagName);
if (" : : : : ".equals(dateStr)) {
@ -219,16 +219,10 @@ public class DirectoryMetadataGenerator {
private Dimension decodeImageForDimensions(File file) throws IOException {
String suffix = null;
String name = file.getName();
if (name.indexOf('.') > 0) {
suffix = name.substring(name.lastIndexOf('.') + 1);
}
Iterator<ImageReader> readers = ImageIO.getImageReadersBySuffix(suffix);
if (!readers.hasNext()) {
ImageReader reader = getImageReader(file);
if (reader == null) {
return null;
}
ImageReader reader = readers.next();
ImageInputStream iis = ImageIO.createImageInputStream(file);
reader.setInput(iis, true);
ImageReadParam param = reader.getDefaultReadParam();
@ -237,6 +231,19 @@ public class DirectoryMetadataGenerator {
return new Dimension(img.getWidth(), img.getHeight());
}
private ImageReader getImageReader(File file) {
String name = file.getName();
if (name.indexOf('.') < 0) {
return null;
}
String suffix = name.substring(name.lastIndexOf('.') + 1);
Iterator<ImageReader> readers = ImageIO.getImageReadersBySuffix(suffix);
if (!readers.hasNext()) {
return null;
}
ImageReader reader = readers.next();
return reader;
}
private Map<String, String> generatePdfProperties(File file) throws IOException {

2
src/main/java/org/forkalsrud/album/exif/EntryWithChildren.java
View file

@ -13,7 +13,7 @@ import java.util.List;
*/
public class EntryWithChildren<T extends Entry> extends Entry {
protected List<T> children = new ArrayList<T>();
protected List<T> children = new ArrayList<>();
protected EntryWithChildren(Entry root) {
super(root);

2
src/main/java/org/forkalsrud/album/video/FlvMetadata.java
View file

@ -474,7 +474,7 @@ public class FlvMetadata {
seconds += 3600 * Double.parseDouble(durationStr.substring(0, pm));
}
setDuration(seconds);
} else {
} else if (durationStr != null) {
setDuration(Double.parseDouble(durationStr));
}
}

21
src/main/java/org/forkalsrud/album/web/AlbumServlet.java
View file

@ -608,14 +608,20 @@ public class AlbumServlet
// help the user get to the top level page
if (pathInfo == null || "/".equals(pathInfo)) {
Root root = roots.values().stream().findFirst().orElse(null);
String u = req.getContextPath() + "/album/" + root.getName() + ".album";
res.sendRedirect(u);
return;
String rootPath = roots.values().stream()
.findFirst()
.map(r -> req.getContextPath() + "/album/" + r.getName() + ".album")
.orElse(null);
if (rootPath != null) {
res.sendRedirect(rootPath);
} else {
res.setStatus(404);
}
return;
}
if ("/_roots.json".equals(pathInfo)) {
res.setContentType("application/json");
res.setContentType("application/json");
res.setCharacterEncoding("UTF-8");
ObjectMapper json = new ObjectMapper();
@ -700,8 +706,9 @@ public class AlbumServlet
}
String size = req.getParameter("size");
if (size != null) {
if ("max".equals(size)) {
getServletContext().getNamedDispatcher("file").forward(req, res);
} else if (size != null) {
FileEntry e = (FileEntry)root.resolve(file);
root.procesScaledImageRequest(req, res, file, e.getThumbnail(), size);
return;

22
src/main/java/org/forkalsrud/album/web/PictureScaler.java
View file

@ -7,7 +7,6 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.concurrent.BlockingQueue;
@ -26,10 +25,7 @@ import javax.imageio.ImageWriter;
import javax.imageio.stream.ImageOutputStream;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSDocument;
import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
import org.apache.pdfbox.io.RandomAccessReadMemoryMappedFile;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
@ -47,9 +43,10 @@ public class PictureScaler {
public PictureScaler() {
queue = new PriorityBlockingQueue<PictureRequest>(20, createPriorityComparator());
queue = new PriorityBlockingQueue<>(20, (o1, o2) -> Long.signum(o1.priority - o2.priority));
executor = Executors.newFixedThreadPool(4);
outstandingRequests = new HashMap<String, PictureRequest>();
outstandingRequests = new HashMap<>();
}
@ -119,19 +116,8 @@ public class PictureScaler {
}
}
Comparator<PictureRequest> createPriorityComparator() {
return new Comparator<PictureRequest>() {
@Override
public int compare(PictureRequest o1, PictureRequest o2) {
return Long.signum(o1.priority - o2.priority);
}
};
}
public CachedImage scalePicture(File file, Thumbnail thumbnail, String size) {
public CachedImage scalePicture(File file, Thumbnail thumbnail, String size) {
String key = file.getPath() + ":" + size;
return scalePicture(key, file, thumbnail, size);
}