tAdd more fotoimpex films - filmtools - various tools for photographic film development and darkroom printing
(HTM) git clone git://src.adamsgaard.dk/filmtools
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) commit c2f50ac99f0e30f982b49baed8cc2819627277ec
(DIR) parent b72ba03c7ef8630dddb2c13126637d997dc21ab5
(HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Sat, 18 Apr 2020 15:10:44 +0200
Add more fotoimpex films
Diffstat:
M Makefile | 2 +-
M filmprice.sh | 40 ++++++++++++++++++++++++++++---
2 files changed, 38 insertions(+), 4 deletions(-)
---
(DIR) diff --git a/Makefile b/Makefile
t@@ -17,7 +17,7 @@ all: ${BIN}
${CC} -c ${FILMTOOLS_CFLAGS} -o $@ -c $<
filmprice_snapshot: filmprice.sh
- out="filmprice_$$(date '+%Y-%m-%d')"; \
+ @out="filmprice_$$(date '+%Y-%m-%d')"; \
./filmprice.sh | tee "$$out"
clean:
(DIR) diff --git a/filmprice.sh b/filmprice.sh
t@@ -12,7 +12,12 @@ die() {
fotoimpex_path() {
case "$2" in
120)
- printf '%s-120-medium-format-film.html' "$1";;
+ case "$1" in
+ kodak-portra-400|fuji-pro-400-h)
+ printf '%s-120-medium-format-film-single-roll.html' "$1";;
+ *)
+ printf '%s-120-medium-format-film.html' "$1";;
+ esac;;
135)
case "$1" in
ilford-pan-f)
t@@ -21,6 +26,14 @@ fotoimpex_path() {
printf '%s-125-asa-13536.html' "$1";;
ilford-hp5)
printf '%s-13536-400-asa.html' "$1";;
+ fuji-fujicolor-c200)
+ printf '%s-135-36-single-pack.html' "$1";;
+ kodak-t-max-p3200)
+ printf '%s-tmz-35mm-film.html' "$1";;
+ kodak-portra-400|rollei*)
+ printf '%s-135-36.html' "$1";;
+ kodak-ektar-100)
+ printf '%s-35mm-film-13536.html' "$1";;
*)
printf '%s-13536.html' "$1";;
esac;;
t@@ -30,6 +43,10 @@ fotoimpex_path() {
printf '%s-kb-305m-bulk-roll.html' "$1";;
ilford-fp4|ilford-hp5)
printf '%s-13536-bulk-roll-305m.html' "$1";;
+ kodak*)
+ printf '%s-305m-bulk-film.html' "$1";;
+ rollei-rpx-400)
+ printf '%s-35mm-305m-bulk-roll.html' "$1";;
*)
printf '%s-305m-bulk-roll.html' "$1";;
esac;;
t@@ -47,7 +64,11 @@ fotoimpex_url() {
fotoimpex_extract_price() {
if grep -qE 'From *10' "$1"; then
- n=4
+ if grep -qE 'From *5' "$1"; then
+ n=6
+ else
+ n=4
+ fi
else
n=2
fi
t@@ -92,7 +113,20 @@ ilford-delta-400
ilford-pan-f
ilford-fp4
ilford-hp5
-fuji-neopan-acros-ii-neu-100"
+fuji-neopan-acros-ii-neu-100
+fuji-fujicolor-c200
+fuji-pro-400-h
+kodak-t-max-100
+kodak-t-max-400
+kodak-t-max-p3200-tmz-35mm-film
+kodak-tri-x-400
+kodak-ektar-100
+kodak-portra-160
+kodak-portra-400
+kodak-portra-800
+rollei-rpx-25
+rollei-rpx-100
+rollei-rpx-400"
film_formats="135
120