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

Fixed MyDOS sector processing

Browse Source
This commit is contained in:
Rob McMullen 2016-02-08 14:36:24 -08:00
parent 2b71295965
commit 38ca54ed64
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
atrcopy.py
View File

@ -185,18 +185,6 @@ class AtrDirent(object):
return bytes, self.current_sector == 0, pos, num_data_bytes return bytes, self.current_sector == 0, pos, num_data_bytes
def process_raw_sector(self, disk, raw): def process_raw_sector(self, disk, raw):
try:
file_num = ord(raw[-3]) >> 2
except TypeError:
# if numpy data, don't need the ord()
return self.process_raw_sector_numpy(disk, raw)
if file_num != self.file_num:
raise FileNumberMismatchError164()
self.current_sector = ((ord(raw[-3]) & 0x3) << 8) + ord(raw[-2])
num_bytes = ord(raw[-1])
return raw[0:num_bytes], num_bytes
def process_raw_sector_numpy(self, disk, raw):
file_num = raw[-3] >> 2 file_num = raw[-3] >> 2
if file_num != self.file_num: if file_num != self.file_num:
raise FileNumberMismatchError164() raise FileNumberMismatchError164()
@ -210,14 +198,11 @@ class AtrDirent(object):
class MydosDirent(AtrDirent): class MydosDirent(AtrDirent):
def process_raw_sector(self, disk, raw): def process_raw_sector(self, disk, raw):
self.current_read -= 1 # No file number stored in the sector data; two full bytes available
if self.current_read == 0: # for next sector
self.current_sector = 0 self.current_sector = (raw[-3] << 8) + raw[-2]
else: num_bytes = raw[-1]
self.current_sector += 1 return raw[0:num_bytes], num_bytes
if self.current_sector == disk.first_vtoc:
self.current_sector = disk.first_data_after_vtoc
return raw
class InvalidBinaryFile(AtrError): class InvalidBinaryFile(AtrError):