From ac16fe0f4c7dc052c0140b02c0a99d758cef6a07 Mon Sep 17 00:00:00 2001 From: Kaspar Emanuel Date: Wed, 12 Sep 2018 16:27:04 +0100 Subject: [PATCH] Use basename for whats-that-gerber --- src/gerber_files.js | 2 +- src/submit/url_submit.jsx | 2 +- tasks/page/processGerbers.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gerber_files.js b/src/gerber_files.js index 9a8c037ba4a..70a0ee46791 100644 --- a/src/gerber_files.js +++ b/src/gerber_files.js @@ -7,7 +7,7 @@ function gerberFiles(files, gerberPath) { files = files.filter(f => regex.test(f)) } const layers = files - .map(f => ({path: f, type: whatsThatGerber(f)})) + .map(f => ({path: f, type: whatsThatGerber(path.basename(f))})) .filter(({type}) => type !== 'drw') const possibleGerbers = layers.map(({path}) => path) const possibleTypes = layers.map(({type}) => type) diff --git a/src/submit/url_submit.jsx b/src/submit/url_submit.jsx index b97505eb002..997cb8bb32e 100644 --- a/src/submit/url_submit.jsx +++ b/src/submit/url_submit.jsx @@ -225,7 +225,7 @@ const UrlSubmit = React.createClass({ return superagent .get(url.resolve(GIT_CLONE_SERVER, path.join(root, f))) .withCredentials() - .then(res => ({gerber: res.text, filename: f})) + .then(res => ({gerber: res.text, filename: path.basename(f)})) }) Promise.all(requests).then(buildBoard.bind(null, dispatch)) dispatch({type: 'setFileListing', value: files}) diff --git a/tasks/page/processGerbers.js b/tasks/page/processGerbers.js index b8565e71932..7930aa3e901 100644 --- a/tasks/page/processGerbers.js +++ b/tasks/page/processGerbers.js @@ -79,7 +79,7 @@ if (require.main !== module) { const stackupData = [] for (let gerberPath of gerbers) { data = fs.readFileSync(gerberPath, {encoding: 'utf8'}) - stackupData.push({filename: gerberPath, gerber: data}) + stackupData.push({filename: path.basename(gerberPath), gerber: data}) zip.file(path.join(folder_name, path.basename(gerberPath)), data) } zip