mirror of
https://github.com/paleotronic/diskm8.git
synced 2024-12-30 02:32:14 +00:00
fix(disk/diskimagerdos.go): trim filenames, fix basic detokenization on extract
This commit is contained in:
parent
5135679d0b
commit
d147f7e61b
@ -74,7 +74,7 @@ func (f RDOSFormat) Spec() *RDOSFormatSpec {
|
|||||||
switch f {
|
switch f {
|
||||||
case RDOS_32:
|
case RDOS_32:
|
||||||
return &RDOSFormatSpec{
|
return &RDOSFormatSpec{
|
||||||
SectorStride: 13,
|
SectorStride: 16,
|
||||||
SectorMax: 13,
|
SectorMax: 13,
|
||||||
CatalogTrack: 1,
|
CatalogTrack: 1,
|
||||||
CatalogSector: 0,
|
CatalogSector: 0,
|
||||||
@ -84,8 +84,8 @@ func (f RDOSFormat) Spec() *RDOSFormatSpec {
|
|||||||
return &RDOSFormatSpec{
|
return &RDOSFormatSpec{
|
||||||
SectorStride: 16,
|
SectorStride: 16,
|
||||||
SectorMax: 13,
|
SectorMax: 13,
|
||||||
CatalogTrack: 0,
|
CatalogTrack: 1,
|
||||||
CatalogSector: 1,
|
CatalogSector: 0,
|
||||||
Ordering: SectorOrderDOS33,
|
Ordering: SectorOrderDOS33,
|
||||||
}
|
}
|
||||||
case RDOS_33:
|
case RDOS_33:
|
||||||
@ -167,7 +167,7 @@ const (
|
|||||||
|
|
||||||
var RDOSTypeMap = map[RDOSFileType][2]string{
|
var RDOSTypeMap = map[RDOSFileType][2]string{
|
||||||
FileType_RDOS_Unknown: [2]string{"UNK", "Unknown"},
|
FileType_RDOS_Unknown: [2]string{"UNK", "Unknown"},
|
||||||
FileType_RDOS_AppleSoft: [2]string{"APP", "Applesoft Basic Program"},
|
FileType_RDOS_AppleSoft: [2]string{"BAS", "Applesoft Basic Program"},
|
||||||
FileType_RDOS_Binary: [2]string{"BIN", "Binary File"},
|
FileType_RDOS_Binary: [2]string{"BIN", "Binary File"},
|
||||||
FileType_RDOS_Text: [2]string{"TXT", "ASCII Text"},
|
FileType_RDOS_Text: [2]string{"TXT", "ASCII Text"},
|
||||||
}
|
}
|
||||||
@ -228,11 +228,11 @@ func (fd *RDOSFileDescriptor) Name() string {
|
|||||||
str = strings.TrimRight(str, " ")
|
str = strings.TrimRight(str, " ")
|
||||||
switch fd.Type() {
|
switch fd.Type() {
|
||||||
case FileType_RDOS_AppleSoft:
|
case FileType_RDOS_AppleSoft:
|
||||||
str += ".a"
|
str += ".bas"
|
||||||
case FileType_RDOS_Binary:
|
case FileType_RDOS_Binary:
|
||||||
str += ".s"
|
str += ".bin"
|
||||||
case FileType_RDOS_Text:
|
case FileType_RDOS_Text:
|
||||||
str += ".t"
|
str += ".txt"
|
||||||
}
|
}
|
||||||
|
|
||||||
return str
|
return str
|
||||||
@ -252,7 +252,7 @@ func (fd *RDOSFileDescriptor) NameUnadorned() string {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return str
|
return strings.TrimSpace(str)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user