fix: fixed sync issue and path command

quintesse · quintesse · commit 0b731d483d09 · 2025-09-03T01:01:19.000+02:00
diff --git a/src/main/java/org/codejive/jpm/Jpm.java b/src/main/java/org/codejive/jpm/Jpm.java
@@ -86,11 +86,11 @@ public Jpm build() {
      *
      * @param artifactNames The artifacts to copy.
      * @param sync Whether to sync the target directory or not.
-     * @return An instance of {@link SyncStats} containing the statistics of the copy operation.
+     * @return An instance of {@link SyncResult} containing the statistics of the copy operation.
      * @throws IOException If an error occurred during the copy operation.
      * @throws DependencyResolutionException If an error occurred during the dependency resolution.
      */
-    public SyncStats copy(String[] artifactNames, boolean sync)
+    public SyncResult copy(String[] artifactNames, boolean sync)
             throws IOException, DependencyResolutionException {
         return copy(artifactNames, Collections.emptyMap(), sync);
     }
@@ -101,11 +101,11 @@ public SyncStats copy(String[] artifactNames, boolean sync)
      * @param artifactNames The artifacts to copy.
      * @param repos A map of additional repository names to URLs where artifacts can be found.
      * @param sync Whether to sync the target directory or not.
-     * @return An instance of {@link SyncStats} containing the statistics of the copy operation.
+     * @return An instance of {@link SyncResult} containing the statistics of the copy operation.
      * @throws IOException If an error occurred during the copy operation.
      * @throws DependencyResolutionException If an error occurred during the dependency resolution.
      */
-    public SyncStats copy(String[] artifactNames, Map<String, String> repos, boolean sync)
+    public SyncResult copy(String[] artifactNames, Map<String, String> repos, boolean sync)
             throws IOException, DependencyResolutionException {
         List<Path> files = Resolver.create(artifactNames, repos).resolvePaths();
         return FileUtils.syncArtifacts(files, directory, noLinks, !sync);
@@ -141,11 +141,11 @@ private static String artifactGav(Artifact artifact) {
      * basically means sync-copying the artifacts to the target directory.
      *
      * @param artifactNames The artifacts to install.
-     * @return An instance of {@link SyncStats} containing the statistics of the install operation.
+     * @return An instance of {@link SyncResult} containing the statistics of the install operation.
      * @throws IOException If an error occurred during the install operation.
      * @throws DependencyResolutionException If an error occurred during the dependency resolution.
      */
-    public SyncStats install(String[] artifactNames)
+    public SyncResult install(String[] artifactNames)
             throws IOException, DependencyResolutionException {
         return install(artifactNames, Collections.emptyMap());
     }
@@ -158,18 +158,18 @@ public SyncStats install(String[] artifactNames)
      *
      * @param artifactNames The artifacts to install.
      * @param extraRepos A map of additional repository names to URLs where artifacts can be found.
-     * @return An instance of {@link SyncStats} containing the statistics of the install operation.
+     * @return An instance of {@link SyncResult} containing the statistics of the install operation.
      * @throws IOException If an error occurred during the install operation.
      * @throws DependencyResolutionException If an error occurred during the dependency resolution.
      */
-    public SyncStats install(String[] artifactNames, Map<String, String> extraRepos)
+    public SyncResult install(String[] artifactNames, Map<String, String> extraRepos)
             throws IOException, DependencyResolutionException {
         AppInfo appInfo = AppInfo.read();
         String[] artifacts = getArtifacts(artifactNames, appInfo);
         Map<String, String> repos = getRepositories(extraRepos, appInfo);
         if (artifacts.length > 0) {
             List<Path> files = Resolver.create(artifacts, repos).resolvePaths();
-            SyncStats stats = FileUtils.syncArtifacts(files, directory, noLinks, true);
+            SyncResult stats = FileUtils.syncArtifacts(files, directory, noLinks, true);
             if (artifactNames.length > 0) {
                 for (String dep : artifactNames) {
                     int p = dep.lastIndexOf(':');
@@ -182,7 +182,7 @@ public SyncStats install(String[] artifactNames, Map<String, String> extraRepos)
             }
             return stats;
         } else {
-            return new SyncStats();
+            return new SyncResult();
         }
     }
 
@@ -216,7 +216,13 @@ public List<Path> path(String[] artifactNames, Map<String, String> extraRepos)
         String[] deps = getArtifacts(artifactNames, appInfo);
         Map<String, String> repos = getRepositories(extraRepos, appInfo);
         if (deps.length > 0) {
-            return Resolver.create(deps, repos).resolvePaths();
+            List<Path> files = Resolver.create(deps, repos).resolvePaths();
+            if (artifactNames.length > 0) {
+                return files;
+            } else {
+                SyncResult result = FileUtils.syncArtifacts(files, directory, noLinks, true);
+                return result.files;
+            }
         } else {
             return Collections.emptyList();
         }
diff --git a/src/main/java/org/codejive/jpm/Main.java b/src/main/java/org/codejive/jpm/Main.java
@@ -5,7 +5,7 @@
 //DEPS org.jline:jline-console-ui:3.30.5 org.jline:jline-terminal-jni:3.30.5
 //DEPS org.slf4j:slf4j-api:2.0.17 org.slf4j:slf4j-simple:2.0.17
 //SOURCES Jpm.java config/AppInfo.java util/CommandsParser.java util/FileUtils.java util/Resolver.java
-//SOURCES util/ScriptUtils.java util/SearchResult.java util/SearchUtils.java util/SyncStats.java util/Version.java
+//SOURCES util/ScriptUtils.java util/SearchResult.java util/SearchUtils.java util/SyncResult.java util/Version.java
 // spotless:on
 
 package org.codejive.jpm;
@@ -17,7 +17,7 @@
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
-import org.codejive.jpm.util.SyncStats;
+import org.codejive.jpm.util.SyncResult;
 import org.codejive.jpm.util.Version;
 import org.jline.consoleui.elements.InputValue;
 import org.jline.consoleui.elements.ListChoice;
@@ -78,7 +78,7 @@ static class Copy implements Callable<Integer> {
 
         @Override
         public Integer call() throws Exception {
-            SyncStats stats =
+            SyncResult stats =
                     Jpm.builder()
                             .directory(artifactsMixin.depsMixin.directory)
                             .noLinks(artifactsMixin.depsMixin.noLinks)
@@ -142,7 +142,7 @@ public Integer call() throws Exception {
                         String selectedArtifact = getSelectedId(result, "item");
                         String artifactAction = getSelectedId(result, "action");
                         if ("install".equals(artifactAction)) {
-                            SyncStats stats =
+                            SyncResult stats =
                                     Jpm.builder()
                                             .directory(depsMixin.directory)
                                             .noLinks(depsMixin.noLinks)
@@ -152,7 +152,7 @@ public Integer call() throws Exception {
                                 printStats(stats);
                             }
                         } else if ("copy".equals(artifactAction)) {
-                            SyncStats stats =
+                            SyncResult stats =
                                     Jpm.builder()
                                             .directory(depsMixin.directory)
                                             .noLinks(depsMixin.noLinks)
@@ -286,7 +286,7 @@ static class Install implements Callable<Integer> {
 
         @Override
         public Integer call() throws Exception {
-            SyncStats stats =
+            SyncResult stats =
                     Jpm.builder()
                             .directory(optionalArtifactsMixin.depsMixin.directory)
                             .noLinks(optionalArtifactsMixin.depsMixin.noLinks)
@@ -627,7 +627,7 @@ static class QuietMixin {
         private boolean quiet;
     }
 
-    private static void printStats(SyncStats stats) {
+    private static void printStats(SyncResult stats) {
         System.err.printf(
                 "Artifacts new: %d, updated: %d, deleted: %d%n",
                 (Integer) stats.copied, (Integer) stats.updated, (Integer) stats.deleted);
diff --git a/src/main/java/org/codejive/jpm/util/FileUtils.java b/src/main/java/org/codejive/jpm/util/FileUtils.java
@@ -21,13 +21,13 @@ public class FileUtils {
      * @param directory target directory
      * @param noLinks if true, copy artifacts instead of creating symbolic links
      * @param noDelete if true, do not delete artifacts that are no longer needed
-     * @return An instance of {@link SyncStats} with statistics about the synchronization
+     * @return An instance of {@link SyncResult} with statistics about the synchronization
      * @throws IOException if an error occurred during the synchronization
      */
-    public static SyncStats syncArtifacts(
+    public static SyncResult syncArtifacts(
             List<Path> artifacts, Path directory, boolean noLinks, boolean noDelete)
             throws IOException {
-        SyncStats stats = new SyncStats();
+        SyncResult stats = new SyncResult();
 
         // Make sure the target directory exists
         Files.createDirectories(directory);
@@ -46,14 +46,20 @@ public static SyncStats syncArtifacts(
         // Copy artifacts
         for (Path artifact : artifacts) {
             String artifactName = artifact.getFileName().toString();
+            artifactsToDelete.remove(artifactName);
             Path target = directory.resolve(artifactName);
+            stats.files.add(target);
             if (!Files.exists(target)) {
                 copyDependency(artifact, directory, noLinks);
-                artifactsToDelete.remove(artifactName);
                 stats.copied++;
             } else if (Files.isSymbolicLink(target) == noLinks) {
                 copyDependency(artifact, directory, noLinks);
                 stats.updated++;
+            } else if (Files.size(target) != Files.size(artifact)
+                    || !Files.getLastModifiedTime(target)
+                            .equals(Files.getLastModifiedTime(artifact))) {
+                copyDependency(artifact, directory, noLinks);
+                stats.updated++;
             }
         }
 
@@ -82,7 +88,11 @@ private static void copyDependency(Path artifact, Path directory, boolean noLink
                 // fall through and try again by simply copying the file
             }
         }
-        Files.copy(artifact, target, StandardCopyOption.REPLACE_EXISTING);
+        Files.copy(
+                artifact,
+                target,
+                StandardCopyOption.REPLACE_EXISTING,
+                StandardCopyOption.COPY_ATTRIBUTES);
     }
 
     public static Path safePath(String w) {
diff --git a/src/main/java/org/codejive/jpm/util/SyncResult.java b/src/main/java/org/codejive/jpm/util/SyncResult.java
@@ -1,7 +1,13 @@
 package org.codejive.jpm.util;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
 /** Utility class for keeping track of synchronization statistics. */
-public class SyncStats {
+public class SyncResult {
+    public List<Path> files = new ArrayList<>();
+
     /** The number of new artifacts that were copied. */
     public int copied;
 
