Make jar/file processing more homegeneous

Author: vemv

src/orchard/misc.clj

@@ -3,7 +3,8 @@
   (:refer-clojure :exclude [update-keys update-vals])
   (:require
    [clojure.java.io :as io]
-   [clojure.string :as str]))
+   [clojure.string :as str]
+   [orchard.util.io :as util.io]))
 
 (defn os-windows? []
   (.startsWith (System/getProperty "os.name") "Windows"))
@@ -31,7 +32,7 @@
   "Whether the argument is a directory or an url that points to a directory"
   [f]
   (if (url? f)
-    (and (= (.getProtocol ^java.net.URL f) "file")
+    (and (util.io/direct-url-to-file? f)
          (.isDirectory (io/as-file f)))
     (.isDirectory (io/as-file f))))
 
@@ -40,7 +41,7 @@
   file extensions"
   [f & exts]
   (when-let [file (if (url? f)
-                    (when (= (.getProtocol ^java.net.URL f) "file")
+                    (when (util.io/direct-url-to-file? f)
                       (io/as-file f))
                     (io/as-file f))]
     (and

src/orchard/util/io.clj

@@ -31,23 +31,34 @@
 
 (defn url-protocol
   "Get the URL protocol as a string, e.g. http, file, jar."
+  ^String
   [^java.net.URL url]
   (.getProtocol url))
 
+(def jar? #{"jar"})
+
+(def file? #{"file"})
+
 (defn url-to-file-within-archive?
-  "Does this URL point to a file inside a jar (or zip) archive.
-  i.e. does it use the jar: protocol."
+  "Does this URL point to a file inside a jar (or zip) archive?
+  i.e., does it use the jar: protocol."
+  [^java.net.URL url]
+  (jar? (url-protocol url)))
+
+(defn direct-url-to-file?
+  "Does this URL point to a file directly?
+  i.e., does it use the file: protocol."
   [^java.net.URL url]
-  (= "jar" (url-protocol url)))
+  (file? (url-protocol url)))
 
 (defn resource-jarfile
   "Given a jar:file:...!/... URL, return the location of the jar file on the
   filesystem. Returns nil on any other URL."
   ^File [^URL jar-resource]
-  (assert (= "jar" (url-protocol jar-resource)))
+  (assert (jar? (url-protocol jar-resource)))
   (let [^JarURLConnection conn (.openConnection jar-resource)
         inner-url (.getJarFileURL conn)]
-    (when (= "file" (url-protocol inner-url))
+    (when (file? (url-protocol inner-url))
       (io/as-file inner-url))))
 
 (defn resource-artifact
@@ -59,12 +70,14 @@
   Throws when the URL is not a `file:` or `jar:` URL."
   ^File [^java.net.URL resource]
   (let [protocol (url-protocol resource)]
-    (case protocol
-      "file"
+    (cond
+      (file? protocol)
       (io/as-file resource)
-      "jar"
+
+      (jar? protocol)
       (resource-jarfile resource)
-      #_else
+
+      :else
       (throw (ex-info (str "URLs with a " protocol
                            " protocol can't be situated on the filesystem.")
                       {:resource resource})))))