swtor/ssn
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

🚧 Test enabling decompression again

Browse source
This commit is contained in:
C-3PO 2018-07-08 22:19:32 +02:00
parent d3fa6d7c29
commit 4d5e0d403a
Signed by: c3po
GPG key ID: 62993C4BB4D86F24
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ssn/extractFileStream.ts → src/ssn/extractFileAsStream.ts
View file

@ -10,7 +10,7 @@ import readBytesFromStream from './streams/readBytesFromStream';
* The stream must already start at the .zip's local file header * The stream must already start at the .zip's local file header
* and must transparently span across multiple disks if necessary. * and must transparently span across multiple disks if necessary.
*/ */
export default async function extractFileStream(file: ISsnFileEntry, inputStream: stream.Readable, skipDecompression: boolean = false): Promise<stream.Readable> { export default async function extractFileAsStream(file: ISsnFileEntry, inputStream: stream.Readable, skipDecompression: boolean = false): Promise<stream.Readable> {
let curStream = inputStream; let curStream = inputStream;
//pipe into decryption if file is encrypted //pipe into decryption if file is encrypted

4
src/ssn/getManifest.ts
View file

@ -2,7 +2,7 @@ import * as xmlJs from 'xml-js';
import getUrlContents from '../cdn/getUrlContents'; import getUrlContents from '../cdn/getUrlContents';
import IManifest from '../interfaces/IManifest'; import IManifest from '../interfaces/IManifest';
import { Product } from '../interfaces/ISettings'; import { Product } from '../interfaces/ISettings';
import extractFileStream from './extractFileStream'; import extractFileAsStream from './extractFileAsStream';
import parsePatchmanifest from './reader/parsePatchmanifest'; import parsePatchmanifest from './reader/parsePatchmanifest';
import readSsnFile from './reader/readSsnFile'; import readSsnFile from './reader/readSsnFile';
import arrayBufferToStream from './streams/arrayBufferToStream'; import arrayBufferToStream from './streams/arrayBufferToStream';
@ -37,7 +37,7 @@ export default async function getManifest(product: Product): Promise<IManifest>
//Extract manifest.xml file //Extract manifest.xml file
await readLocalFileHeader(stream, true); await readLocalFileHeader(stream, true);
const patchmanifestStream = await extractFileStream(firstFile, stream); const patchmanifestStream = await extractFileAsStream(firstFile, stream);
//Convert ArrayBuffer to string //Convert ArrayBuffer to string
const patchmanifestXml = await streamToString(patchmanifestStream); const patchmanifestXml = await streamToString(patchmanifestStream);

6
src/ssn/getPatch.ts
View file

@ -2,7 +2,7 @@ import downloadUrlContents from '../cdn/downloadUrlContents';
import getUrlContents from '../cdn/getUrlContents'; import getUrlContents from '../cdn/getUrlContents';
import { Product } from '../interfaces/ISettings'; import { Product } from '../interfaces/ISettings';
import { SsnDiffType } from '../interfaces/ISsnFileEntry'; import { SsnDiffType } from '../interfaces/ISsnFileEntry';
import extractFileStream from './extractFileStream'; import extractFileAsStream from './extractFileAsStream';
import getSolidpkg from './getSolidpkg'; import getSolidpkg from './getSolidpkg';
import readSsnFile from './reader/readSsnFile'; import readSsnFile from './reader/readSsnFile';
import getFileFromDisks from './streams/getFileFromDisks'; import getFileFromDisks from './streams/getFileFromDisks';
@ -40,7 +40,7 @@ export default async function getPatch(product: Product, from: number, to: numbe
fileEntries.filter((file) => file.diffType === SsnDiffType.NewFile).forEach(async (file) => { fileEntries.filter((file) => file.diffType === SsnDiffType.NewFile).forEach(async (file) => {
try { try {
const fileStream = await getFileFromDisks(diskFilenames, { diskStart: file.diskNumberStart, offset: file.offset, length: file.compressedSize }); const fileStream = await getFileFromDisks(diskFilenames, { diskStart: file.diskNumberStart, offset: file.offset, length: file.compressedSize });
const fileContents = await extractFileStream(file, fileStream, true); const fileContents = await extractFileAsStream(file, fileStream);
console.debug(file.name, file.compressedSize, await streamToArrayBuffer(fileContents)); console.debug(file.name, file.compressedSize, await streamToArrayBuffer(fileContents));
//TODO: need to write to disk //TODO: need to write to disk
} catch (error) { } catch (error) {
@ -52,7 +52,7 @@ export default async function getPatch(product: Product, from: number, to: numbe
fileEntries.filter((file) => file.diffType === SsnDiffType.Changed).forEach(async (file) => { fileEntries.filter((file) => file.diffType === SsnDiffType.Changed).forEach(async (file) => {
try { try {
const fileStream = await getFileFromDisks(diskFilenames, { diskStart: file.diskNumberStart, offset: file.offset, length: file.compressedSize }); const fileStream = await getFileFromDisks(diskFilenames, { diskStart: file.diskNumberStart, offset: file.offset, length: file.compressedSize });
const fileContents = await extractFileStream(file, fileStream, true); const fileContents = await extractFileAsStream(file, fileStream);
console.debug(file.name, file.compressedSize, await streamToArrayBuffer(fileContents)); console.debug(file.name, file.compressedSize, await streamToArrayBuffer(fileContents));
//TODO: need to apply diffing, then write to disk //TODO: need to apply diffing, then write to disk
} catch (error) { } catch (error) {

4
src/ssn/getSolidpkg.ts
View file

@ -2,7 +2,7 @@ import getUrlContents from '../cdn/getUrlContents';
import { Product } from '../interfaces/ISettings'; import { Product } from '../interfaces/ISettings';
import ISolid from '../interfaces/ISolidFile'; import ISolid from '../interfaces/ISolidFile';
import ISolidSimple from '../interfaces/ISolidSimple'; import ISolidSimple from '../interfaces/ISolidSimple';
import extractFileStream from './extractFileStream'; import extractFileAsStream from './extractFileAsStream';
import parseBencode from './reader/bencodeParser'; import parseBencode from './reader/bencodeParser';
import readSsnFile from './reader/readSsnFile'; import readSsnFile from './reader/readSsnFile';
import arrayBufferToStream from './streams/arrayBufferToStream'; import arrayBufferToStream from './streams/arrayBufferToStream';
@ -42,7 +42,7 @@ export default async function getSolidpkg(product: Product, from: number, to: nu
//Extract metafile.solid file //Extract metafile.solid file
await readLocalFileHeader(stream, true); await readLocalFileHeader(stream, true);
const solidFileStream = await extractFileStream(firstFile, stream); const solidFileStream = await extractFileAsStream(firstFile, stream);
const solidFileArrayBuffer = await streamToArrayBuffer(solidFileStream); const solidFileArrayBuffer = await streamToArrayBuffer(solidFileStream);
const solidContents = parseBencode(solidFileArrayBuffer) as ISolid; const solidContents = parseBencode(solidFileArrayBuffer) as ISolid;