From 26dd6b079822c5ebbbcd55bfab4542188becbdbe Mon Sep 17 00:00:00 2001 From: Yarmo Mackenbach Date: Wed, 21 Oct 2020 10:32:03 +0200 Subject: [PATCH] Cleaning up code --- index.js | 20 +++----------------- routes/main.js | 5 ----- server/util.js | 10 ---------- 3 files changed, 3 insertions(+), 32 deletions(-) diff --git a/index.js b/index.js index 2bd7982..ec14d1b 100644 --- a/index.js +++ b/index.js @@ -1,36 +1,22 @@ const express = require('express') const app = express() const fs = require('fs') +const path = require('path') const util = require('./server/util') require('dotenv').config() app.set('env', process.env.NODE_ENV || "production") app.set('view engine', 'pug') app.set('port', process.env.PORT || 3000) -app.set('db_path', process.env.DB_PATH || "/data") - -if (!fs.existsSync(app.get('db_path'))) { - fs.mkdirSync(app.get('db_path')) -} -const db_path_file = path.join(app.get('db_path'), 'db.json') -if (!fs.existsSync(db_path_file)) { - fs.closeSync(fs.openSync(db_path_file, 'w')); -} -const adapter = new FileSync(db_path_file) -const db = low(adapter) -db.defaults({ posts: [] }) - .write() - -app.use((req, res, next) => { - req.db = db -}) app.use('/', require('./routes/main')) app.use('/', require('./routes/static')) app.use('/feed', require('./routes/feed')) app.use('/rss', require('./routes/feed')) +console.log('Updating DB...') util.updateDB() +console.log('- done!') app.listen(app.get('port'), () => { console.log(`Node server listening at http://localhost:${app.get('port')}`) diff --git a/routes/main.js b/routes/main.js index 24496a0..893b603 100644 --- a/routes/main.js +++ b/routes/main.js @@ -55,9 +55,4 @@ router.get('/pgp', (req, res) => { res.render('pgp', { title: 'PGP — yarmo.eu' }) }) -// router.get('/updateDB', async (req, res) => { -// const response = await util.updateDB() -// res.send(response) -// }) - module.exports = router diff --git a/server/util.js b/server/util.js index 00e395a..6d74c7e 100644 --- a/server/util.js +++ b/server/util.js @@ -112,16 +112,6 @@ const getNotesFromFiles = async (opts) => { } const getPost = async (slug) => { - // let post = null, posts = await getBlogPosts() - // posts = _.filter(posts, (p) => { return slug == p.slug }) - // post = posts.length > 0 ? posts[0] : null - // - // if (!post) { - // posts = await getNotes() - // posts = _.filter(posts, (p) => { return slug == p.slug }) - // post = posts.length > 0 ? posts[0] : null - // } - let post = db.get('posts') .find({ slug: slug }) .value()