suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net-lib/ftp upload and download enhancement

Browse Source 
Allow using ports with ftp-download-file and ftp-upload-file.
This commit is contained in:
Dominik Joe Pantůček 2020-11-19 23:10:58 +01:00 committed by GitHub
parent 6075923a45
commit 14a380bd49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/net-doc/net/scribblings/ftp.scrbl
View File

@ -77,7 +77,8 @@ this information can be unreliable.}
@defproc[(ftp-download-file [ftp-conn ftp-connection?]
[local-dir path-string?]
[local-dir-or-port (or/c path-string?
output-port?)]
[file string?]
[#:progress progress-proc
(or/c #f
@ -87,11 +88,18 @@ this information can be unreliable.}
#f])
void?]{
Downloads @racket[file] from the server's current directory and puts
it in @racket[local-dir] using the same name. If the file already
exists in the local directory, it is replaced, but only after the
transfer succeeds (i.e., the file is first downloaded to a temporary
file in @racket[local-dir], then moved into place on success).
If @racket[local-dir-or-port] is a @racket[path-string?],
@racket[ftp-download-file] downloads @racket[file] from the server's current
directory and puts it in @racket[local-dir-or-port] using the same name. If the
file already exists in the local directory, it is replaced, but only after the
transfer succeeds (i.e., the file is first downloaded to a temporary file in
@racket[local-dir-or-port], then moved into place on success).
When @racket[local-dir-or-port] is an @racket[output-port?], it downloads
@racket[file] from the server's current directory and writes its content to
provided @racket[output-port?]. The data is written to the port as it is being
received from the server and if the download is interrupted, incomplete data is
written to the port. The port is closed after finishing the transfer.
If @racket[progress-proc] is not @racket[#f], then it is called with a
function @racket[_get-count] that returns two values: the number of bytes
@ -118,7 +126,8 @@ is intended to limit polling.
]}
@defproc[(ftp-upload-file [ftp-conn ftp-connection?]
[file-path path-string?]
[file-path path-string?]
[port (or/c #f input-port?) #f]
[#:progress progress-proc
(or/c #f
(-> (-> (values exact-nonnegative-integer?
@ -127,10 +136,15 @@ is intended to limit polling.
#f])
void?]{
Upload @racket[file-path] to the server's current directory using the same name.
If the file already exists in the local directory, it is replaced.
The @racket[progress-proc] argument is used in the same way as in @racket[ftp-download-file],
but to report uploaded bytes instead of downloaded bytes.}
When @racket[port] is @racket[#f], upload @racket[file-path] to the server's
current directory using the same name. If the file already exists in the remote
directory, it is replaced. The @racket[progress-proc] argument is used in the
same way as in @racket[ftp-download-file], but to report uploaded bytes instead
of downloaded bytes.
If @racket[port] is an @racket[input-port?], the content of that port is
streamed as upload to the server and stored under given @racket[file-path]
name. The port is closed after finishing the transfer.}
@defproc[(ftp-delete-file [ftp-conn ftp-connection?]
[file-path path-string?]) void?]{

23
pkgs/net-lib/net/ftp.rkt
View File

@ -197,22 +197,29 @@
(define r `(,(car m) ,@(cddr m)))
(if size `(,@r ,size) r)))
(define (ftp-download-file ftp-ports folder filename
(define (ftp-download-file ftp-ports folder-or-port filename
#:progress [progress-proc #f])
;; Save the file under a temporary name, rename it once download is
;; complete this assures we don't over write any existing file without
;; having a good file down
(let* ([tmpfile (make-temporary-file "~a.download" #f folder)]
[new-file (open-output-file tmpfile #:exists 'truncate)]
[tcp-data (establish-data-connection ftp-ports 'in)])
(if (output-port? folder-or-port)
(let ([tcp-data (establish-data-connection ftp-ports 'in)])
(transfer-data ftp-ports 'download tcp-data new-file filename progress-proc)
(transfer-data ftp-ports 'download tcp-data folder-or-port filename progress-proc))
(rename-file-or-directory tmpfile (build-path folder filename) #t)))
(let* ([tmpfile (make-temporary-file "~a.download" #f folder-or-port)]
[new-file (open-output-file tmpfile #:exists 'truncate)]
[tcp-data (establish-data-connection ftp-ports 'in)])
(define (ftp-upload-file ftp-ports filepath
(transfer-data ftp-ports 'download tcp-data new-file filename progress-proc)
(rename-file-or-directory tmpfile (build-path folder-or-port filename) #t))))
(define (ftp-upload-file ftp-ports filepath [port #f]
#:progress [progress-proc #f])
(let ([upload-file (open-input-file filepath)]
(let ([upload-file (if port
port
(open-input-file filepath))]
[tcp-data (establish-data-connection ftp-ports 'out)])
(let ([system-type (system-path-convention-type)]