Apple-2-Tools/atrcopy
1
0
Fork 0
mirror of https://github.com/robmcmullen/atrcopy.git synced 2024-11-29 11:51:14 +00:00
Code Issues Projects Releases Wiki Activity

Added separate image type for boot disks

Browse Source
This commit is contained in:
Rob McMullen 2016-02-08 10:13:42 -08:00
parent 5ed7afc9c3
commit d38cee95c3
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
atrcopy.py
View File

@ -476,6 +476,31 @@ class DiskImageBase(object):
count += size count += size
return start, count return start, count
def parse_segments(self):
if self.header.image_size > 0:
self.segments.append(ObjSegment(0, 0, 0, self.header.atr_header_offset, self.bytes[0:self.header.atr_header_offset], name="%s Header" % self.header.file_format))
self.segments.append(RawSectorsSegment(1, self.header.max_sectors, self.header.image_size, self.bytes[self.header.atr_header_offset:], name="Raw disk sectors"))
class BootDiskImage(DiskImageBase):
def __str__(self):
return "%s Boot Disk" % (self.header)
def check_size(self):
self.header.check_size(self.size)
start, size = self.header.get_pos(1)
i = self.header.atr_header_offset
flag = self.bytes[i:i + 2].view(dtype='<u2')[0]
if flag == 0xffff:
raise InvalidDiskImage("Appears to be an executable")
nsec = self.bytes[i + 1]
bload = self.bytes[i + 2:i + 4].view(dtype='<u2')[0]
binit = self.bytes[i + 4:i + 6].view(dtype='<u2')[0]
blen, _ = self.header.get_pos(nsec + 1)
print nsec, bload, binit, blen
if not (bload < binit < bload + blen):
raise InvalidDiskImage("Incorrect boot load/init parameters")
class AtariDosDiskImage(DiskImageBase): class AtariDosDiskImage(DiskImageBase):
def __init__(self, bytes): def __init__(self, bytes):
@ -506,6 +531,8 @@ class AtariDosDiskImage(DiskImageBase):
self.check_size() self.check_size()
self.get_vtoc() self.get_vtoc()
self.get_directory() self.get_directory()
if not self.all_sane:
raise InvalidDiskImage("Invalid directory entries; may be boot disk")
vtoc_type = np.dtype([ vtoc_type = np.dtype([
('code', 'u1'), ('code', 'u1'),
@ -743,24 +770,24 @@ if __name__ == "__main__":
for filename in options.files: for filename in options.files:
with open(filename, "rb") as fh: with open(filename, "rb") as fh:
data = fh.read() data = fh.read()
image = None
try: try:
data = to_numpy(data) data = to_numpy(data)
atr = None
try: try:
header = AtrHeader(data[0:16]) header = AtrHeader(data[0:16])
for format in [KBootImage, AtariDosDiskImage]: for format in [KBootImage, AtariDosDiskImage, BootDiskImage]:
print "trying", format.__name__ print "trying", format.__name__
try: try:
atr = format(data) image = format(data)
print "%s: %s" % (filename, atr) print "%s: %s" % (filename, image)
break break
except InvalidDiskImage: except InvalidDiskImage:
pass pass
except InvalidAtrHeader: except InvalidAtrHeader:
for format in [AtariDosDiskImage]: for format in [AtariDosDiskImage]:
try: try:
atr = format(data) image = format(data)
print "%s: %s" % (filename, atr) print "%s: %s" % (filename, image)
break break
except: except:
raise raise
@ -769,16 +796,17 @@ if __name__ == "__main__":
raise raise
print "%s: Doesn't look like a supported disk image" % filename print "%s: Doesn't look like a supported disk image" % filename
try: try:
xex = AtariDosFile(data) image = AtariDosFile(data)
print xex
except InvalidBinaryFile: except InvalidBinaryFile:
print "%s: Doesn't look like an XEX either" % filename print "%s: Doesn't look like an XEX either" % filename
continue continue
if image is None:
image = BootDiskImage(data)
if options.segments: if options.segments:
atr.parse_segments() image.parse_segments()
print "\n".join([str(a) for a in atr.segments]) print "\n".join([str(a) for a in image.segments])
elif atr.all_sane or options.force: elif image.files or options.force:
for dirent in atr.files: for dirent in image.files:
try: try:
process(dirent, options) process(dirent, options)
except FileNumberMismatchError164: except FileNumberMismatchError164: