extra: use ?download-to in a few more places.

diff --git a/extra/bunny/bunny.factor b/extra/bunny/bunny.factor
index bbb89f6beaabd6e15d3df20746aafc02f9034a0f..6a74d127a9f4cc4f2953d7f5dfe62d35a0f4af93 100644 (file)
--- a/extra/bunny/bunny.factor
+++ b/extra/bunny/bunny.factor
@@ -23,7 +23,7 @@ TUPLE: bunny-world < demo-world model-triangles geom draw-seq draw-n ;
 M: bunny-world begin-world
     GL_DEPTH_TEST glEnable
     0.0 0.0 0.375 set-demo-orientation
-    maybe-download read-model
+    download-bunny read-model
     [ >>model-triangles ] [ <bunny-geom> >>geom ] bi
     dup make-draws >>draw-seq
     0 >>draw-n
@@ -49,12 +49,12 @@ bunny-world H{
 } set-gestures
 
 MAIN-WINDOW: bunny-window {
-        { world-class bunny-world }
-        { title "Bunny" }
-        { pixel-format-attributes {
-            windowed
-            double-buffered
-            T{ depth-bits { value 16 } }
-        } }
-        { pref-dim { 640 480 } }
-    } ;
+    { world-class bunny-world }
+    { title "Bunny" }
+    { pixel-format-attributes {
+        windowed
+        double-buffered
+        T{ depth-bits { value 16 } }
+    } }
+    { pref-dim { 640 480 } }
+} ;

diff --git a/extra/bunny/model/model.factor b/extra/bunny/model/model.factor
index 8e9df4997ea676ff1d3f736f079f4c91911680cb..c1ec085dc2e5ea447a1d96dad3bf84bd7de44a14 100644 (file)
--- a/extra/bunny/model/model.factor
+++ b/extra/bunny/model/model.factor
@@ -43,14 +43,10 @@ IN: bunny.model
 
 : model-path ( -- path ) "bun_zipper.ply" cache-file ;
 
-: model-url ( -- url ) "http://duriansoftware.com/joe/media/bun_zipper.ply" ;
-
-: maybe-download ( -- path )
-    model-path dup exists? [
-        "Downloading bunny from " write
-        model-url dup print flush
-        over download-to
-    ] unless ;
+CONSTANT: model-url "http://duriansoftware.com/joe/media/bun_zipper.ply"
+
+: download-bunny ( -- path )
+    model-url model-path [ ?download-to ] keep ;
 
 :: (draw-triangle) ( ns vs triple -- )
     triple [| elt |

diff --git a/extra/gpu/demos/bunny/bunny.factor b/extra/gpu/demos/bunny/bunny.factor
index 03ab1dc565cd4c568bf6795ef33d999b1e344398..c95108f2a1874a55f00aac1718d1d98ad8be6386 100644 (file)
--- a/extra/gpu/demos/bunny/bunny.factor
+++ b/extra/gpu/demos/bunny/bunny.factor
@@ -148,10 +148,7 @@ UNIFORM-TUPLE: loading-uniforms
 CONSTANT: bunny-model-url "http://duriansoftware.com/joe/media/bun_zipper.ply"
 
 : download-bunny ( -- path )
-    bunny-model-path dup exists? [
-        bunny-model-url dup print flush
-        over download-to
-    ] unless ;
+    bunny-model-url bunny-model-path [ ?download-to ] keep ;
 
 : get-bunny-data ( bunny-state -- )
     download-bunny bunny-data

diff --git a/extra/rosetta-code/anagrams-deranged/anagrams-deranged.factor b/extra/rosetta-code/anagrams-deranged/anagrams-deranged.factor
index ef29a493b684386670f7422220591691f66b7baf..d3e2a44aca8750e17613d4ac69fed0236fa9e2a6 100644 (file)
--- a/extra/rosetta-code/anagrams-deranged/anagrams-deranged.factor
+++ b/extra/rosetta-code/anagrams-deranged/anagrams-deranged.factor
@@ -42,10 +42,8 @@ IN: rosettacode.anagrams-deranged
     deranged-anagrams [ first length ] sort-with last ;
 
 : default-word-list ( -- path )
-    "unixdict.txt" temp-file dup exists? [
-        URL" http://puzzlers.org/pub/wordlists/unixdict.txt"
-        over download-to
-    ] unless ;
+    URL" http://puzzlers.org/pub/wordlists/unixdict.txt"
+    "unixdict.txt" temp-file [ ?download-to ] keep ;
 
 : longest-deranged-anagrams ( -- anagrams )
     default-word-list (longest-deranged-anagrams) ;

diff --git a/extra/rosetta-code/ordered-words/ordered-words.factor b/extra/rosetta-code/ordered-words/ordered-words.factor
index 63ecdb87a8d53307ec2f10b677d82b485d1c3319..e1067b14d4c261ec83445d925b0a92802e6c4cf8 100644 (file)
--- a/extra/rosetta-code/ordered-words/ordered-words.factor
+++ b/extra/rosetta-code/ordered-words/ordered-words.factor
@@ -18,10 +18,9 @@ IN: rosetta-code.ordered-words
 ! this page.
 
 MEMO: word-list ( -- seq )
-    "unixdict.txt" temp-file dup exists? [
-        URL" http://puzzlers.org/pub/wordlists/unixdict.txt"
-        over download-to
-    ] unless utf8 file-lines ;
+    URL" http://puzzlers.org/pub/wordlists/unixdict.txt"
+    "unixdict.txt" temp-file
+    [ ?download-to ] [ utf8 file-lines ] bi ;
 
 : ordered-word? ( word -- ? )
     >lower [ <= ] monotonic? ;