fix format
This commit is contained in:
parent
809d418018
commit
0c9ab9fdfa
|
@ -4,7 +4,7 @@ import { createTemp, createTempDir } from "./create-temp.js";
|
||||||
import { downloadUrl } from "./download-url.js";
|
import { downloadUrl } from "./download-url.js";
|
||||||
import { addFile } from "@/services/drive/add-file.js";
|
import { addFile } from "@/services/drive/add-file.js";
|
||||||
import { Users } from "@/models/index.js";
|
import { Users } from "@/models/index.js";
|
||||||
import * as tar from 'tar-stream';
|
import * as tar from "tar-stream";
|
||||||
import gunzip from "gunzip-maybe";
|
import gunzip from "gunzip-maybe";
|
||||||
|
|
||||||
const logger = new Logger("process-masto-notes");
|
const logger = new Logger("process-masto-notes");
|
||||||
|
@ -70,16 +70,19 @@ function unzipTarGz(fn: string, dir: string){
|
||||||
const onErr = (err: any) => {
|
const onErr = (err: any) => {
|
||||||
logger.error(`pipe broken: ${err}`);
|
logger.error(`pipe broken: ${err}`);
|
||||||
reject();
|
reject();
|
||||||
}
|
};
|
||||||
try {
|
try {
|
||||||
const extract = tar.extract().on('error', onErr);
|
const extract = tar.extract().on("error", onErr);
|
||||||
dir = dir.endsWith("/") ? dir : dir + "/";
|
dir = dir.endsWith("/") ? dir : dir + "/";
|
||||||
const ls: string[] = [];
|
const ls: string[] = [];
|
||||||
extract.on('entry', function (header: any, stream: any, next: any) {
|
extract.on("entry", function (header: any, stream: any, next: any) {
|
||||||
try {
|
try {
|
||||||
ls.push(dir + header.name);
|
ls.push(dir + header.name);
|
||||||
createFileDir(dir + header.name);
|
createFileDir(dir + header.name);
|
||||||
stream.on('error', onErr).pipe(fs.createWriteStream(dir + header.name)).on('error', onErr);
|
stream
|
||||||
|
.on("error", onErr)
|
||||||
|
.pipe(fs.createWriteStream(dir + header.name))
|
||||||
|
.on("error", onErr);
|
||||||
next();
|
next();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error(`create dir error:${e}`);
|
logger.error(`create dir error:${e}`);
|
||||||
|
@ -87,12 +90,16 @@ function unzipTarGz(fn: string, dir: string){
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
extract.on('finish', function () {
|
extract.on("finish", function () {
|
||||||
resolve(ls);
|
resolve(ls);
|
||||||
});
|
});
|
||||||
|
|
||||||
fs.createReadStream(fn).on('error', onErr).pipe(gunzip()).on('error', onErr).pipe(extract).on('error', onErr);
|
fs.createReadStream(fn)
|
||||||
|
.on("error", onErr)
|
||||||
|
.pipe(gunzip())
|
||||||
|
.on("error", onErr)
|
||||||
|
.pipe(extract)
|
||||||
|
.on("error", onErr);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error(`unzipTarGz error: ${e}`);
|
logger.error(`unzipTarGz error: ${e}`);
|
||||||
reject();
|
reject();
|
||||||
|
|
Loading…
Reference in New Issue