From 151be9f92fdd4279fa8a68d4ea7f4283da6eb02a Mon Sep 17 00:00:00 2001
From: lukas <l.schondorff@gmail.com>
Date: Thu, 16 Jan 2020 16:34:55 +0100
Subject: [PATCH] added todo's

---
 src/cryogen_core/classpath_able_io.clj | 17 ++++++++++++++---
 src/cryogen_core/new_io.clj            |  9 +++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/cryogen_core/classpath_able_io.clj b/src/cryogen_core/classpath_able_io.clj
index 139c10d..5257245 100644
--- a/src/cryogen_core/classpath_able_io.clj
+++ b/src/cryogen_core/classpath_able_io.clj
@@ -68,17 +68,18 @@
     :source-type   source-type
     :resource-type (cond
                      (Files/isDirectory java-path NoLinkOption) :dir
-                     (Files/isRegularFile java-path NoLinkOption) :java-path
+                     (Files/isRegularFile java-path NoLinkOption) :file
                      :else :unknown)}))
 
 (s/defn is-file? :- s/Bool
   [resource :- Resource]
   (= :file (:resource-type resource)))
 
+; contains either a jar or a file
 (s/defn path-from-cp ;  :- JavaPath
   [resource-path :- ShortPath]
   (try
-    (let [path-from-cp (Paths/get (.toURI (io/resource resource-path)))]
+    (let [path-from-cp (Paths/get (.toURI (io/resource resource-path)))] ; check if contains jar:
       (when (Files/exists path-from-cp NoLinkOption)
         path-from-cp))
     (catch Exception e
@@ -87,7 +88,17 @@
 (s/defn path-from-fs ;  :- JavaPath
   [fs-prefix :- Prefix
    resource-path :- ShortPath]
-  (let [path-from-fs (Paths/get (java.net.URI. (str "file://" fs-prefix resource-path)))] ;with this, you need to give the absolute path
+  (let [path-from-fs (Paths/get (java.net.URI. (str "file://" fs-prefix resource-path)))] ;fragile
+    (try
+      (when (Files/exists path-from-fs NoLinkOption)
+        path-from-fs)
+      (catch Exception e
+        nil))))
+
+; TODO move to path-from-cp
+(s/defn path-from-jar ;  :- JavaPath
+  [resource-path :- ShortPath]
+  (let [uri (.toUri (io/resource "dummy"))]
     (try
       (when (Files/exists path-from-fs NoLinkOption)
         path-from-fs)
diff --git a/src/cryogen_core/new_io.clj b/src/cryogen_core/new_io.clj
index 7c2410b..7802de8 100644
--- a/src/cryogen_core/new_io.clj
+++ b/src/cryogen_core/new_io.clj
@@ -50,3 +50,12 @@
     (doseq [resource resources]
       (io/make-parents (io/file (str target-path "/" (:path resource))))
       (.mkdir (io/file (str target-path "/" (:path resource)))))))
+
+; TODO lookup if we need to close the stream
+(defn extract-file-from-jar
+  [Uri
+   file-path]
+  (let [zippath (.getPath
+                 (FileSystems/getFileSystem (java.net.URI. Uri)) file-path
+                 (into-array String '()))]
+    (apply str (map char (Files/readAllBytes zippath)))))