Fixes for 1pux importer (#501)
* Pull jslib * Fixed reading of 1pux files
This commit is contained in:
parent
2295cd3266
commit
eb0b844750
2
jslib
2
jslib
|
@ -1 +1 @@
|
|||
Subproject commit 813457c348ef5cac289a4d64d34edc45f49f2b10
|
||||
Subproject commit 9aad63f8335354a9b5ea59413bd9e41a68d497a3
|
37
src/utils.ts
37
src/utils.ts
|
@ -48,19 +48,32 @@ export class CliUtils {
|
|||
}
|
||||
|
||||
static extract1PuxContent(input: string): Promise<string> {
|
||||
return new JSZip()
|
||||
.loadAsync(input)
|
||||
.then((zip) => {
|
||||
return zip.file("export.data").async("string");
|
||||
})
|
||||
.then(
|
||||
function success(content) {
|
||||
return content;
|
||||
},
|
||||
function error(e) {
|
||||
return "";
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
let p: string = null;
|
||||
if (input != null && input !== "") {
|
||||
const osInput = path.join(input);
|
||||
if (osInput.indexOf(path.sep) === -1) {
|
||||
p = path.join(process.cwd(), osInput);
|
||||
} else {
|
||||
p = osInput;
|
||||
}
|
||||
);
|
||||
} else {
|
||||
reject("You must specify a file path.");
|
||||
}
|
||||
fs.readFile(p, function (err, data) {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
JSZip.loadAsync(data).then(
|
||||
(zip) => {
|
||||
resolve(zip.file("export.data").async("string"));
|
||||
},
|
||||
(reason) => {
|
||||
reject(reason);
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
/**
|
||||
* Save the given data to a file and determine the target file if necessary.
|
||||
|
|
Loading…
Reference in New Issue