deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 09:51:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

move force file flush into fileutils.close_file

Browse Source
This commit is contained in:
Jay Lee
2020-03-05 10:08:04 -05:00
parent 0541d21364
commit 85f8a012c7
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gam.py
View File

@@ -8449,11 +8449,7 @@ def _getCloudStorageObject(s, bucket, object_, local_file=None, expectedMd5=None
sys.stdout.write(f' Downloaded: {status.progress():>7.2%}\r')
sys.stdout.flush()
sys.stdout.write('\n Download complete. Flushing to disk...\n')
# Necessary to make sure file is flushed by both Python and OS
# https://stackoverflow.com/a/13762137/1503886
f.flush()
os.fsync(f.fileno())
fileutils.close_file(f)
fileutils.close_file(f, True)
if expectedMd5:
f = fileutils.open_file(local_file, 'rb')
sys.stdout.write(f' Verifying file hash is {expectedMd5}...')
@@ -8529,11 +8525,7 @@ def doDownloadVaultExport():
sys.stdout.write(' Downloaded: {0:>7.2%}\r'.format(status.progress()))
sys.stdout.flush()
sys.stdout.write('\n Download complete. Flushing to disk...\n')
# Necessary to make sure file is flushed by both Python and OS
# https://stackoverflow.com/a/13762137/1503886
f.flush()
os.fsync(f.fileno())
fileutils.close_file(f)
fileutils.close_file(f, True)
if verifyFiles:
expected_hash = s_file['md5Hash']
sys.stdout.write(f' Verifying file hash is {expected_hash}...')