Update go.yml

[rbdr/mobius] / hotline / transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 4c80581511bbd1276a7bcf5cd0ef309519b9de89..543b00c727240ea1e43890e95d2093f23f36263c 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -37,12 +37,12 @@ func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter i
        }
 
        // Write the information fork
        }
 
        // Write the information fork

-       _, err := infoFork.Write(ffo.FlatFileInformationFork.MarshalBinary())
+       _, err := io.Copy(infoFork, &ffo.FlatFileInformationFork)

        if err != nil {
                return err
        }
 
        if err != nil {
                return err
        }
 

-       if _, err = io.Copy(targetFile, io.TeeReader(r, counterWriter)); err != nil {
+       if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil {

                return err
        }
 
                return err
        }
 


@@ -51,13 +51,14 @@ func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter i
                        return err
                }
 
                        return err
                }
 

-               if _, err = io.Copy(resForkFile, io.TeeReader(r, counterWriter)); err != nil {
+               if _, err = io.CopyN(resForkFile, io.TeeReader(r, counterWriter), ffo.rsrcSize()); err != nil {

                        return err
                }
        }
        return nil
 }
 
                        return err
                }
        }
        return nil
 }
 

+// TODO: read the banner once on startup instead of once per banner fetch

 func (s *Server) bannerDownload(w io.Writer) error {
        bannerBytes, err := os.ReadFile(filepath.Join(s.ConfigDir, s.Config.BannerFile))
        if err != nil {
 func (s *Server) bannerDownload(w io.Writer) error {
        bannerBytes, err := os.ReadFile(filepath.Join(s.ConfigDir, s.Config.BannerFile))
        if err != nil {