marcuskammer/coleslaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Packaging cleanups to S3 plugin.

Browse source
This commit is contained in:
Brit Butler 2013-03-06 13:05:57 -05:00
parent 6be80e8d5c
commit b72eb5b03a
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coleslaw.asd
View file

@ -1,5 +1,5 @@
(defsystem #:coleslaw
:name "coleslaw-core"
:name "coleslaw"
:description "Flexible Lisp Blogware"
:version "0.9"
:license "BSD"

20
plugins/s3.lisp
View file

@ -2,13 +2,9 @@
(ql:quickload 'zs3))
(defpackage :coleslaw-s3
(:use :cl :zs3)
(:use :cl)
(:import-from :coleslaw #:deploy
#:*config*)
(:import-from :zs3 #:all-keys
#:etag
#:file-etag
#:put-file)
(:export #:enable))
(in-package :coleslaw-s3)
@ -37,12 +33,12 @@ and the secret key on the second.")
(loop for key being the hash-values in *cache* collecting key))
(defun s3-sync (filepath dir)
(let ((etag (file-etag filepath))
(let ((etag (zs3:file-etag filepath))
(key (enough-namestring filepath dir)))
(if (gethash etag *cache*)
(remhash etag *cache*)
(put-file filepath *bucket* key :public t
:content-type (content-type (pathname-type filepath))))))
(zs3:put-file filepath *bucket* key :public t
:content-type (content-type (pathname-type filepath))))))
(defun dir->s3 (dir)
(flet ((upload (file) (s3-sync file dir)))
@ -50,11 +46,11 @@ and the secret key on the second.")
(defmethod deploy :after (staging)
(let ((blog (deploy *config*)))
(loop for key across (all-keys *bucket*)
do (setf (gethash (etag key) *cache*) key))
(loop for key across (zs3:all-keys *bucket*)
do (setf (gethash (zs3:etag key) *cache*) key))
(dir->s3 blog)
(delete-objects (stale-keys) *bucket*)))
(zs3:delete-objects (stale-keys) *bucket*)))
(defun enable (&key auth-file bucket)
(setf *credentials* (file-credentials auth-file)
(setf *credentials* (zs3:file-credentials auth-file)
*bucket* bucket))