diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2015-10-19 21:49:00 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2015-10-19 21:49:00 -0400 |
| commit | 4036c1047af89482db56d04a250f6c9416d9b22f (patch) | |
| tree | 6f08a8ef42b703d81b93bc0ad30f79dcdebde290 | |
| parent | bb8458255dac88bc47bbf04f0d437ecb6ea83594 (diff) | |
| parent | ffe108ce93a2f67e5d2aab2710145890a08315a0 (diff) | |
Merge branches 'master' and 'master' of tesuji.6.orbekk.com:/storage/projects/photos
| -rw-r--r-- | import/90-import-photos.rules | 1 | ||||
| -rwxr-xr-x | import/photobox_import.sh | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/import/90-import-photos.rules b/import/90-import-photos.rules new file mode 100644 index 0000000..93a0da5 --- /dev/null +++ b/import/90-import-photos.rules @@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="block", RUN+="/usr/local/sbin/photobox_import.sh" diff --git a/import/photobox_import.sh b/import/photobox_import.sh new file mode 100755 index 0000000..20b25ae --- /dev/null +++ b/import/photobox_import.sh @@ -0,0 +1,18 @@ +#!/bin/bash +log() { + echo "$(date "+%b %d %H:%M:%S") photobox_import: $@" >> /var/log/photobox +} + +readonly photoregex='.*\(jpg\|raf\|cr2\)' +readonly target=$(mktemp -u /srv/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 + umask 000 + mkdir -p "$target.importing" + rsync -avx "$mnt"/DCIM/*/* "$target.importing/" + mv "$target.importing" "$target" +fi +umount "$mnt" |