mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2025-12-24 18:32:41 +00:00
Shift functionality to new file in attempt to reduce code duplication in server.js
This commit is contained in:
@@ -62,7 +62,7 @@ const SharePage = createClass({
|
||||
<Nav.item href={`/source/${this.processShareId()}`} color='teal' icon='fa-code'>
|
||||
view source
|
||||
</Nav.item>
|
||||
<Nav.item href={`/source_dl/${this.processShareId()}`} color='teal' icon='fa-download'>
|
||||
<Nav.item href={`/source_dl/${this.processShareId()}`} color='red' icon='fa-download'>
|
||||
download source
|
||||
</Nav.item>
|
||||
<RecentNavItem brew={this.props.brew} storageKey='view' />
|
||||
|
||||
14
client/homebrew/pages/sharePage/source_dl.jsx
Normal file
14
client/homebrew/pages/sharePage/source_dl.jsx
Normal file
@@ -0,0 +1,14 @@
|
||||
const sourceDL = function(res, brew) {
|
||||
const fileName = brew.title.replaceAll(' ', '-').replaceAll(':', '').replaceAll('/', '');
|
||||
|
||||
res.status(200);
|
||||
res.set({
|
||||
'Cache-Control' : 'no-cache',
|
||||
'Content-Type' : 'text/plain',
|
||||
'Content-Disposition' : `attachment; filename="HomeBrewery-${fileName}.txt"`
|
||||
});
|
||||
|
||||
return res;
|
||||
};
|
||||
|
||||
module.exports = sourceDL;
|
||||
39
server.js
39
server.js
@@ -97,22 +97,14 @@ app.get('/source/:id', (req, res)=>{
|
||||
|
||||
//Source download page
|
||||
app.get('/source_dl/:id', (req, res)=>{
|
||||
const sourceDL = require ('./client/homebrew/pages/sharePage/source_dl.jsx');
|
||||
if(req.params.id.length > 12) {
|
||||
const googleId = req.params.id.slice(0, -12);
|
||||
const shareId = req.params.id.slice(-12);
|
||||
GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share')
|
||||
.then((brew)=>{
|
||||
const text = brew.text.replaceAll('<', '<').replaceAll('>', '>');
|
||||
const fileName = brew.title.replaceAll(' ', '-');
|
||||
|
||||
res.status(200);
|
||||
res.set({
|
||||
'Cache-Control' : 'no-cache',
|
||||
'Content-Type' : 'text/plain',
|
||||
'Content-Disposition' : `attachment; filename="HomeBrewery-${fileName}.txt"`
|
||||
});
|
||||
|
||||
return res.send(text);
|
||||
res = sourceDL(res, brew);
|
||||
return res.send(brew.text);
|
||||
})
|
||||
.catch((err)=>{
|
||||
console.log(err);
|
||||
@@ -120,23 +112,14 @@ app.get('/source_dl/:id', (req, res)=>{
|
||||
});
|
||||
} else {
|
||||
HomebrewModel.get({ shareId: req.params.id })
|
||||
.then((brew)=>{
|
||||
const text = brew.text.replaceAll('<', '<').replaceAll('>', '>');
|
||||
const fileName = brew.title.replaceAll(' ', '-');
|
||||
|
||||
res.status(200);
|
||||
res.set({
|
||||
'Cache-Control' : 'no-cache',
|
||||
'Content-Type' : 'text/plain',
|
||||
'Content-Disposition' : `attachment; filename="HomeBrewery-${fileName}.txt"`
|
||||
});
|
||||
|
||||
return res.send(text);
|
||||
})
|
||||
.catch((err)=>{
|
||||
console.log(err);
|
||||
return res.status(404).send('Could not find Homebrew with that id');
|
||||
});
|
||||
.then((brew)=>{
|
||||
res = sourceDL(res, brew);
|
||||
return res.send(brew.text);
|
||||
})
|
||||
.catch((err)=>{
|
||||
console.log(err);
|
||||
return res.status(404).send('Could not find Homebrew with that id');
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user