Add option for account-specific file root

[rbdr/mobius] / hotline / file_transfer.go

diff --git a/hotline/file_transfer.go b/hotline/file_transfer.go
index e37295abd3d581d3140fe090b0a6015841551ab4..12725db620779d7ba4e1f197ba2683c960986dc7 100644 (file)
--- a/hotline/file_transfer.go
+++ b/hotline/file_transfer.go
@@ -87,6 +87,7 @@ func (ftm *MemFileTransferMgr) Delete(id FileTransferID) {
 }
 
 type FileTransfer struct {
+       FileRoot         string
        FileName         []byte
        FilePath         []byte
        RefNum           [4]byte
@@ -116,9 +117,10 @@ func (wc *WriteCounter) Write(p []byte) (int, error) {
        return n, nil
 }
 
-func (cc *ClientConn) NewFileTransfer(transferType FileTransferType, fileName, filePath, size []byte) *FileTransfer {
+func (cc *ClientConn) NewFileTransfer(transferType FileTransferType, fileroot string, fileName, filePath, size []byte) *FileTransfer {
        ft := &FileTransfer{
                FileName:         fileName,
+               FileRoot:         fileroot,
                FilePath:         filePath,
                Type:             transferType,
                TransferSize:     size,
@@ -289,14 +291,15 @@ func DownloadHandler(w io.Writer, fullPath string, fileTransfer *FileTransfer, f
                }
        }
 
-       rFile, err := fw.rsrcForkFile()
-       if err != nil {
-               // return fmt.Errorf("open resource fork file: %v", err)
-       }
+       rFile, _ := fw.rsrcForkFile()
+       //if err != nil {
+       //      // return fmt.Errorf("open resource fork file: %v", err)
+       //}
 
-       if _, err = io.Copy(w, io.TeeReader(rFile, fileTransfer.bytesSentCounter)); err != nil {
-               // return fmt.Errorf("send resource fork data: %v", err)
-       }
+       _, _ = io.Copy(w, io.TeeReader(rFile, fileTransfer.bytesSentCounter))
+       //if err != nil {
+       //      // return fmt.Errorf("send resource fork data: %v", err)
+       //}
 
        return nil
 }