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

refactor a bit

db4
erg 2008-05-11 18:26:59 -05:00
parent b387eca7d9
commit cc390dd53a
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
extra/ftp/client/client.factor
View File

@ -55,41 +55,42 @@ SINGLETON: passive
[ "\r\n" swap stream-write ] [ "\r\n" swap stream-write ]
[ stream-flush ] tri ; [ stream-flush ] tri ;
: ftp-command ( ftp-client string -- ftp-response ) : ftp-command ( string ftp-client -- ftp-response )
swap
[ ftp-send ] [ ftp-read ] bi ; [ ftp-send ] [ ftp-read ] bi ;
: ftp-user ( ftp-client -- ftp-response ) : ftp-user ( ftp-client -- ftp-response )
dup user>> "USER " prepend ftp-command ; [ user>> "USER " prepend ] [ ftp-command ] bi ;
: ftp-password ( ftp-client -- ftp-response ) : ftp-password ( ftp-client -- ftp-response )
dup password>> "PASS " prepend ftp-command ; [ password>> "PASS " prepend ] [ ftp-command ] bi ;
: ftp-set-binary ( ftp-client -- ftp-response ) "TYPE I" ftp-command ; : ftp-set-binary ( ftp-client -- ftp-response )
>r "TYPE I" r> ftp-command ;
: ftp-pwd ( ftp-client -- ftp-response ) : ftp-pwd ( ftp-client -- ftp-response )
"PWD" ftp-command ; >r "PWD" r> ftp-command ;
: ftp-list ( ftp-client -- ftp-response ) : ftp-list ( ftp-client -- ftp-response )
"LIST" ftp-command ; >r "LIST" r> ftp-command ;
: ftp-quit ( ftp-client -- ftp-response ) : ftp-quit ( ftp-client -- ftp-response )
"QUIT" ftp-command ; >r "QUIT" r> ftp-command ;
: ftp-cwd ( ftp-client directory -- ftp-response ) : ftp-cwd ( directory ftp-client -- ftp-response )
"CWD " prepend ftp-command ; >r "CWD " prepend r> ftp-command ;
: ftp-retr ( ftp-client filename -- ftp-response ) : ftp-retr ( filename ftp-client -- ftp-response )
"RETR " prepend ftp-command ; >r "RETR " prepend r> ftp-command ;
: parse-epsv ( ftp-response -- port ) : parse-epsv ( ftp-response -- port )
strings>> first strings>> first
"|" split 2 tail* first string>number ; "|" split 2 tail* first string>number ;
: ftp-epsv ( ftp-client -- ftp-response ) "EPSV" ftp-command ; : ftp-epsv ( ftp-client -- ftp-response )
>r "EPSV" r> ftp-command ;
M: ftp-client dispose ( ftp-client -- ) M: ftp-client dispose ( ftp-client -- )
[ "QUIT" ftp-command drop ] [ stream>> dispose ] bi ; [ ftp-quit drop ] [ stream>> dispose ] bi ;
ERROR: ftp-error got expected ; ERROR: ftp-error got expected ;
: ftp-assert ( ftp-response n -- ) : ftp-assert ( ftp-response n -- )
@ -109,28 +110,29 @@ ERROR: ftp-error got expected ;
[ ftp-set-binary 200 ftp-assert ] [ ftp-set-binary 200 ftp-assert ]
} cleave ; } cleave ;
: start-2nd ( ftp-client -- port )
ftp-epsv [ 229 ftp-assert ] [ parse-epsv ] bi ;
: list ( ftp-client -- ftp-response ) : list ( ftp-client -- ftp-response )
dup ftp-epsv dup 229 ftp-assert dup [ host>> ] [ start-2nd ] bi <inet> ascii <client>
>r dup host>> r> parse-epsv <inet> ascii <client>
over ftp-list 150 ftp-assert over ftp-list 150 ftp-assert
lines <ftp-response> swap >>strings lines <ftp-response> swap >>strings
>r ftp-read 226 ftp-assert r> ; >r ftp-read 226 ftp-assert r> ;
: ftp-get ( ftp-client filename -- ftp-response ) : ftp-get ( filename ftp-client -- ftp-response )
over ftp-epsv dup 229 ftp-assert dup [ host>> ] [ start-2nd ] bi <inet> binary <client>
pick host>> swap parse-epsv <inet> binary <client> rot tuck
swap tuck [ over ftp-retr 150 ftp-assert ]
[ dupd ftp-retr 150 ftp-assert ]
[ binary <file-writer> stream-copy ] 2bi* [ binary <file-writer> stream-copy ] 2bi*
ftp-read dup 226 ftp-assert ; ftp-read dup 226 ftp-assert ;
GENERIC# ftp-download 1 ( obj path -- ) GENERIC: ftp-download ( path obj -- )
M: ftp-client ftp-download ( ftp-client path -- ) M: ftp-client ftp-download ( path ftp-client -- )
>r dup ftp-login r> dup ftp-login
[ parent-directory ftp-cwd drop ] [ >r parent-directory r> ftp-cwd drop ]
[ file-name ftp-get drop ] [ >r file-name r> ftp-get drop ]
[ drop dispose ] 2tri ; [ dispose drop ] 2tri ;
M: string ftp-download ( string path -- ) M: string ftp-download ( path string -- )
>r <ftp-client> r> ftp-download ; <ftp-client> ftp-download ;