Mo' updates, less problems.

1 files changed, 18 insertions, 16 deletions

diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux
index 4979e5429..4b61bc36c 100644
--- a/stdlib/source/program/aedifex/repository/remote.lux
+++ b/stdlib/source/program/aedifex/repository/remote.lux
@@ -26,7 +26,7 @@
   ["." //
    ["#." identity (#+ Identity)]
    ["/#" // #_
-    ["#." artifact (#+ Artifact)
+    ["#." artifact (#+ Version Artifact)
      [extension (#+ Extension)]]]])
 
 (type: #export Address
@@ -75,9 +75,9 @@
   (exception.report
    ["Code" (%.int code)]))
 
-(def: #export (uri artifact extension)
-  (-> Artifact Extension URI)
-  (format (///artifact.uri artifact) extension))
+(def: #export (uri version_template artifact extension)
+  (-> Version Artifact Extension URI)
+  (format (///artifact.uri version_template artifact) extension))
 
 (def: buffer_size
   (n.* 512 1,024))
@@ -99,19 +99,21 @@
        input (|> connection
                  java/net/URLConnection::getInputStream
                  (\ ! map (|>> java/io/BufferedInputStream::new)))
-       #let [buffer (binary.create ..buffer_size)]]
-      (loop [output (\ binary.monoid identity)]
-        (do !
-          [bytes_read (java/io/BufferedInputStream::read buffer +0 (.int ..buffer_size) input)]
-          (case bytes_read
-            -1 (do !
-                 [_ (java/lang/AutoCloseable::close input)]
-                 (wrap output))
-            _ (if (n.= ..buffer_size bytes_read)
-                (recur (\ binary.monoid compose output buffer))
+       #let [buffer (binary.create ..buffer_size)]
+       output (loop [output (\ binary.monoid identity)]
                 (do !
-                  [chunk (\ io.monad wrap (binary.slice 0 (.nat bytes_read) buffer))]
-                  (recur (\ binary.monoid compose output chunk)))))))))
+                  [bytes_read (java/io/BufferedInputStream::read buffer +0 (.int ..buffer_size) input)]
+                  (case bytes_read
+                    -1 (do !
+                         [_ (java/lang/AutoCloseable::close input)]
+                         (wrap output))
+                    +0 (recur output)
+                    _ (if (n.= ..buffer_size bytes_read)
+                        (recur (\ binary.monoid compose output buffer))
+                        (do !
+                          [chunk (\ io.monad wrap (binary.slice 0 (dec (.nat bytes_read)) buffer))]
+                          (recur (\ binary.monoid compose output chunk)))))))]
+      (wrap output)))
 
   (def: (upload uri content)
     (case identity