diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts index cd7ec2c2612500cc305724761426457fc399e7b8..0c034bf28206d459b0a6830e676159d5787d5f10 100644 --- a/src/vs/base/node/zip.ts +++ b/src/vs/base/node/zip.ts @@ -101,16 +101,16 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions, log if (isCanceled || zipfile.entryCount === extractedEntriesCount) { c(null); } else { - e(new ExtractError('Incomplete', new Error(nls.localize('incompleteExtract', "Incomplete. Extracted {0} of {1} entries", extractedEntriesCount, zipfile.entryCount)))); + e(new ExtractError('Incomplete', new Error(nls.localize('incompleteExtract', "Incomplete. Found {0} of {1} entries", extractedEntriesCount, zipfile.entryCount)))); } }, e)); zipfile.on('entry', (entry: Entry) => { + logService.debug(targetPath, 'Found', entry.fileName); + if (isCanceled) { return; } - logService.debug(targetPath, 'Extracting', entry.fileName); - if (!options.sourcePathRegex.test(entry.fileName)) { extractedEntriesCount++; return; @@ -131,6 +131,7 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions, log last = throttler.queue(() => stream.then(stream => extractEntry(stream, fileName, mode, targetPath, options).then(() => extractedEntriesCount++))); }); }, () => { + logService.debug(targetPath, 'Cancelled.'); isCanceled = true; last.cancel(); zipfile.close();