Apple-2-Tools/izapple2
1
0
Fork 0
mirror of https://github.com/ivanizag/izapple2.git synced 2025-08-05 01:25:03 +00:00
Code Issues Projects Releases Wiki Activity

Error strings should not be capitalized

Browse Source
This commit is contained in:
Ivan Izaguirre
2024-09-09 20:50:48 +02:00
parent 98316a9f66
commit cd23f03b82
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/blockDisk.go
View File

@@ -53,12 +53,12 @@ func OpenBlockDisk(filename string) (*BlockDisk, error) {
} }
if fileInfo.Size() > int64(ProDosBlockSize*proDosMaxBlocks) { if fileInfo.Size() > int64(ProDosBlockSize*proDosMaxBlocks) {
return nil, fmt.Errorf("File is too big OR %s", err2mg.Error()) return nil, fmt.Errorf("file is too big OR %s", err2mg.Error())
} }
size := uint32(fileInfo.Size()) size := uint32(fileInfo.Size())
if size%ProDosBlockSize != 0 { if size%ProDosBlockSize != 0 {
return nil, fmt.Errorf("File size os invalid OR %s", err2mg.Error()) return nil, fmt.Errorf("file size os invalid OR %s", err2mg.Error())
} }
// It's a valid raw file // It's a valid raw file

4
storage/diskette.go
View File

