@@ -14,7 +14,7 @@ This will index a pushshift.io dump from the Reddit API into index.
{{name}}{{#if directory}}/{{/if}}
{{#unless directory}}{{size}}{{/unless}}
-
{{lastModifiedTime}}
+
{{shortTimestamp lastModifiedTime}}
{{/each}}
{{#unless uploadDirContents.items}}
diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-stackexchange.hdb b/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-stackexchange.hdb
index 8297ae68..f5f73f84 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-stackexchange.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-stackexchange.hdb
@@ -18,7 +18,7 @@ information how to do this.
{{name}}{{#if directory}}/{{/if}}
{{#unless directory}}{{size}}{{/unless}}
-
{{lastModifiedTime}}
+
{{shortTimestamp lastModifiedTime}}
{{/each}}
{{#unless uploadDirContents.items}}
diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-warc.hdb b/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-warc.hdb
index 7871ca54..7680b7b8 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-warc.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-warc.hdb
@@ -17,7 +17,7 @@ A warc export can be created using e.g. wget:
{{name}}{{#if directory}}/{{/if}}
{{#unless directory}}{{size}}{{/unless}}
-
{{lastModifiedTime}}
+
{{shortTimestamp lastModifiedTime}}
{{/each}}
{{#unless uploadDirContents.items}}
diff --git a/code/services-core/executor-service/src/main/java/nu/marginalia/executor/svc/SideloadService.java b/code/services-core/executor-service/src/main/java/nu/marginalia/executor/svc/SideloadService.java
index eae236c6..136b6f1d 100644
--- a/code/services-core/executor-service/src/main/java/nu/marginalia/executor/svc/SideloadService.java
+++ b/code/services-core/executor-service/src/main/java/nu/marginalia/executor/svc/SideloadService.java
@@ -16,6 +16,7 @@ import java.nio.file.Path;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
public class SideloadService {
private final ExecutorActorControlService actorControlService;
@@ -61,7 +62,10 @@ public class SideloadService {
public RpcUploadDirContents listUploadDir() throws IOException {
Path uploadDir = WmsaHome.getUploadDir();
- try (var items = Files.list(uploadDir)) {
+ try (var items = Files.list(uploadDir).sorted(
+ Comparator.comparing((Path d) -> Files.isDirectory(d)).reversed()
+ .thenComparing(path -> path.getFileName().toString())
+ )) {
var builder = RpcUploadDirContents.newBuilder().setPath(uploadDir.toString());
var iter = items.iterator();