-
Notifications
You must be signed in to change notification settings - Fork 374
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #267 from teppeis/fix-crc
fix: CRC is unexpectedly changed after zip is re-created
- Loading branch information
Showing
4 changed files
with
42 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
node_modules/ | ||
test/issue_*/unzipped/ | ||
node_modules | ||
/test/issue_*/unzipped/ | ||
xxx | ||
.idea | ||
*.iml | ||
*.iml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,57 @@ | ||
;(function () { | ||
var assert = require('assert'); | ||
var path = require('path'); | ||
var Zip = require('../../adm-zip'); | ||
|
||
testGoodCrc(); | ||
testBadCrc(); | ||
|
||
// Good CRC | ||
function testGoodCrc() { | ||
var goodZip = new Zip(path.join(__dirname, 'good_crc.zip')); | ||
var entries = goodZip.getEntries(); | ||
const assert = require('assert'); | ||
const path = require('path'); | ||
const Zip = require('../../adm-zip'); | ||
const rimraf = require('rimraf') | ||
|
||
describe('crc', () => { | ||
const destination = __dirname + '/xxx' | ||
|
||
beforeEach(done => rimraf(destination, done)) | ||
|
||
it('Good CRC', (done) => { | ||
const goodZip = new Zip(path.join(__dirname, 'good_crc.zip')); | ||
const entries = goodZip.getEntries(); | ||
assert(entries.length === 1, 'Good CRC: Test archive contains exactly 1 file'); | ||
|
||
var testFile = entries.filter(function (entry) { | ||
const testFile = entries.filter(function (entry) { | ||
return entry.entryName === 'lorem_ipsum.txt'; | ||
}); | ||
assert(testFile.length === 1, 'Good CRC: lorem_ipsum.txt file exists as archive entry'); | ||
|
||
var testFileEntryName = testFile[0].entryName; | ||
const testFileEntryName = testFile[0].entryName; | ||
goodZip.readAsTextAsync(testFileEntryName, function (data, err) { | ||
assert(!err, 'Good CRC: error object not present'); | ||
assert(data && data.length, 'Good CRC: buffer not empty'); | ||
done(); | ||
}); | ||
} | ||
}); | ||
|
||
// Bad CRC | ||
function testBadCrc() { | ||
var badZip = new Zip(path.join(__dirname, 'bad_crc.zip')); | ||
var entries = badZip.getEntries(); | ||
it('Bad CRC', (done) => { | ||
const badZip = new Zip(path.join(__dirname, 'bad_crc.zip')); | ||
const entries = badZip.getEntries(); | ||
assert(entries.length === 1, 'Bad CRC: Test archive contains exactly 1 file'); | ||
|
||
var testFile = entries.filter(function (entry) { | ||
const testFile = entries.filter(function (entry) { | ||
return entry.entryName === 'lorem_ipsum.txt'; | ||
}); | ||
assert(testFile.length === 1, 'Bad CRC: lorem_ipsum.txt file exists as archive entry'); | ||
|
||
var testFileEntryName = testFile[0].entryName; | ||
const testFileEntryName = testFile[0].entryName; | ||
badZip.readAsTextAsync(testFileEntryName, function (data, err) { | ||
assert(data && data.length, 'Bad CRC: buffer not empty'); | ||
assert(err, 'Bad CRC: error object present'); | ||
done(); | ||
}); | ||
} | ||
})(); | ||
}); | ||
|
||
it('CRC is not changed after re-created', () => { | ||
const goodZip = new Zip(path.join(__dirname, 'good_crc.zip')); | ||
const original = goodZip.getEntries()[0].header.crc; | ||
assert.equal(original, 3528145192); | ||
const newZipPath = destination + '/good_crc_new.zip'; | ||
goodZip.writeZip(newZipPath); | ||
const newZip = new Zip(newZipPath); | ||
const actual = newZip.getEntries()[0].header.crc; | ||
assert.equal(actual, original); | ||
}); | ||
}); |