Eilles/latex2image-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update scales to use a map instead of separate lists

Browse Source
This commit is contained in:
Joseph Rautenbach 2021-01-16 21:42:46 +02:00
parent 63e3ea147f
commit cdbe20ea57
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app.js
View File

@ -14,12 +14,22 @@ const tempDir = 'temp';
const outputDir = 'output'; const outputDir = 'output';
const httpOutputDir = 'output'; const httpOutputDir = 'output';
// Checklist of valid formats and scales, to verify form values are correct // Checklist of valid formats from the frontend, to verify form values are correct
const validFormats = ['SVG', 'PNG', 'JPG']; const validFormats = ['SVG', 'PNG', 'JPG'];
const validScales = ['10%', '25%', '50%', '75%', '100%', '125%', '150%', '200%', '500%', '1000%'];
// Percentage scales mapped to floating point values used in arguments // Maps scales received from the frontend into values appropriate for LaTeX
const validScalesInternal = ['0.1', '0.25', '0.5', '0.75', '1.0', '1.25', '1.5', '2.0', '5.0', '10.0']; const scaleMap = {
'10%': '0.1',
'25%': '0.25',
'50%': '0.5',
'75%': '0.75',
'100%': '1.0',
'125%': '1.25',
'150%': '1.5',
'200%': '2.0',
'500%': '5.0',
'1000%': '10.0'
};
// Unsupported commands we will error on // Unsupported commands we will error on
const unsupportedCommands = ['\\usepackage', '\\input', '\\include', '\\write18', '\\immediate', '\\verbatiminput']; const unsupportedCommands = ['\\usepackage', '\\input', '\\include', '\\write18', '\\immediate', '\\verbatiminput'];
@ -51,7 +61,7 @@ conversionRouter.post('/convert', async (req, res) => {
return; return;
} }
if (!validScales.includes(req.body.outputScale)) { if (!scaleMap[req.body.outputScale]) {
res.end(JSON.stringify({ error: 'Invalid scale.' })); res.end(JSON.stringify({ error: 'Invalid scale.' }));
return; return;
} }
@ -67,16 +77,16 @@ conversionRouter.post('/convert', async (req, res) => {
return; return;
} }
const eqnInput = req.body.latexInput.trim(); const equation = req.body.latexInput.trim();
const fileFormat = req.body.outputFormat.toLowerCase(); const fileFormat = req.body.outputFormat.toLowerCase();
const outputScale = req.body.outputScale; const outputScale = scaleMap[req.body.outputScale];
// Generate and write the .tex file // Generate and write the .tex file
await fsPromises.mkdir(`${tempDir}/${id}`); await fsPromises.mkdir(`${tempDir}/${id}`);
await fsPromises.writeFile(`${tempDir}/${id}/equation.tex`, getLatexTemplate(eqnInput)); await fsPromises.writeFile(`${tempDir}/${id}/equation.tex`, getLatexTemplate(equation));
// Run the LaTeX compiler and generate a .svg file // Run the LaTeX compiler and generate a .svg file
await execAsync(getDockerCommand(id, validScalesInternal[validScales.indexOf(outputScale)])); await execAsync(getDockerCommand(id, outputScale));
const inputSvgFileName = `${tempDir}/${id}/equation.svg`; const inputSvgFileName = `${tempDir}/${id}/equation.svg`;
const outputFileName = `${outputDir}/img-${id}.${fileFormat}`; const outputFileName = `${outputDir}/img-${id}.${fileFormat}`;