Convert more bespoke methods to io.Reader/io.Writer interfaces

[rbdr/mobius] / hotline / transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 2acb5d6b6e6b689c59e776daca8db8e2ef2f5f28..543b00c727240ea1e43890e95d2093f23f36263c 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -37,7 +37,7 @@ 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
        }


@@ -58,6 +58,7 @@ func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter i
        return nil
 }
 
        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 {