diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-10 14:14:27 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-10 16:41:53 -0700 |
commit | fda12d8fe029f5b75874ab746e30d1561ad258cc (patch) | |
tree | e0fe6c617124bcbd7f8cb29d571b6592db41d279 | |
parent | 220548126a4c93a7205f78cabdda66ca77bae7dd (diff) | |
download | consfigurator-fda12d8fe029f5b75874ab746e30d1561ad258cc.tar.gz |
tidy up slots of DATA class
- Rename IDEN1->DATA-IDEN1, IDEN2->DATA-IDEN2.
- Require values for DATA-IDEN1, DATA-IDEN2 AND DATA-VERSION slots.
- Leave DATA-MIME unbound rather than initialising to NIL.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r-- | src/connection/rehome.lisp | 6 | ||||
-rw-r--r-- | src/data.lisp | 25 | ||||
-rw-r--r-- | src/package.lisp | 4 |
3 files changed, 19 insertions, 16 deletions
diff --git a/src/connection/rehome.lisp b/src/connection/rehome.lisp index b8adb8f..0a8a74c 100644 --- a/src/connection/rehome.lisp +++ b/src/connection/rehome.lisp @@ -31,10 +31,10 @@ (upload-all-prerequisite-data connection)) (defmethod connection-upload ((connection rehome-connection) (data file-data)) - (with-slots (iden1 iden2 data-version) data + (with-slots (data-iden1 data-iden2 data-version) data (let ((inside (data-pathname - (datadir connection) iden1 iden2 data-version)) - (outside (remote-data-pathname iden1 iden2 data-version))) + (datadir connection) data-iden1 data-iden2 data-version)) + (outside (remote-data-pathname data-iden1 data-iden2 data-version))) (mrun "mkdir" "-p" (pathname-directory-pathname inside)) (if (remote-exists-p outside) (mrun "cp" outside inside) diff --git a/src/data.lisp b/src/data.lisp index 6ee793c..115d51c 100644 --- a/src/data.lisp +++ b/src/data.lisp @@ -21,20 +21,21 @@ ;;;; Prerequisite data (defclass data () - ((iden1 + ((data-iden1 :initarg :iden1 - :reader iden1) - (iden2 + :initform (simple-program-error "Must supply iden1 for data.") + :reader data-iden1) + (data-iden2 :initarg :iden2 - :reader iden2) + :initform (simple-program-error "Must supply iden2 for data.") + :reader data-iden2) (data-version :initarg :version - :reader data-version - :initform nil) + :initform (simple-program-error "Must supply version for data.") + :reader data-version) (data-mime :initarg :mime :accessor data-mime - :initform nil :documentation "The MIME type of the data, if known.")) (:documentation "An item of prerequisite data as provided by a registered prerequisite data @@ -291,10 +292,11 @@ implementation.")) (flet ((upload (from to) (with-open-file (stream from :element-type '(unsigned-byte 8)) (write-remote-file to stream)))) - (with-slots (iden1 iden2 data-version) data - (informat 1 "~&Uploading (~@{~S~^ ~}) ... " iden1 iden2 data-version) + (with-slots (data-iden1 data-iden2 data-version) data + (informat 1 "~&Uploading (~@{~S~^ ~}) ... " + data-iden1 data-iden2 data-version) (let* ((*connection* connection) - (dest (remote-data-pathname iden1 iden2 data-version)) + (dest (remote-data-pathname data-iden1 data-iden2 data-version)) (destdir (pathname-directory-pathname dest)) (destfile (pathname-file dest))) (mrun "mkdir" "-p" destdir) @@ -304,7 +306,8 @@ implementation.")) (write-remote-file destfile (data-string data))) (file-data (let ((source (unix-namestring (data-file data)))) - (if (string-prefix-p "text/" (data-mime data)) + (if (and (slot-boundp data 'data-mime) + (string-prefix-p "text/" (data-mime data))) (let ((destfile (strcat destfile ".gz"))) (with-temporary-file (:pathname tmp) (run-program diff --git a/src/package.lisp b/src/package.lisp index d75047f..8e28d89 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -292,8 +292,8 @@ ;; data.lisp #:data - #:iden1 - #:iden2 + #:data-iden1 + #:data-iden2 #:data-version #:data-mime #:string-data |