From 3fd48ba75f017e7f619102813541d0ce6c4d21d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C3=A6l=C5=8Drum=20spect=C4=81tr=C4=ABx?= Date: Fri, 21 Nov 2025 23:02:24 +0100 Subject: [PATCH 1/6] Use format egg to pad comic numbers --- README.md | 2 +- rain.scm | 2 +- rain.sld | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d7538b6..b5dff03 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Dependencies - [CHICKEN Scheme](https://call-cc.org) 5 or 6; -- A few CHICKEN extensions, installable using `chicken-install -s html-parser openssl http-client matchable srfi-18`. +- A few CHICKEN extensions, installable using `chicken-install -s format html-parser openssl http-client matchable srfi-18`. # Building diff --git a/rain.scm b/rain.scm index b3e8b7e..5cd9c8e 100644 --- a/rain.scm +++ b/rain.scm @@ -11,7 +11,7 @@ (define (download-comic-image index) (format (current-error-port) "* downloading comic image ~a~%" index) - (call-with-output-file (format #f "rain-~a.png" index) + (call-with-output-file (format #f "rain-~4,48,d.png" (string->number index)) (lambda (out) (call-with-input-request (find-comic-image index) #f diff --git a/rain.sld b/rain.sld index 0c2c22e..ee0c24e 100755 --- a/rain.sld +++ b/rain.sld @@ -8,9 +8,9 @@ exec csi -s "$0" "$@" (scheme file) (chicken base) (chicken io) - (chicken format) (chicken port) (chicken process-context) + (format) (html-parser) (openssl) ; has to be before http-client (http-client) From 3670f1fdff91b025f0fa7b74124305083a630357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C3=A6l=C5=8Drum=20spect=C4=81tr=C4=ABx?= Date: Fri, 21 Nov 2025 23:02:59 +0100 Subject: [PATCH 2/6] Bump version --- rain.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rain.scm b/rain.scm index 5cd9c8e..c55dd5c 100644 --- a/rain.scm +++ b/rain.scm @@ -44,7 +44,7 @@ (((or "-h" "-help") . _) (usage)) (((or "-v" "-version") . _) - (format (current-error-port) "rain.scm 1.0.0~%" (program-name))) + (format (current-error-port) "rain.scm 1.0.1~%" (program-name))) (((or "-j" "-parallel") n . rest) (let ((nn (string->number n))) (unless nn From 0e8e819ba8a321d9d490fd03a8f8f28e302b75e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C3=A6l=C5=8Drum=20spect=C4=81tr=C4=ABx?= Date: Fri, 21 Nov 2025 23:24:08 +0100 Subject: [PATCH 3/6] REMOVE MULTITHREADING --- README.md | 2 +- rain.scm | 24 ++---------------------- rain.sld | 3 +-- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index b5dff03..6b504a3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Dependencies - [CHICKEN Scheme](https://call-cc.org) 5 or 6; -- A few CHICKEN extensions, installable using `chicken-install -s format html-parser openssl http-client matchable srfi-18`. +- A few CHICKEN extensions, installable using `chicken-install -s format html-parser openssl http-client matchable`. # Building diff --git a/rain.scm b/rain.scm index c55dd5c..7440640 100644 --- a/rain.scm +++ b/rain.scm @@ -1,5 +1,3 @@ -(define parallel 1) - (define (find-comic-image index) (call-with-current-continuation (lambda (k) @@ -20,24 +18,13 @@ (format (current-error-port) "* downloaded comic image ~a~%" index)) (define (download-all indices) - (format (current-error-port) "* using ~a threads~%" parallel) - (for-each download-batch (chop indices parallel))) - -(define (download-batch batch) - (let ((threads (map (lambda (index) - (make-thread - (lambda () - (download-comic-image index)))) - batch))) - (for-each thread-start! threads) - (for-each thread-join! threads))) + (for-each download-comic-image indices)) (define (usage) (format (current-error-port) "usage: ~a [OPTION ...] INDEX ...~%" (program-name)) (format (current-error-port) "options:~%") (format (current-error-port) " -h|-help display this help message~%") - (format (current-error-port) " -v|-version display version information~%") - (format (current-error-port) " -j|-parallel N download N images in parallel~%")) + (format (current-error-port) " -v|-version display version information~%")) (define parse-command-line (match-lambda @@ -45,13 +32,6 @@ (usage)) (((or "-v" "-version") . _) (format (current-error-port) "rain.scm 1.0.1~%" (program-name))) - (((or "-j" "-parallel") n . rest) - (let ((nn (string->number n))) - (unless nn - (usage) - (exit 1)) - (set! parallel nn) - (parse-command-line rest))) (() (usage)) (indices diff --git a/rain.sld b/rain.sld index ee0c24e..12d74bb 100755 --- a/rain.sld +++ b/rain.sld @@ -14,7 +14,6 @@ exec csi -s "$0" "$@" (html-parser) (openssl) ; has to be before http-client (http-client) - (matchable) - (srfi-18)) + (matchable)) (include "rain.scm") (begin (main (command-line-arguments)))) From 9b7c4f0a4ea9ac5d3559d429dcf829b536d13e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C3=A6l=C5=8Drum=20spect=C4=81tr=C4=ABx?= Date: Fri, 21 Nov 2025 23:28:37 +0100 Subject: [PATCH 4/6] Make git clean -fdx use --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 11f1fc7..12c0eec 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,8 @@ Makefile.csm: $(CSM) -makefile Makefile.csm .PHONY: clean -clean: Makefile.csm - $(MAKE) -f Makefile.csm clean - rm -f Makefile.csm rain +clean: + git clean -fdx .PHONY: install install: From 381fa66dfc7e11941bd09341328a3480481696b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C3=A6l=C5=8Drum=20spect=C4=81tr=C4=ABx?= Date: Sun, 23 Nov 2025 13:45:41 +0100 Subject: [PATCH 5/6] Add .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4d24b44 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/Makefile.csm +/rain From ec49659cb13d65ec8cfd08e4dd4a1cfd341c09cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C3=A6l=C5=8Drum=20spect=C4=81tr=C4=ABx?= Date: Sun, 23 Nov 2025 13:53:05 +0100 Subject: [PATCH 6/6] lowercase makefile looks better --- .gitignore | 2 +- Makefile => makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename Makefile => makefile (67%) diff --git a/.gitignore b/.gitignore index 4d24b44..1369984 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/Makefile.csm +/makefile.csm /rain diff --git a/Makefile b/makefile similarity index 67% rename from Makefile rename to makefile index 12c0eec..738144f 100644 --- a/Makefile +++ b/makefile @@ -3,11 +3,11 @@ PREFIX := /usr/local INSTALL := install .PHONY: all -all: Makefile.csm - $(MAKE) -f Makefile.csm +all: makefile.csm + $(MAKE) -f makefile.csm -Makefile.csm: - $(CSM) -makefile Makefile.csm +makefile.csm: + $(CSM) -makefile makefile.csm .PHONY: clean clean: