@@ -83,30 +83,45 @@ def transferChanges(targetPath):
with sqlite3.connect(DB) as db, open(fileName,mode="rb") as sf:
handle=db.cursor()
handle.execute("""select `sector_id` from `hashes` where `dirty`=1""")
# transfer modified sectors and mark them as clean
sectorIds=handle.fetchall()
for (sectorId,) in sectorIds:
'''for (sectorId,) in sectorIds:
path=targetPath / getPath(sectorId)
try: path.parent.mkdir(parents=True)
except FileExistsError: pass
df=path.open(mode="wb")
sf.seek(sectorId)
df.write(sf.read(BLOCK_SIZE))
handle.execute("""update `hashes` set `dirty`=0 where `sector_id`=?""",(sectorId,))
db.commit()'''
sector=sf.read(BLOCK_SIZE)
i=j=0
while sector and j<len(sectorIds):
if i==sectorIds[j][0]:
df.write(sector)
handle.execute("""update `hashes` set `dirty`=0 where `sector_id`=?""",(sectorIds[j][0],))
db.commit()
j+=1
i+=1
def getPath(index):
nodeIds=[]
k=1
while k<=FILE_COUNT:
nodeIds.append(index//k)
paddedLen=int(math.log10(FILE_COUNT/k))
nodeIds.append("{0:0{1}}",index//k,paddedLen)
k*=FILES_PER_DIR
nodeIds.reverse()
return pathlib.Path(*[str(id) for id in nodeIds])
return pathlib.Path(*[id for id in enumerate(nodeIds)])
action=sys.argv[1]
fileName=sys.argv[2]
baseName=".".join(fileName.split(".")[:-1])
hashFile="{0}-hash.dat".format(baseName)
isoDate=datetime.datetime.now().strftime("%Y%m%dT%H%M%S")
Status change: