chipmunkmc/edl
1
0
Fork 0
mirror of https://github.com/bkerler/edl.git synced 2024-11-14 19:14:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix_setactiveslot

Browse source
This commit is contained in:
bongbui321 2024-03-05 23:48:28 -05:00
commit bd36481568
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edlclient/Library/firehose.py
View file

@ -1326,8 +1326,8 @@ class firehose(metaclass=LogBase):
partslots["_a"] = True partslots["_a"] = True
partslots["_b"] = False partslots["_b"] = False
elif slot == "b": elif slot == "b":
partslots["_a"] = True partslots["_a"] = False
partslots["_b"] = False partslots["_b"] = True
fpartitions = {} fpartitions = {}
for lun in self.luns: for lun in self.luns:
lunname = "Lun" + str(lun) lunname = "Lun" + str(lun)

8
edlclient/Library/sparse.py
View file

@ -81,20 +81,22 @@ class QCSparse(metaclass=LogBase):
chunk_sz = header[2] chunk_sz = header[2]
total_sz = header[3] total_sz = header[3]
data_sz = total_sz - 12 data_sz = total_sz - 12
if chunk_type == 0xCAC1: if chunk_type == 0xCAC1:
if data_sz != (chunk_sz * self.blk_sz): if data_sz != (chunk_sz * self.blk_sz):
self.error( self.error(
"Raw chunk input size (%u) does not match output size (%u)" % (data_sz, chunk_sz * self.blk_sz)) "Raw chunk input size (%u) does not match output size (%u)" % (data_sz, chunk_sz * self.blk_sz))
return -1 return -1
else: else:
self.rf.seek(self.rf.tell() + chunk_sz * self.blk_sz) self.rf.seek(self.rf.tell() + data_sz)
return chunk_sz * self.blk_sz return chunk_sz * self.blk_sz
elif chunk_type == 0xCAC2: elif chunk_type == 0xCAC2:
if data_sz != 4: if data_sz != 4:
self.error("Fill chunk should have 4 bytes of fill, but this has %u" % data_sz) self.error("Fill chunk should have 4 bytes of fill, but this has %u" % data_sz)
return -1 return -1
else: else:
return chunk_sz * self.blk_sz // 4 self.rf.seek(self.rf.tell() + data_sz)
return chunk_sz * self.blk_sz
elif chunk_type == 0xCAC3: elif chunk_type == 0xCAC3:
return chunk_sz * self.blk_sz return chunk_sz * self.blk_sz
elif chunk_type == 0xCAC4: elif chunk_type == 0xCAC4:
@ -102,7 +104,7 @@ class QCSparse(metaclass=LogBase):
self.error("CRC32 chunk should have 4 bytes of CRC, but this has %u" % data_sz) self.error("CRC32 chunk should have 4 bytes of CRC, but this has %u" % data_sz)
return -1 return -1
else: else:
self.rf.seek(self.rf.tell() + 4) self.rf.seek(self.rf.tell() + data_sz)
return 0 return 0
else: else:
self.debug("Unknown chunk type 0x%04X" % chunk_type) self.debug("Unknown chunk type 0x%04X" % chunk_type)