brouzouf/ftp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The REST command must precede RETR/STOR

Browse Source
This commit is contained in:
Arnaud Ysmal 2013-12-04 23:30:50 +01:00
parent 460814bcb1
commit 8d3a48a8c7
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ftp.go
View File

@ -232,13 +232,21 @@ func (c *ServerConn) cmd(expected int, format string, args ...interface{}) (int,
return code, line, err return code, line, err
} }
// cmdDataConn executes a command which require a FTP data connection. // cmdDataConnFrom executes a command which require a FTP data connection.
func (c *ServerConn) cmdDataConn(format string, args ...interface{}) (net.Conn, error) { // Issues a REST FTP command to specify the number of bytes to skip for the transfer.
func (c *ServerConn) cmdDataConnFrom(offset uint64, format string, args ...interface{}) (net.Conn, error) {
conn, err := c.openDataConn() conn, err := c.openDataConn()
if err != nil { if err != nil {
return nil, err return nil, err
} }
if offset != 0 {
_, _, err := c.cmd(StatusRequestFilePending, "REST %d", offset)
if err != nil {
return nil, err
}
}
_, err = c.conn.Cmd(format, args...) _, err = c.conn.Cmd(format, args...)
if err != nil { if err != nil {
conn.Close() conn.Close()
@ -304,7 +312,7 @@ func parseListLine(line string) (*Entry, error) {
// NameList issues an NLST FTP command. // NameList issues an NLST FTP command.
func (c *ServerConn) NameList(path string) (entries []string, err error) { func (c *ServerConn) NameList(path string) (entries []string, err error) {
conn, err := c.cmdDataConn("NLST %s", path) conn, err := c.cmdDataConnFrom(0, "NLST %s", path)
if err != nil { if err != nil {
return return
} }
@ -324,7 +332,7 @@ func (c *ServerConn) NameList(path string) (entries []string, err error) {
// List issues a LIST FTP command. // List issues a LIST FTP command.
func (c *ServerConn) List(path string) (entries []*Entry, err error) { func (c *ServerConn) List(path string) (entries []*Entry, err error) {
conn, err := c.cmdDataConn("LIST %s", path) conn, err := c.cmdDataConnFrom(0, "LIST %s", path)
if err != nil { if err != nil {
return return
} }
@ -386,7 +394,15 @@ func (c *ServerConn) CurrentDir() (string, error) {
// //
// The returned ReadCloser must be closed to cleanup the FTP data connection. // The returned ReadCloser must be closed to cleanup the FTP data connection.
func (c *ServerConn) Retr(path string) (io.ReadCloser, error) { func (c *ServerConn) Retr(path string) (io.ReadCloser, error) {
conn, err := c.cmdDataConn("RETR %s", path) return c.RetrFrom(path, 0)
}
// Retr issues a RETR FTP command to fetch the specified file from the remote
// FTP server, the server will not send the offset first bytes of the file.
//
// The returned ReadCloser must be closed to cleanup the FTP data connection.
func (c *ServerConn) RetrFrom(path string, offset uint64) (io.ReadCloser, error) {
conn, err := c.cmdDataConnFrom(offset, "RETR %s", path)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -400,7 +416,16 @@ func (c *ServerConn) Retr(path string) (io.ReadCloser, error) {
// //
// Hint: io.Pipe() can be used if an io.Writer is required. // Hint: io.Pipe() can be used if an io.Writer is required.
func (c *ServerConn) Stor(path string, r io.Reader) error { func (c *ServerConn) Stor(path string, r io.Reader) error {
conn, err := c.cmdDataConn("STOR %s", path) return c.StorFrom(path, r, 0)
}
// Stor issues a STOR FTP command to store a file to the remote FTP server.
// Stor creates the specified file with the content of the io.Reader, writing
// on the server will start at the given file offset.
//
// Hint: io.Pipe() can be used if an io.Writer is required.
func (c *ServerConn) StorFrom(path string, r io.Reader, offset uint64) error {
conn, err := c.cmdDataConnFrom(offset, "STOR %s", path)
if err != nil { if err != nil {
return err return err
} }