refactor: Refactor util.dep/normalize-path to use Path/normalize #125

liquidz · Dec 18, 2021 · 7340d66 · 7340d66
1 parent aa2744d
commit 7340d66
Showing 1 changed file with 9 additions and 20 deletions.
diff --git a/src/antq/util/dep.clj b/src/antq/util/dep.clj
@@ -34,26 +34,15 @@
 
 (defn normalize-path
   [^String path]
-  (let [sep (System/getProperty "file.separator")
-        file (io/file path)]
+  (let [file (io/file path)]
     (try
-      (if (= (.getAbsoluteFile file)
-             (.getCanonicalPath file))
-        path
-        (loop [[v :as elements] (seq (.split path sep))
-               accm []]
-          (if-not v
-            (str/join sep accm)
-            (recur (rest elements)
-                   (condp = v
-                     "." (cond
-                           (seq accm) accm
-                           (seq (rest elements))  accm
-                           :else (conj accm v))
-
-                     ".." (if (seq accm)
-                            (vec (butlast accm))
-                            (conj accm v))
-                     (conj accm v))))))
+      (let [path' (-> file
+                      (.toPath)
+                      (.normalize)
+                      (str))]
+        (if (and (not (str/blank? path))
+                 (str/blank? path'))
+          "."
+          path'))
       (catch Exception _
         (.getCanonicalPath file)))))