diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-06-26 16:47:23 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-06-26 16:47:23 -0400 |
| commit | eb5d7e7553db76f870dd19883bebc8a16d75204b (patch) | |
| tree | f0bbf074acd1fc8945a4c94a308367093186ff88 | |
| parent | 46460164481f43ded6968e865da24828d20dc7b7 (diff) | |
| -rwxr-xr-x | import/photobox_dispatch.sh | 7 | ||||
| -rwxr-xr-x | import/photobox_import.sh | 25 |
2 files changed, 19 insertions, 13 deletions
diff --git a/import/photobox_dispatch.sh b/import/photobox_dispatch.sh new file mode 100755 index 0000000..432ae4e --- /dev/null +++ b/import/photobox_dispatch.sh @@ -0,0 +1,7 @@ +#!/bin/bash +readonly photoregex='.*\(jpg\|raf\|cr2\)' +readonly mountpoint=$(mktemp -u /mnt/photoimport/tmp.XXXX) +( +mount "$DEVNAME" "$mountpoint" +systemctl start --no-block photobox_import +) 2>&1 | systemd-cat -t photobox_import diff --git a/import/photobox_import.sh b/import/photobox_import.sh index 15f9983..83f6fc9 100755 --- a/import/photobox_import.sh +++ b/import/photobox_import.sh @@ -2,16 +2,15 @@ readonly photoregex='.*\(jpg\|raf\|cr2\)' readonly target=$(mktemp -u /btrfs/storage/photos-pending/$(date +%Y-%m-%d).XXX) -( -mnt=$(mktemp -d) -mount "$DEVNAME" "$mnt" -if [[ -d "$mnt/DCIM" && \ - -n $(find "$mnt/DCIM" -iregex "$photoregex" -print -quit) ]]; then - mkdir -p "$target.importing" - rsync -avx --remove-source-files "$mnt"/DCIM/*/* "$target.importing/" - chown -R orbekk "$target.importing" - mv "$target.importing" "$target" -fi -umount "$mnt" -beep -) 2>&1 | systemd-cat -t photobox_import +for d in /mnt/photoimport/*; do + if [[ -d "$d/DCIM" && \ + -n $(find "$d/DCIM" -iregex "$photoregex" -print -quit) ]]; then + mkdir -p "$target.importing" + rsync -avx --remove-source-files "$d"/DCIM/*/* "$target.importing/" + chown -R orbekk "$target.importing" + mv "$target.importing" "$target" + fi + umount "$d" + rmdir "$d" + beep +done |