From aad45dc0e20609045e9a88c6396795303013e600 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Thu, 2 Jul 2026 14:50:22 +0300
Subject: [PATCH] download-file: Get download filename from url if not given

---
 .gitignore                         |  1 +
 Makefile                           |  3 ++-
 retropikzel/download-file.scm      | 18 ++++++++++++++++--
 retropikzel/download-file/test.scm |  3 +++
 retropikzel/system.scm             |  4 ++--
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90fd273..f2019a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ example
 venv
 foreign
 tmp
+*.json
diff --git a/Makefile b/Makefile
index 9944fd1..828be55 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,8 @@ test-docker: testfiles
 		DOCKER_TAG=${DOCKER_TAG} \
 		COMPILE_R7RS=${SCHEME} \
 		CSC_OPTIONS="${CSC_OPTIONS}" \
-		SNOW_PACKAGES="foreign.c srfi.64 srfi.170 retropikzel.system retropikzel.named-pipes ${PKG}" \
+		SNOW_PACKAGES="srfi.64 ${PKG}" \
+		AKKU_PACKAGES="akku-r7rs" \
 		APT_PACKAGES="${APT_PACKAGES}" \
 		PASS_ENV_VARS="CSC_OPTIONS" \
 		test-r7rs -o test-program test.${SFX}
diff --git a/retropikzel/download-file.scm b/retropikzel/download-file.scm
index 79f18b1..5ceb907 100644
--- a/retropikzel/download-file.scm
+++ b/retropikzel/download-file.scm
@@ -30,6 +30,15 @@
 ;(define-c-procedure curl-easy-getinfo libcurl 'curl_easy_getinfo 'int '(pointer int pointer))
 ;(define-c-procedure curl-easy-nextheader libcurl 'curl_easy_nextheader 'pointer '(pointer int int pointer))
 
+(define (get-right-char-until str chars)
+  (let ((result '())
+        (until? #f))
+    (for-each
+      (lambda (c)
+        (when (member c chars) (set! until? #t))
+        (when (not until?) (set! result (cons c result))))
+      (reverse (string->list str)))
+    (list->string result)))
 
 (define (download-file url . download-path)
   (when (not (string? url))
@@ -39,16 +48,21 @@
     (error "download-file error: download-path must be string"
            (car download-path)))
   (let* ((handle (curl-easy-init))
-         (to-path (if (null? download-path) "." (car download-path)))
+         (to-path (if (null? download-path)
+                    (get-right-char-until url '(#\/ #\\))
+                    (car download-path)))
          (to-path-cbv (string->c-bytevector to-path))
          (file-mode-cbv (string->c-bytevector "w"))
          (to-file-cbv (c-fopen to-path-cbv file-mode-cbv))
          (url-cbv (string->c-bytevector url)))
+    (display "HERE: to-path ")
+    (write to-path)
+    (newline)
     (when (c-bytevector-null? to-file-cbv)
       (let* ((error-message "download-file error")
              (error-pointer (string->c-bytevector error-message)))
         (c-perror error-pointer)
-        (c-bytevector-free file-mode-cbv to-path-cbv o-file-cbv url-cbv error-pointer)
+        (c-bytevector-free file-mode-cbv to-path-cbv to-file-cbv url-cbv error-pointer)
         (error error-message)))
     (curl-easy-setopt-pointer handle CURLOPT-WRITEDATA to-file-cbv)
     (curl-easy-setopt-pointer handle CURLOPT-URL url-cbv)
diff --git a/retropikzel/download-file/test.scm b/retropikzel/download-file/test.scm
index ef65977..67af9cf 100644
--- a/retropikzel/download-file/test.scm
+++ b/retropikzel/download-file/test.scm
@@ -6,5 +6,8 @@
                tmpfile)
 (test-assert (file-exists? tmpfile))
 
+(download-file "https://microsoftedge.github.io/Demos/json-dummy-data/64KB.json")
+(test-assert (file-exists? "64KB.json"))
+
 (test-end "download-file")
 
diff --git a/retropikzel/system.scm b/retropikzel/system.scm
index c6ca52b..71f3b90 100644
--- a/retropikzel/system.scm
+++ b/retropikzel/system.scm
@@ -2,7 +2,7 @@
 (define-c-procedure c-system libc 'system 'int '(pointer))
 
 (define (system command)
-  (let* ((command-pointer (string->c-bytevector command))
+  (let* ((command-cbv (string->c-bytevector command))
          (result (c-system command-pointer)))
-    (c-bytevector-free command-pointer)
+    (c-bytevector-free command-cbv)
     result))