diff --git a/includes/downloads.js b/includes/downloads.js index 0387160..7bf65a4 100644 --- a/includes/downloads.js +++ b/includes/downloads.js @@ -26,13 +26,10 @@ module.exports= return new Promise(function(resolve, reject) { const urlSplit = requestURL.split("/"); - console.log(urlSplit); - if(urlSplit.length == 3 || urlSplit.length == 4) + if(urlSplit.length == 2 || urlSplit.length == 4) { - console.log(urlSplit[2]); - sql.getDownload(urlSplit[2]).then(function(result) + sql.getDownload(urlSplit[1]).then(function(result) { - console.log(result); if(result.length == 1) { const file = './blogContent/downloads/' + @@ -41,19 +38,13 @@ module.exports= } else { - utils.print404(res).then(function() - { - resolve(); - }) + utils.print404(res); } }); } else { - utils.print404().then(function(content) - { - resolve(content); - }) + utils.print404(res); } }); } diff --git a/includes/includes.js b/includes/includes.js index 4d2deb8..4c9d755 100644 --- a/includes/includes.js +++ b/includes/includes.js @@ -133,15 +133,7 @@ module.exports = */ include: function(fileName) { - try - { - return(fs.readFileSync(fileName)); - } - catch (e) - { - console.log("Could not find " + fileName); - return(""); - } + return readFile(fileName); }, /** diff --git a/includes/staticContentServer.js b/includes/staticContentServer.js index bd2e417..905ddc4 100644 --- a/includes/staticContentServer.js +++ b/includes/staticContentServer.js @@ -2,7 +2,6 @@ const includes = require('../includes/includes.js'); - /** * @author Jeffery Russell 10-30-18 * diff --git a/routes/downloads/index.js b/routes/downloads/index.js index 01ec4f1..36bf405 100644 --- a/routes/downloads/index.js +++ b/routes/downloads/index.js @@ -3,8 +3,9 @@ const routes = require('express').Router(); /** used to parse the request URL */ const url = require('url'); -routes.get('/', (request, result) => +routes.get('*', (request, result) => { + console.log("ping"); const filename = url.parse(request.url, true).pathname; require("../../includes/downloads.js").main(result, filename); }); diff --git a/routes/index.js b/routes/index.js index a30cbad..faf2e42 100644 --- a/routes/index.js +++ b/routes/index.js @@ -6,6 +6,9 @@ routes.use('/about', about); const contact = require('./contact'); routes.use('/contact', contact); +const downloads = require('./downloads'); +routes.use('/downloads', downloads); + const includes = require('./includes'); routes.use('/includes', includes); @@ -22,7 +25,7 @@ routes.get('/', (request, result) => routes.get('*', (request, result) => { - //error + console.log("Un registered event.") }); diff --git a/utils/utils.js b/utils/utils.js index 534d7a9..933089a 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -111,8 +111,13 @@ module.exports= * @param result * @returns {*} */ - print404: function() + print404: function(result) { - return this.include("includes/html/404.html"); + includes.include("includes/html/404.html").then(function(html) + { + result.write(html); + result.end(); + }) + } }; \ No newline at end of file