pom.xml

@@ -90,6 +90,7 @@
 									<value>${project.version}</value>
 								</replacement>
 								<replacement>
+									<!--suppress UnresolvedMavenProperty -->
 									<token>@BUILD_TIME@</token>
 									<value>${maven.build.timestamp}</value>
 								</replacement>
@@ -183,7 +184,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.8</version>
+						<version>3.1.0</version>
 						<dependencies>
 							<dependency>
 								<groupId>org.apache.ant</groupId>

src/main/java/unimelb/mf/client/session/DefaultMFAHandler.java

+package unimelb.mf.client.session;
+
+//import arc.mf.client.MultiFactorAuthenticationHandler;
+
+public class DefaultMFAHandler /* implements MultiFactorAuthenticationHandler */ {
+
+    /**
+     * Indicates the server has requested multi-factor verification.
+     *
+     * @param deviceModel         The model of the device the notification was sent to.
+     * @param deviceName          The name of the device the notification was sent to.
+     * @param remainingTimeInSecs The amount of time remaining in seconds before the notification request expires.
+     */
+    public void requestedMultiFactor(String deviceModel, String deviceName, long remainingTimeInSecs) {
+        System.out.printf("Sent notification to %s[%s]%n", deviceName, deviceModel);
+        System.out.printf("Remaining %03d seconds%n", remainingTimeInSecs);
+    }
+
+    /**
+     * Indicates that user has not yet responded to the request for verification.
+     *
+     * @param requestAtTime       The time (UTC) that the request was generated.
+     * @param remainingTimeInSecs The amount of time remaining in seconds before the notification request expires.
+     */
+    public void multifactorIsStillWaiting(long requestAtTime, long remainingTimeInSecs) {
+        System.out.printf("\rRemaining %03d seconds", remainingTimeInSecs);
+    }
+
+    /**
+     * Indicates the system is no longer waiting for multi-factor authentication - typically it was successful.
+     */
+    public void multifactorIsNoLongerWaiting() {
+        System.out.println("\r\r");
+    }
+}

src/main/java/unimelb/mf/client/sync/cli/MFDownload.java

@@ -61,9 +61,9 @@ public class MFDownload extends MFSyncApp {
         System.out.println("    --no-cluster-io                           Disable cluster I/O if applicable.");
 
         System.out.println("    -o, --out <dst-dir>                       The output/destination directory.");
-        System.out.println("    --overwrite                               Overwrite if the dst file exists.");
+        System.out.println("    --overwrite                               Overwrite if the destination file exists but has a different size.");
         System.out.println("    --unarchive                               Extract Arcitecta .aar files.");
-        System.out.println("    --csum-check                              Files are equated if the name and size are the same. In addition, with this argument, you can optionally compute the CRC32 checksumk to decide if two files are the same.");
+        System.out.println("    --csum-check                              Generate the CRC32 checksum during the file download and compare it with the remote checksum after the download is complete. If both the --csum-check and --overwrite options are enabled, local files will be overwritten even if their sizes match the remote files.");
         System.out.println("    --no-symlinks                             Do not restore symbolic links. If not specified, it will try to create (restore) symbolic links. Note: creating symbolic links works only the platforms that support symbolic links, such as Linux or MacOS.");
         System.out.println("    --nb-queriers <n>                         Number of query threads. Defaults to " + unimelb.mf.client.sync.settings.Settings.DEFAULT_NUM_OF_QUERIERS + ". Maximum is " + Settings.MAX_NUM_OF_QUERIERS);
         System.out.println("    --nb-workers <n>                          Number of concurrent worker threads to download data. Defaults to " + unimelb.mf.client.sync.settings.Settings.DEFAULT_NUM_OF_WORKERS + ". Maximum is " + Settings.MAX_NUM_OF_WORKERS);

src/main/java/unimelb/mf/client/sync/task/AssetDownloadTask.java

@@ -28,7 +28,6 @@ import arc.xml.XmlDoc.Element;
 import arc.xml.XmlStringWriter;
 import unimelb.io.ProgressMonitorInputStream;
 import unimelb.mf.client.archive.MFArchive;
-import unimelb.mf.client.file.PosixAttributes;
 import unimelb.mf.client.session.MFOutputConsumer;
 import unimelb.mf.client.session.MFSession;
 import unimelb.mf.client.sync.settings.PathTransformer;
@@ -358,13 +357,11 @@ public class AssetDownloadTask extends AbstractMFTask {
                         return;
                     }
                 } else {
-                    PosixAttributes fileAttrs = PosixAttributes.read(file);
                     long fileSize = Files.size(file);
-                    long assetPosixMTime = ae.longValue("content/time/@millisec", -1);
-                    if (fileSize == assetContentSize && assetPosixMTime > 0 && assetPosixMTime == fileAttrs.mtime()) {
+                    if (fileSize == assetContentSize && !csumCheck) {
                         dl.transferSkipped(assetPath, file);
                         logger.info("Skipped asset " + assetId + ": '" + assetPath
-                                + "' Destination file already exists. Both file sizes and mtimes match.");
+                                + "' Destination file already exists and file sizes are match.");
                         return;
                     }
                 }

src/main/java/unimelb/utils/AnsiColors.java

