Skip to content

Commit

Permalink
Only read first 5kb of the file when parsing scripts
Browse files Browse the repository at this point in the history
Resolves #62.
  • Loading branch information
rads committed Oct 1, 2023
1 parent 4c5fec2 commit dda48c5
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 6 deletions.
13 changes: 10 additions & 3 deletions bbin
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,7 @@ WARNING: (We won't make any changes without asking you first.)
[babashka.bbin.scripts.maven-jar :refer [map->MavenJar]]
[babashka.fs :as fs]
[clojure.edn :as edn]
[clojure.java.io :as io]
[clojure.string :as str]
[rads.deps-info.summary :as deps-info-summary]
[selmer.filters :as filters]))
Expand All @@ -1208,15 +1209,21 @@ WARNING: (We won't make any changes without asking you first.)
(str/join "\n")
edn/read-string)))

(defn- read-header [filename]
(with-open [input-stream (io/input-stream filename)]
(let [buffer (byte-array (* 1024 5))
n (.read input-stream buffer)]
(when (nat-int? n)
(String. buffer 0 n)))))

(defn load-scripts [dir]
(->> (file-seq dir)
(filter #(.isFile %))
(map (fn [x] [(symbol (str (fs/relativize dir x)))
(parse-script (slurp x))]))
(parse-script (read-header x))]))
(filter second)
(into {})))


(defn ls [cli-opts]
(let [scripts (load-scripts (dirs/bin-dir cli-opts))]
(if (:edn cli-opts)
Expand Down Expand Up @@ -1273,7 +1280,7 @@ WARNING: (We won't make any changes without asking you first.)
(defn- load-script [cli-opts]
(let [script-name (:script/lib cli-opts)
script-file (fs/file (fs/canonicalize (fs/file (dirs/bin-dir cli-opts) script-name) {:nofollow-links true}))
parsed (parse-script (slurp script-file))]
parsed (parse-script (read-header script-file))]
(cond
(-> parsed :coords :bbin/url)
(let [summary (deps-info-summary/summary {:script/lib (-> parsed :coords :bbin/url)})
Expand Down
13 changes: 10 additions & 3 deletions src/babashka/bbin/scripts.clj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
[babashka.bbin.scripts.maven-jar :refer [map->MavenJar]]
[babashka.fs :as fs]
[clojure.edn :as edn]
[clojure.java.io :as io]
[clojure.string :as str]
[rads.deps-info.summary :as deps-info-summary]
[selmer.filters :as filters]))
Expand All @@ -31,15 +32,21 @@
(str/join "\n")
edn/read-string)))

(defn- read-header [filename]
(with-open [input-stream (io/input-stream filename)]
(let [buffer (byte-array (* 1024 5))
n (.read input-stream buffer)]
(when (nat-int? n)
(String. buffer 0 n)))))

(defn load-scripts [dir]
(->> (file-seq dir)
(filter #(.isFile %))
(map (fn [x] [(symbol (str (fs/relativize dir x)))
(parse-script (slurp x))]))
(parse-script (read-header x))]))
(filter second)
(into {})))


(defn ls [cli-opts]
(let [scripts (load-scripts (dirs/bin-dir cli-opts))]
(if (:edn cli-opts)
Expand Down Expand Up @@ -96,7 +103,7 @@
(defn- load-script [cli-opts]
(let [script-name (:script/lib cli-opts)
script-file (fs/file (fs/canonicalize (fs/file (dirs/bin-dir cli-opts) script-name) {:nofollow-links true}))
parsed (parse-script (slurp script-file))]
parsed (parse-script (read-header script-file))]
(cond
(-> parsed :coords :bbin/url)
(let [summary (deps-info-summary/summary {:script/lib (-> parsed :coords :bbin/url)})
Expand Down

0 comments on commit dda48c5

Please sign in to comment.