Overview
| Comment: | added code for creating symbolic links and making new directories in target area |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
2ebee8a8b8b8dd995f211180ca01aa47 |
| User & Date: | pjhatwal on 2015-12-07 18:52:53 |
| Other Links: | branch diff | manifest | tags |
Context
|
2015-12-08
| ||
| 08:44 | Merged fork check-in: ca3c827888 user: mrwellan tags: v1.60 | |
|
2015-12-07
| ||
| 18:52 | added code for creating symbolic links and making new directories in target area check-in: 2ebee8a8b8 user: pjhatwal tags: v1.60 | |
|
2015-12-04
| ||
| 14:33 | turn off ~/.spublishrc for safety check-in: 134ed6b113 user: mrwellan tags: v1.60 | |
Changes
Modified datashare-testing/.spublish.config from [6c0bcbe7da] to [c513dac9c0].
1 2 |
[settings]
target-dir #{scheme (create-directory "/tmp/#{getenv USER}/target" #t)}
| | | 1 2 3 4 5 6 7 8 |
[settings]
target-dir #{scheme (create-directory "/tmp/#{getenv USER}/target" #t)}
allowed-users matt mrwellan pjhatwal
allowed-chars [0-9a-zA-Z\-\.]+
admins matt
[database]
location /tmp/#{getenv USER}
|
Modified spublish.scm from [ec3d62cf1a] to [18240ec105].
| ︙ | ︙ | |||
45 46 47 48 49 50 51 | ;; ;; GLOBALS ;; (define *spublish:current-tab-number* 0) (define *args-hash* (make-hash-table)) (define spublish:help (conc "Usage: spublish [action [params ...]] | | | > | > | | | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 |
;;
;; GLOBALS
;;
(define *spublish:current-tab-number* 0)
(define *args-hash* (make-hash-table))
(define spublish:help (conc "Usage: spublish [action [params ...]]
ls : list contents of target area
cp|publish <src file> <relative dest> : copy file to target area
mkdir <dir name> : maks directory in target area
rm <file> : remove file <file> from target area
ln <target> <link name> : creates a symlink
log :
options:
-m \"message\" : describe what was done
Part of the Megatest tool suite.
Learn more at http://www.kiatoa.com/fossils/megatest
Version: " megatest-fossil-hash)) ;; "
;;======================================================================
|
| ︙ | ︙ | |||
125 126 127 128 129 130 131 | (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout (if (not dbexists)(spublish:initialize-db db)) (proc db))))) (print "ERROR: invalid path for storing database: " path)))) ;; copy in file to dest, validation is done BEFORE calling this ;; | | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 |
(set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
(if (not dbexists)(spublish:initialize-db db))
(proc db)))))
(print "ERROR: invalid path for storing database: " path))))
;; copy in file to dest, validation is done BEFORE calling this
;;
(define (spublish:cp configdat submitter source-path target-dir targ-file dest-dir comment)
(let ((dest-dir-path (conc target-dir "/" dest-dir))
(targ-path (conc target-dir "/" dest-dir "/" targ-file)))
(if (file-exists? targ-path)
(begin
(print "ERROR: target file already exists, remove it before re-publishing")
(exit 1)))
(if (not(file-exists? dest-dir-path))
(begin
(print "ERROR: target directory " target-dir " does not exists." )
(exit 1)))
(spublish:db-do
configdat
(lambda (db)
(spublish:register-action db "cp" submitter source-path comment)))
(let* (;; (target-path (configf:lookup "settings" "target-path"))
(th1 (make-thread
(lambda ()
(file-copy source-path targ-path #t))
(print " ... file " targ-path " copied to" targ-path)
;; (let ((pid (process-run "cp" (list source-path target-dir))))
;; (process-wait pid)))
"copy thread"))
(th2 (make-thread
(lambda ()
(let loop ()
(thread-sleep! 15)
(display ".")
(flush-output)
(loop)))
"action is happening thread")))
(thread-start! th1)
(thread-start! th2)
(thread-join! th1))
(cons #t "Successfully saved data")))
(define (spublish:validate target-dir targ-mk)
(let* ((normal-path (normalize-pathname targ-mk))
(targ-path (conc target-dir "/" normal-path)))
(if (string-contains normal-path "..")
(begin
(print "ERROR: Path " targ-mk " resolved outside target area " target-dir )
(exit 1)))
(if (not (string-contains targ-path target-dir))
(begin
(print "ERROR: You cannot update data outside " target-dir ".")
(exit 1)))
(print "Path " targ-mk " is valid.")
))
;; make directory in dest
;;
(define (spublish:mkdir configdat submitter target-dir targ-mk comment)
(let ((targ-path (conc target-dir "/" targ-mk)))
(if (file-exists? targ-path)
(begin
(print "ERROR: target Directory " targ-path " already exist!!")
(exit 1)))
(spublish:db-do
configdat
(lambda (db)
(spublish:register-action db "mkdir" submitter targ-mk comment)))
(let* ((th1 (make-thread
(lambda ()
(create-directory targ-path #t)
(print " ... dir " targ-path " created"))
"mkdir thread"))
(th2 (make-thread
(lambda ()
(let loop ()
(thread-sleep! 15)
(display ".")
(flush-output)
(loop)))
"action is happening thread")))
(thread-start! th1)
(thread-start! th2)
(thread-join! th1))
(cons #t "Successfully saved data")))
;; create a symlink in dest
;;
(define (spublish:ln configdat submitter target-dir targ-link link-name comment)
(let ((targ-path (conc target-dir "/" link-name)))
(if (file-exists? targ-path)
(begin
(print "ERROR: target file " targ-path " already exist!!")
(exit 1)))
(if (not (file-exists? targ-link ))
(begin
(print "ERROR: target file " targ-link " does not exist!!")
(exit 1)))
(spublish:db-do
configdat
(lambda (db)
(spublish:register-action db "ln" submitter link-name comment)))
(let* ((th1 (make-thread
(lambda ()
(create-symbolic-link targ-link targ-path )
(print " ... link " targ-path " created"))
"symlink thread"))
(th2 (make-thread
(lambda ()
(let loop ()
(thread-sleep! 15)
(display ".")
(flush-output)
(loop)))
"action is happening thread")))
(thread-start! th1)
(thread-start! th2)
(thread-join! th1))
(cons #t "Successfully saved data")))
;; remove copy of file in dest
;;
(define (spublish:rm configdat submitter target-dir targ-file comment)
(let ((targ-path (conc target-dir "/" targ-file)))
(if (not (file-exists? targ-path))
(begin
|
| ︙ | ︙ | |||
263 264 265 266 267 268 269 |
(exit)))
(if (not (member user allowed-users))
(begin
(print "User \"" (current-user-name) "\" does not have access. Exiting")
(exit 1)))
(case (string->symbol action)
((cp publish)
| | > | > | | | | > > > > > | > > > > > | > > > | > > > | > | > > | > > > > > > < > > | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 |
(exit)))
(if (not (member user allowed-users))
(begin
(print "User \"" (current-user-name) "\" does not have access. Exiting")
(exit 1)))
(case (string->symbol action)
((cp publish)
(if (< (length args) 2)
(begin
(print "ERROR: Missing arguments; " (string-intersperse args ", "))
(exit 1)))
(let* ((remargs (args:get-args args '("-m") '() args:arg-hash 0))
(dest-dir (cadr args))
(src-path-in (car args))
(src-path (with-input-from-pipe
(conc "readlink -f " src-path-in)
(lambda ()
(read-line))))
(msg (or (args:get-arg "-m") ""))
(targ-file (pathname-strip-directory src-path)))
(if (not (file-read-access? src-path))
(begin
(print "ERROR: source file not readable: " src-path)
(exit 1)))
(if (directory? src-path)
(begin
(print "ERROR: source file is a directory, this is not supported yet.")
(exit 1)))
(print "publishing " src-path-in " to " target-dir)
(spublish:validate target-dir dest-dir)
(spublish:cp configdat user src-path target-dir targ-file dest-dir msg)))
((mkdir)
(if (< (length args) 1)
(begin
(print "ERROR: Missing arguments; " (string-intersperse args ", "))
(exit 1)))
(let* ((targ-mk (car args))
(msg (or (args:get-arg "-m") "")))
(print "attempting to create directory " targ-mk " in " target-dir)
(spublish:validate target-dir targ-mk)
(spublish:mkdir configdat user target-dir targ-mk msg)))
((ln)
(if (< (length args) 2)
(begin
(print "ERROR: Missing arguments; " (string-intersperse args ", "))
(exit 1)))
(let* ((targ-link (car args))
(link-name (cadr args))
(sub-path (string-reverse (string-join (cdr (string-split (string-reverse link-name) "/")) "/")))
(msg (or (args:get-arg "-m") "")))
(if(not (equal? sub-path link-name))
(begin
(print "attempting to create directory " sub-path " in " target-dir)
(spublish:validate target-dir sub-path)
(spublish:mkdir configdat user target-dir sub-path msg)))
(print "attempting to create link " link-name " in " target-dir)
(spublish:ln configdat user target-dir targ-link link-name msg)))
((rm)
(if (< (length args) 1)
(begin
(print "ERROR: Missing arguments; " (string-intersperse args ", "))
(exit 1)))
(let* ((targ-file (car args))
(msg (or (args:get-arg "-m") "")))
(print "attempting to remove " targ-file " from " target-dir)
(spublish:validate target-dir targ-file)
(spublish:rm configdat user target-dir targ-file msg)))
((publish)
(if (< (length args) 3)
(begin
(print "ERROR: Missing arguments; " (string-intersperse args ", "))
(exit 1))
(let* ((srcpath (list-ref args 0))
|
| ︙ | ︙ |