Remove use of relative paths

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index e51f673bf1c5c57446008fbb65be1a63fd83c500..1429c62f47e2bbeb5011db6f4e18ba8f0959d8ba 100644 (file)
--- 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())