From d59ae758f8bbeab486a76e6b512572cdb24ea719 Mon Sep 17 00:00:00 2001 From: monikahedman Date: Wed, 31 Jul 2019 11:15:50 -0400 Subject: fixed suffix stuff --- src/server/index.ts | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/index.ts b/src/server/index.ts index cb46698df..10a84c823 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -324,11 +324,24 @@ app.post("/uploadDoc", (req, res) => { let id: string = ""; try { for (const name in files) { - const path = files[name].path; - const zip = new AdmZip(path); + const path_2 = files[name].path; + const zip = new AdmZip(path_2); zip.getEntries().forEach(entry => { - if (!entry.name.startsWith("files/")) return; - zip.extractEntryTo(entry.name, __dirname + RouteStore.public, true, false); + if (!entry.entryName.startsWith("files/")) return; + let dirname = path.dirname(entry.entryName) + "/"; + let extname = path.extname(entry.entryName); + let basename = path.basename(entry.entryName).split(".")[0]; + // zip.extractEntryTo(dirname + basename + "_o" + extname, __dirname + RouteStore.public, true, false); + // zip.extractEntryTo(dirname + basename + "_s" + extname, __dirname + RouteStore.public, true, false); + // zip.extractEntryTo(dirname + basename + "_m" + extname, __dirname + RouteStore.public, true, false); + // zip.extractEntryTo(dirname + basename + "_l" + extname, __dirname + RouteStore.public, true, false); + zip.extractEntryTo(entry.entryName, __dirname + RouteStore.public, true, false); + dirname = "/" + dirname; + + fs.createReadStream(__dirname + RouteStore.public + dirname + basename + extname).pipe(fs.createWriteStream(__dirname + RouteStore.public + dirname + basename + "_o" + extname)); + fs.createReadStream(__dirname + RouteStore.public + dirname + basename + extname).pipe(fs.createWriteStream(__dirname + RouteStore.public + dirname + basename + "_s" + extname)); + fs.createReadStream(__dirname + RouteStore.public + dirname + basename + extname).pipe(fs.createWriteStream(__dirname + RouteStore.public + dirname + basename + "_m" + extname)); + fs.createReadStream(__dirname + RouteStore.public + dirname + basename + extname).pipe(fs.createWriteStream(__dirname + RouteStore.public + dirname + basename + "_l" + extname)); }); const json = zip.getEntry("doc.json"); let docs: any; @@ -343,7 +356,7 @@ app.post("/uploadDoc", (req, res) => { res(); }, true, "newDocuments")))); } catch (e) { console.log(e); } - fs.unlink(path, () => { }); + fs.unlink(path_2, () => { }); } if (id) { res.send(JSON.stringify(getId(id))); -- cgit v1.2.3-70-g09d2