X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/22c599abc18895f73e96095f35b71cf3357d41b4..8b7908e63eef2878743219832e3c57a659b8d3de:/hotline/server.go diff --git a/hotline/server.go b/hotline/server.go index e51f673..1429c62 100644 --- a/hotline/server.go +++ b/hotline/server.go @@ -622,7 +622,8 @@ func (s *Server) TransferFile(conn net.Conn) error { return err } - t, err := NewReadTransfer(buf) + var t transfer + _, err := t.Write(buf[:16]) if err != nil { return err } @@ -726,7 +727,7 @@ func (s *Server) TransferFile(conn net.Conn) error { } case FolderDownload: // Folder Download flow: - // 1. Get filePath from the Transfer + // 1. Get filePath from the transfer // 2. Iterate over files // 3. For each file: // Send file header to client @@ -764,7 +765,7 @@ func (s *Server) TransferFile(conn net.Conn) error { i := 0 _ = filepath.Walk(fullFilePath+"/", func(path string, info os.FileInfo, _ error) error { i += 1 - subPath := path[basePathLen-2:] + subPath := path[basePathLen:] s.Logger.Infow("Sending fileheader", "i", i, "path", path, "fullFilePath", fullFilePath, "subPath", subPath, "IsDir", info.IsDir()) fileHeader := NewFileHeader(subPath, info.IsDir())