From a5f8ef702fcb54444c9020d20a5190c4a1a28b3b Mon Sep 17 00:00:00 2001 From: Aaron Mueller Date: Sun, 28 Sep 2014 17:54:44 +0200 Subject: [PATCH] Some deployment adjustments --- deploy.sh | 2 +- src/luduverse/images.clj | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/deploy.sh b/deploy.sh index 2e3d968..4560c9b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -rsync -uva --delete --exclude=.git --exclude=target . clojurecup@luduverse.clojurecup.com:/home/clojurecup/luduverse +rsync -uva --delete --exclude=.git --exclude=target --exclude=resources/ld-images . clojurecup@luduverse.clojurecup.com:/home/clojurecup/luduverse ssh clojurecup@luduverse.clojurecup.com 'cd /home/clojurecup/luduverse && /home/clojurecup/bin/lein immutant deploy' diff --git a/src/luduverse/images.clj b/src/luduverse/images.clj index c29989c..2ab98e8 100644 --- a/src/luduverse/images.clj +++ b/src/luduverse/images.clj @@ -13,7 +13,7 @@ (defn base-path ;([] (str (noir-io/resource-path) "img")) - ([] "resources/img") + ([] "resources/ld-images") ([competition-id] (str (base-path) "/ld" competition-id "/"))) (defn create-file-structure [competition-id] @@ -58,7 +58,12 @@ number (last (first (re-seq #"shot([0-9]+)" image-url))) raw-image-path (image-name competition-id "raw" id number)] (if-not (fs/exists? raw-image-path) - (do - (save-image-from-url image-url raw-image-path) - (sourceimage->fullscreen raw-image-path (image-name competition-id "fullscreen" id number)) - (sourceimage->thumb raw-image-path (image-name competition-id "thumbs" id number))))))) + (try + (do + (save-image-from-url image-url raw-image-path) + (sourceimage->fullscreen raw-image-path (image-name competition-id "fullscreen" id number)) + (sourceimage->thumb raw-image-path (image-name competition-id "thumbs" id number))) + (catch Exception e + (do + (print (str competition-id ": " id)) + (print (.getMessage e)))))))))