improved setting of modified time for root, there seems to be still a timezone issue, see GH #289

Author: wolpi

pftpd-pojo-lib/src/main/java/org/primftpd/pojo/LsOutputBean.java

@@ -33,6 +33,8 @@ public class LsOutputBean {
     private final String name;
     private final String linkTarget;
 
+    private final String originalLine;
+
     public LsOutputBean(String name) {
         this.exists = false;
         this.name = name;
@@ -56,6 +58,7 @@ public LsOutputBean(String name) {
         this.user = null;
         this.group = null;
         this.linkTarget = null;
+        this.originalLine = null;
     }
 
     public LsOutputBean(
@@ -78,7 +81,8 @@ public LsOutputBean(
             String user,
             String group,
             String name,
-            String linkTarget) {
+            String linkTarget,
+            String originalLine) {
         this.exists = true;
         this.isFile = isFile;
         this.isDir = isDir;
@@ -100,6 +104,7 @@ public LsOutputBean(
         this.group = group;
         this.name = name;
         this.linkTarget = linkTarget;
+        this.originalLine = originalLine;
     }
 
     public boolean isExists() {
@@ -185,4 +190,8 @@ public String getName() {
     public String getLinkTarget() {
         return linkTarget;
     }
+
+    public String getOriginalLine() {
+        return originalLine;
+    }
 }

pftpd-pojo-lib/src/main/java/org/primftpd/pojo/LsOutputBuilder.java

@@ -32,6 +32,8 @@ class LsOutputBuilder {
     private String name;
     private String linkTarget;
 
+    private String originalLine;
+
     public boolean isFile() {
         return isFile;
     }
@@ -192,6 +194,14 @@ public void setLinkTarget(String linkTarget) {
         this.linkTarget = linkTarget;
     }
 
+    public String getOriginalLine() {
+        return originalLine;
+    }
+
+    public void setOriginalLine(String originalLine) {
+        this.originalLine = originalLine;
+    }
+
     LsOutputBean build() {
         return new LsOutputBean(
                 isFile,
@@ -213,7 +223,8 @@ LsOutputBean build() {
                 user,
                 group,
                 name,
-                linkTarget
+                linkTarget,
+                originalLine
         );
     }
 }

pftpd-pojo-lib/src/main/java/org/primftpd/pojo/LsOutputParser.java

@@ -56,6 +56,7 @@ public LsOutputBean parseLine(String line) {
         }
 
         LsOutputBuilder builder = new LsOutputBuilder();
+        builder.setOriginalLine(line);
 
         // type
         if (firstPart.charAt(0) == '-') {

primitiveFTPd/src/org/primftpd/filesystem/RootFile.java

@@ -76,7 +76,14 @@ public boolean setLastModified(long time) {
         logger.trace("[{}] setLastModified({})", name, time);
 
         String dateStr = Utils.touchDate(time);
-        return runCommand("touch -t " + dateStr + " " + escapePath(absPath));
+        return runCommand("touch -m -t " + dateStr + " " + escapePath(absPath));
+    }
+
+    @Override
+    public long getLastModified() {
+        logger.trace("[{}] getLastModified()", name);
+        logger.trace("  original ls-output line: {}", bean.getOriginalLine());
+        return super.getLastModified();
     }
 
     public boolean mkdir() {

primitiveFTPd/src/org/primftpd/filesystem/Utils.java

@@ -4,7 +4,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.TimeZone;
+import java.util.SimpleTimeZone;
 
 class Utils {
 
@@ -68,13 +68,9 @@ static String parent(String path) {
 
     private static final DateFormat TOUCH_DATE_FORMAT = new SimpleDateFormat("yyMMddHHmm.ss");
     static {
-        TOUCH_DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+        TOUCH_DATE_FORMAT.setTimeZone(new SimpleTimeZone(0, "No-TZ"));
     }
     static String touchDate(long time) {
-        return TOUCH_DATE_FORMAT.format(sshTimeToFileTime(time));
-    }
-
-    static long sshTimeToFileTime(long time) {
-        return time * 1000;
+        return TOUCH_DATE_FORMAT.format(time);
     }
 }