@@ -21,7 +21,7 @@ func IsDiskette(data []byte) bool {
// MakeDiskette returns a Diskette by detecting the format // MakeDiskette returns a Diskette by detecting the format
func MakeDiskette(data []byte, filename string, writeable bool) (Diskette, error) { func MakeDiskette(data []byte, filename string, writeable bool) (Diskette, error) {
if isFileD13(data) { if isFileD13(data) {
return nil, errors.New("files with .d13 format not supported for 13 sectors disk, use .nib or .woz") return nil, errors.New("files with .d13 format are not supported for 13 sectors disk, use .nib or .woz")
} }
if isFileNib(data) { if isFileNib(data) {
@@ -46,5 +46,5 @@ func MakeDiskette(data []byte, filename string, writeable bool) (Diskette, error
return newDisquetteWoz(f) return newDisquetteWoz(f)
} }
return nil, errors.New("Diskette format not supported") return nil, errors.New("diskette format not supported")
} }

2
storage/disketteNib.go
View File

@@ -33,6 +33,6 @@ func (d *disketteNib) Write(quarterTrack int, value uint8, _ uint64) {
} }
func (d *disketteNib) Is13Sectors() bool { func (d *disketteNib) Is13Sectors() bool {
// It amy be 13 sectors but we don't know // It may be 13 sectors but we don't know
return false return false
} }

3
storage/disketteNibTimed.go
View File

@@ -1,5 +1,6 @@
package storage package storage
//lint:ignore U1000 This is an experiment
type disketteNibTimed struct { type disketteNibTimed struct {
nib *fileNib nib *fileNib
cycleOn uint64 // Cycle when the disk was last turned on cycleOn uint64 // Cycle when the disk was last turned on
@@ -40,6 +41,6 @@ func (d *disketteNibTimed) Write(quarterTrack int, value uint8, _ uint64) {
} }
func (d *disketteNibTimed) Is13Sectors() bool { func (d *disketteNibTimed) Is13Sectors() bool {
// It amy be 13 sectors but we don't know // It may be 13 sectors but we don't know
return false return false
} }

2
storage/disketteWoz.go
View File

@@ -29,7 +29,7 @@ type disketteWoz struct {
func newDisquetteWoz(f *FileWoz) (*disketteWoz, error) { func newDisquetteWoz(f *FileWoz) (*disketteWoz, error) {
// Discard not supported features // Discard not supported features
if f.Info.DiskType != 1 { if f.Info.DiskType != 1 {
return nil, errors.New("Only 5.25 disks are supported") return nil, errors.New("only 5.25 disks are supported")
} }
var d disketteWoz var d disketteWoz

10
storage/file2mg.go
View File

@@ -44,7 +44,7 @@ func parse2mg(bd *BlockDisk) error {
var header file2mgHeader var header file2mgHeader
minHeaderSize := binary.Size(&header) minHeaderSize := binary.Size(&header)
if fileInfo.Size() < int64(minHeaderSize) { if fileInfo.Size() < int64(minHeaderSize) {
return errors.New("Invalid 2MG file") return errors.New("invalid 2MG file")
} }
err = readHeader(bd.file, &header) err = readHeader(bd.file, &header)
@@ -56,7 +56,7 @@ func parse2mg(bd *BlockDisk) error {
bd.dataOffset = header.OffsetData bd.dataOffset = header.OffsetData
if fileInfo.Size() < int64(bd.dataOffset+bd.blocks*ProDosBlockSize) { if fileInfo.Size() < int64(bd.dataOffset+bd.blocks*ProDosBlockSize) {
return errors.New("The 2MG file is too small") return errors.New("the 2MG file is too small")
} }
return nil return nil
@@ -69,15 +69,15 @@ func readHeader(buf io.Reader, header *file2mgHeader) error {
} }
if header.Preamble != file2mgPreamble { if header.Preamble != file2mgPreamble {
return errors.New("The 2mg file must start with '2IMG'") return errors.New("the 2mg file must start with '2IMG'")
} }
if header.Format != file2mgFormatProdos { if header.Format != file2mgFormatProdos {
return errors.New("Only prodos disks are supported") return errors.New("only prodos disks are supported")
} }
if header.Version != file2mgVersion { if header.Version != file2mgVersion {
return errors.New("Version of 2MG image not supported") return errors.New("version of 2MG image not supported")
} }
return nil return nil

5
storage/fileNib.go
View File

@@ -101,6 +101,7 @@ func (f *fileNib) saveTrack(track int) {
} }
} }
//lint:ignore U1000 This should be done per track
func (f *fileNib) saveNib(filename string) error { func (f *fileNib) saveNib(filename string) error {
file, err := os.Create(filename) file, err := os.Create(filename)
if err != nil { if err != nil {
@@ -301,7 +302,7 @@ func nibDecodeTrack(data []byte, logicalOrder *[16]int) ([]byte, error) {
for j := 0; j < secondaryBufferSize; j++ { for j := 0; j < secondaryBufferSize; j++ {
w := sixAndTwoUntranslateTable[data[i%l]] w := sixAndTwoUntranslateTable[data[i%l]]
if w == -1 { if w == -1 {
return nil, errors.New("Invalid byte from nib data") return nil, errors.New("invalid byte from nib data")
} }
v := byte(w) ^ prevV v := byte(w) ^ prevV
prevV = v prevV = v
@@ -320,7 +321,7 @@ func nibDecodeTrack(data []byte, logicalOrder *[16]int) ([]byte, error) {
for j := 0; j < primaryBufferSize; j++ { for j := 0; j < primaryBufferSize; j++ {
w := sixAndTwoUntranslateTable[data[i%l]] w := sixAndTwoUntranslateTable[data[i%l]]
if w == -1 { if w == -1 {
return nil, errors.New("Invalid byte from nib data") return nil, errors.New("invalid byte from nib data")
} }
v := byte(w) ^ prevV v := byte(w) ^ prevV
b[dst+j] |= v << 2 // The elements of the secondary buffer are the 6 MSB bits b[dst+j] |= v << 2 // The elements of the secondary buffer are the 6 MSB bits

14
storage/fileWoz.go
View File

@@ -148,7 +148,7 @@ func NewFileWoz(data []uint8) (*FileWoz, error) {
} else if bytes.Equal(headerWoz2, header) { } else if bytes.Equal(headerWoz2, header) {
f.version = 2 f.version = 2
} else { } else {
return nil, errors.New("Invalid WOZ header") return nil, errors.New("invalid WOZ header")
} }
// Extract the chunks // Extract the chunks
@@ -161,7 +161,7 @@ func NewFileWoz(data []uint8) (*FileWoz, error) {
i += wozChunkHeaderLen i += wozChunkHeaderLen
iNext := i + int(chunkHeader.Size) iNext := i + int(chunkHeader.Size)
if i == iNext || iNext > len(data) { if i == iNext || iNext > len(data) {
return nil, errors.New("Invalid chunk in WOZ file") return nil, errors.New("invalid chunk in WOZ file")
} }
id := string(chunkHeader.ID[:]) id := string(chunkHeader.ID[:])
@@ -174,7 +174,7 @@ func NewFileWoz(data []uint8) (*FileWoz, error) {
// Read the INFO chunk // Read the INFO chunk
infoData, ok := chunks["INFO"] infoData, ok := chunks["INFO"]
if !ok { if !ok {
return nil, errors.New("Chunk INFO missing from WOZ file") return nil, errors.New("chunk INFO missing from WOZ file")
} }
switch f.version { switch f.version {
case 1: case 1:
@@ -201,14 +201,14 @@ func NewFileWoz(data []uint8) (*FileWoz, error) {
// Read the TMAP chunk // Read the TMAP chunk
trackMap, ok := chunks["TMAP"] trackMap, ok := chunks["TMAP"]
if !ok { if !ok {
return nil, errors.New("Chunk TMAP missing from WOZ file") return nil, errors.New("chunk TMAP missing from WOZ file")
} }
f.trackMap = trackMap f.trackMap = trackMap
// Read the TRKS chunk // Read the TRKS chunk
tracksData, ok := chunks["TRKS"] tracksData, ok := chunks["TRKS"]
if !ok { if !ok {
return nil, errors.New("Chunk TRKS missing from WOZ file") return nil, errors.New("chunk TRKS missing from WOZ file")
} }
if f.version == 1 { if f.version == 1 {
i := 0 i := 0
@@ -236,7 +236,7 @@ func NewFileWoz(data []uint8) (*FileWoz, error) {
} }
} }
} else { } else {
return nil, errors.New("Woz version not supported") return nil, errors.New("woz version not supported")
} }
return &f, nil return &f, nil
@@ -263,7 +263,7 @@ func (f *FileWoz) DumpTrackAsNib(quarterTrack int) []uint8 {
return out return out
} }
func (f *FileWoz) dump() { func (f *FileWoz) Dump() {
fmt.Printf("Woz image:\n") fmt.Printf("Woz image:\n")
fmt.Printf(" Version: %v\n", f.Info.Version) fmt.Printf(" Version: %v\n", f.Info.Version)
fmt.Printf(" Disk type: %v\n", f.Info.DiskType) fmt.Printf(" Disk type: %v\n", f.Info.DiskType)