+package unimelb.utils;
+
+public class AnsiColors {
+
+	// Reset
+	public static final String RESET = "\033[0m"; // Text Reset
+
+	// Regular Colors
+	public static final String BLACK = "\033[0;30m"; // BLACK
+	public static final String RED = "\033[0;31m"; // RED
+	public static final String GREEN = "\033[0;32m"; // GREEN
+	public static final String YELLOW = "\033[0;33m"; // YELLOW
+	public static final String BLUE = "\033[0;34m"; // BLUE
+	public static final String PURPLE = "\033[0;35m"; // PURPLE
+	public static final String CYAN = "\033[0;36m"; // CYAN
+	public static final String WHITE = "\033[0;37m"; // WHITE
+
+	// Bold
+	public static final String BLACK_BOLD = "\033[1;30m"; // BLACK
+	public static final String RED_BOLD = "\033[1;31m"; // RED
+	public static final String GREEN_BOLD = "\033[1;32m"; // GREEN
+	public static final String YELLOW_BOLD = "\033[1;33m"; // YELLOW
+	public static final String BLUE_BOLD = "\033[1;34m"; // BLUE
+	public static final String PURPLE_BOLD = "\033[1;35m"; // PURPLE
+	public static final String CYAN_BOLD = "\033[1;36m"; // CYAN
+	public static final String WHITE_BOLD = "\033[1;37m"; // WHITE
+
+	// Underline
+	public static final String BLACK_UNDERLINED = "\033[4;30m"; // BLACK
+	public static final String RED_UNDERLINED = "\033[4;31m"; // RED
+	public static final String GREEN_UNDERLINED = "\033[4;32m"; // GREEN
+	public static final String YELLOW_UNDERLINED = "\033[4;33m"; // YELLOW
+	public static final String BLUE_UNDERLINED = "\033[4;34m"; // BLUE
+	public static final String PURPLE_UNDERLINED = "\033[4;35m"; // PURPLE
+	public static final String CYAN_UNDERLINED = "\033[4;36m"; // CYAN
+	public static final String WHITE_UNDERLINED = "\033[4;37m"; // WHITE
+
+	// Background
+	public static final String BLACK_BACKGROUND = "\033[40m"; // BLACK
+	public static final String RED_BACKGROUND = "\033[41m"; // RED
+	public static final String GREEN_BACKGROUND = "\033[42m"; // GREEN
+	public static final String YELLOW_BACKGROUND = "\033[43m"; // YELLOW
+	public static final String BLUE_BACKGROUND = "\033[44m"; // BLUE
+	public static final String PURPLE_BACKGROUND = "\033[45m"; // PURPLE
+	public static final String CYAN_BACKGROUND = "\033[46m"; // CYAN
+	public static final String WHITE_BACKGROUND = "\033[47m"; // WHITE
+
+	// High Intensity
+	public static final String BLACK_BRIGHT = "\033[0;90m"; // BLACK
+	public static final String RED_BRIGHT = "\033[0;91m"; // RED
+	public static final String GREEN_BRIGHT = "\033[0;92m"; // GREEN
+	public static final String YELLOW_BRIGHT = "\033[0;93m"; // YELLOW
+	public static final String BLUE_BRIGHT = "\033[0;94m"; // BLUE
+	public static final String PURPLE_BRIGHT = "\033[0;95m"; // PURPLE
+	public static final String CYAN_BRIGHT = "\033[0;96m"; // CYAN
+	public static final String WHITE_BRIGHT = "\033[0;97m"; // WHITE
+
+	// Bold High Intensity
+	public static final String BLACK_BOLD_BRIGHT = "\033[1;90m"; // BLACK
+	public static final String RED_BOLD_BRIGHT = "\033[1;91m"; // RED
+	public static final String GREEN_BOLD_BRIGHT = "\033[1;92m"; // GREEN
+	public static final String YELLOW_BOLD_BRIGHT = "\033[1;93m";// YELLOW
+	public static final String BLUE_BOLD_BRIGHT = "\033[1;94m"; // BLUE
+	public static final String PURPLE_BOLD_BRIGHT = "\033[1;95m";// PURPLE
+	public static final String CYAN_BOLD_BRIGHT = "\033[1;96m"; // CYAN
+	public static final String WHITE_BOLD_BRIGHT = "\033[1;97m"; // WHITE
+
+	// High Intensity backgrounds
+	public static final String BLACK_BACKGROUND_BRIGHT = "\033[0;100m";// BLACK
+	public static final String RED_BACKGROUND_BRIGHT = "\033[0;101m";// RED
+	public static final String GREEN_BACKGROUND_BRIGHT = "\033[0;102m";// GREEN
+	public static final String YELLOW_BACKGROUND_BRIGHT = "\033[0;103m";// YELLOW
+	public static final String BLUE_BACKGROUND_BRIGHT = "\033[0;104m";// BLUE
+	public static final String PURPLE_BACKGROUND_BRIGHT = "\033[0;105m"; // PURPLE
+	public static final String CYAN_BACKGROUND_BRIGHT = "\033[0;106m"; // CYAN
+	public static final String WHITE_BACKGROUND_BRIGHT = "\033[0;107m"; // WHITE
+	
+}