Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

More accurate progress while decompressing the portable installer

Browse Source
This commit is contained in:
Kovid Goyal 2014-06-05 23:00:22 +05:30
parent 2b64c18470
commit 585eaaafea
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/installer/windows/portable-installer.cpp
View File

@ -188,6 +188,7 @@ output_callback(void *ctx, const void *buf, size_t size)
return 0; return 0;
} }
written = SetFilePointer(ds->out, 0, NULL, FILE_CURRENT); written = SetFilePointer(ds->out, 0, NULL, FILE_CURRENT);
FlushFileBuffers(ds->out); // Ensure progress is accurate, otherwise there is a long pause after the decompressing phase while the OS flushes to a slow flash drive
ds->pd->SetProgress(written, UNCOMPRESSED_SIZE); ds->pd->SetProgress(written, UNCOMPRESSED_SIZE);
} }
@ -245,8 +246,6 @@ static BOOL extract(LPVOID cdata, DWORD csz) {
pd->StartProgressDialog(NULL, NULL, PROGDLG_NORMAL | PROGDLG_AUTOTIME | PROGDLG_NOCANCEL, NULL); pd->StartProgressDialog(NULL, NULL, PROGDLG_NORMAL | PROGDLG_AUTOTIME | PROGDLG_NOCANCEL, NULL);
if (!decompress(cdata, csz, h, pd)) { ret = false; goto end; } if (!decompress(cdata, csz, h, pd)) { ret = false; goto end; }
pd->SetLine(1, L"Reading manifest", true, NULL);
pd->SetProgress(1, 1000);
SetFilePointer(h, 0, NULL, FILE_BEGIN); SetFilePointer(h, 0, NULL, FILE_BEGIN);
zipf = OpenZip(h, 0, ZIP_HANDLE); zipf = OpenZip(h, 0, ZIP_HANDLE);
if (zipf == 0) { show_last_error(L"Failed to open zipped portable data"); ret = false; goto end; } if (zipf == 0) { show_last_error(L"Failed to open zipped portable data"); ret = false; goto end; }