steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More store cleanups

release
Slava Pestov 2007-12-10 03:00:10 -05:00
parent 9e93f6251e
commit a58c654361
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
extra/store/store.factor
View File

@ -8,30 +8,26 @@ TUPLE: store path data ;
C: <store> store C: <store> store
: save-store ( store -- ) : save-store ( store -- )
[ store-data ] keep store-path <file-writer> [ get-global dup store-data swap store-path
[ <file-writer> [ serialize ] with-stream ;
dup
[ >r drop [ get ] keep r> set-at ] curry assoc-each
] keep serialize
] with-stream ;
: load-store ( path -- store ) : load-store ( path -- store )
dup exists? [ dup exists? [
dup <file-reader> [ dup <file-reader> [ deserialize ] with-stream
deserialize
] with-stream
] [ ] [
H{ } clone H{ } clone
] if <store> ; ] if <store> ;
: store-variable ( default variable store -- )
store-data 2dup at* [
rot set-global 2drop
] [
drop >r 2dup set-global r> set-at
] if ;
: define-store ( path id -- ) : define-store ( path id -- )
over >r over >r
[ >r resource-path load-store r> set-global ] 2curry [ >r resource-path load-store r> set-global ] 2curry
r> add-init-hook ; r> add-init-hook ;
: get-persistent ( key store -- value )
get-global store-data at ;
: set-persistent ( value key store -- )
get-global [ store-data set-at ] keep save-store ;
: init-persistent ( value key store -- )
2dup get-persistent [ 3drop ] [ set-persistent ] if ;

19
extra/webapps/pastebin/pastebin.factor
View File

@ -10,9 +10,9 @@ TUPLE: pastebin pastes ;
! Persistence ! Persistence
SYMBOL: store SYMBOL: store
"pastebin.store" store define-store "pastebin.store" store define-store
<pastebin> pastebin store get store-variable <pastebin> pastebin store init-persistent
: save-pastebin-store ( -- ) store get-global save-store ;
TUPLE: paste TUPLE: paste
summary author channel mode contents date summary author channel mode contents date
@ -25,8 +25,11 @@ TUPLE: annotation summary author mode contents ;
C: <annotation> annotation C: <annotation> annotation
: get-pastebin ( -- pastebin )
pastebin store get-persistent ;
: get-paste ( n -- paste ) : get-paste ( n -- paste )
pastebin get pastebin-pastes nth ; get-pastebin pastebin-pastes nth ;
: show-paste ( n -- ) : show-paste ( n -- )
serving-html serving-html
@ -46,7 +49,7 @@ C: <annotation> annotation
[ [
[ show-paste ] "show-paste-quot" set [ show-paste ] "show-paste-quot" set
[ new-paste ] "new-paste-quot" set [ new-paste ] "new-paste-quot" set
pastebin get "paste-list" render-component get-pastebin "paste-list" render-component
] with-html-stream ; ] with-html-stream ;
\ paste-list { } define-action \ paste-list { } define-action
@ -55,7 +58,7 @@ C: <annotation> annotation
paste-n number>string [ show-paste ] curry quot-link ; paste-n number>string [ show-paste ] curry quot-link ;
: paste-feed ( -- entries ) : paste-feed ( -- entries )
pastebin get pastebin-pastes [ get-pastebin pastebin-pastes [
{ {
paste-summary paste-summary
paste-link paste-link
@ -77,8 +80,8 @@ C: <annotation> annotation
: submit-paste ( summary author channel mode contents -- ) : submit-paste ( summary author channel mode contents -- )
<paste> [ <paste> [
\ pastebin get-global add-paste pastebin store get-persistent add-paste
save-pastebin-store store save-store
] keep paste-link permanent-redirect ; ] keep paste-link permanent-redirect ;
\ submit-paste { \ submit-paste {
@ -92,7 +95,7 @@ C: <annotation> annotation
: annotate-paste ( n summary author mode contents -- ) : annotate-paste ( n summary author mode contents -- )
<annotation> swap get-paste <annotation> swap get-paste
paste-annotations push paste-annotations push
save-pastebin-store ; store save-store ;
\ annotate-paste { \ annotate-paste {
{ "n" v-required v-number } { "n" v-required v-number }