X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/548d4bb93fe32d24b3fbc491a01e5c6127be9289..bdd21a62b39f18b1c78ede4e0dc2bd569d33173d:/hotline/files.go?ds=sidebyside diff --git a/hotline/files.go b/hotline/files.go index 1eeef59..63fa482 100644 --- a/hotline/files.go +++ b/hotline/files.go @@ -78,14 +78,13 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro } binary.BigEndian.PutUint32(fnwi.FileSize[:], c) - copy(fnwi.Type[:], []byte("fldr")[:]) - copy(fnwi.Creator[:], fileCreator[:]) + copy(fnwi.Type[:], []byte("fldr")) + copy(fnwi.Creator[:], fileCreator) } else { binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(rFile.Size())) - copy(fnwi.Type[:], []byte(fileTypeFromFilename(rFile.Name()).TypeCode)[:]) - copy(fnwi.Creator[:], []byte(fileTypeFromFilename(rFile.Name()).CreatorCode)[:]) + copy(fnwi.Type[:], []byte(fileTypeFromFilename(rFile.Name()).TypeCode)) + copy(fnwi.Creator[:], []byte(fileTypeFromFilename(rFile.Name()).CreatorCode)) } - } else if file.IsDir() { dir, err := os.ReadDir(filepath.Join(path, file.Name())) if err != nil { @@ -100,8 +99,8 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro } binary.BigEndian.PutUint32(fnwi.FileSize[:], c) - copy(fnwi.Type[:], []byte("fldr")[:]) - copy(fnwi.Creator[:], fileCreator[:]) + copy(fnwi.Type[:], []byte("fldr")) + copy(fnwi.Creator[:], fileCreator) } else { // the Hotline protocol does not support fileWrapper sizes > 4GiB due to the 4 byte field size, so skip them if fileInfo.Size() > 4294967296 { @@ -113,16 +112,16 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro return nil, err } - copy(fnwi.FileSize[:], hlFile.totalSize()[:]) - copy(fnwi.Type[:], hlFile.ffo.FlatFileInformationFork.TypeSignature[:]) - copy(fnwi.Creator[:], hlFile.ffo.FlatFileInformationFork.CreatorSignature[:]) + copy(fnwi.FileSize[:], hlFile.totalSize()) + copy(fnwi.Type[:], hlFile.ffo.FlatFileInformationFork.TypeSignature) + copy(fnwi.Creator[:], hlFile.ffo.FlatFileInformationFork.CreatorSignature) } - strippedName := strings.Replace(file.Name(), ".incomplete", "", -1) + strippedName := strings.ReplaceAll(file.Name(), ".incomplete", "") nameSize := make([]byte, 2) binary.BigEndian.PutUint16(nameSize, uint16(len(strippedName))) - copy(fnwi.NameSize[:], nameSize[:]) + copy(fnwi.NameSize[:], nameSize) fnwi.name = []byte(strippedName)