From 9148edc7cfe963228755199ac8dd6886aff075ce Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 6 Jan 2021 19:05:10 +0200 Subject: [PATCH] Add sort by date and size --- .../annimon/imagetagger/logic/ImageProcessor.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/annimon/imagetagger/logic/ImageProcessor.java b/src/main/java/com/annimon/imagetagger/logic/ImageProcessor.java index 2f15efe..65ae75f 100644 --- a/src/main/java/com/annimon/imagetagger/logic/ImageProcessor.java +++ b/src/main/java/com/annimon/imagetagger/logic/ImageProcessor.java @@ -147,14 +147,16 @@ public class ImageProcessor { } private void sort(List infos) { - if (sort.contains("name")) { - infos.sort(Comparator.comparing(ImageInfo::getFile)); - } - if (sort.contains("tags.count")) { - infos.sort(Comparator.comparingInt(ImageInfo::getTagsCount)); - } if (sort.contains("random")) { Collections.shuffle(infos); + } else if (sort.contains("name")) { + infos.sort(Comparator.comparing(ImageInfo::getFile)); + } else if (sort.contains("date")) { + infos.sort(Comparator.comparingLong(i -> i.getFile().lastModified())); + } else if (sort.contains("size")) { + infos.sort(Comparator.comparingLong(i -> i.getFile().length())); + } else if (sort.contains("tags.count")) { + infos.sort(Comparator.comparingInt(ImageInfo::getTagsCount)); } } }