Skip to content

Commit

Permalink
Merge pull request #53 from joyja/databaseVolume
Browse files Browse the repository at this point in the history
Database volume
  • Loading branch information
joyja committed Jun 10, 2020
2 parents a1edf99 + 6527119 commit 04341cb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
16 changes: 5 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,13 @@ module.exports = {
env: {
browser: false,
node: true,
"es6": true
es6: true,
},
parserOptions: {
"ecmaVersion": 2018
ecmaVersion: 2018,
},
extends: [
'prettier',
'plugin:prettier/recommended',
],
plugins: [
'prettier'
],
extends: ['prettier', 'plugin:prettier/recommended'],
plugins: ['prettier'],
// add your custom rules here
rules: {
}
rules: {},
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,4 @@ sw.*
# production database
/spread-edge*.db
/tentacle-edge*.db
database
13 changes: 9 additions & 4 deletions src/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ let db = undefined
let httpServer = undefined
let server = undefined
start = async function (dbFilename) {
const dir = './database'

if (!fs.existsSync(dir)) {
fs.mkdirSync(dir)
}
let fileExisted = false
// Create database
if (dbFilename === `:memory:`) {
Expand All @@ -24,10 +29,10 @@ start = async function (dbFilename) {
}
})
} else {
if (fs.existsSync(`./${dbFilename}.db`)) {
if (fs.existsSync(`${dir}/${dbFilename}.db`)) {
fileExisted = true
}
db = new sqlite3.cached.Database(`./${dbFilename}.db`, (error) => {
db = new sqlite3.cached.Database(`${dir}/${dbFilename}.db`, (error) => {
if (error) {
throw error
}
Expand Down Expand Up @@ -65,8 +70,8 @@ start = async function (dbFilename) {
userVersion !== desiredUserVersion
) {
fs.copyFileSync(
`./${dbFilename}.db`,
`./${dbFilename}-backup-${new Date().toISOString()}.db`
`${dir}/${dbFilename}.db`,
`${dir}/${dbFilename}-backup-${new Date().toISOString()}.db`
)
}
//Check for administrator account and initialize one if it doesn't exist.
Expand Down

0 comments on commit 04341cb

Please sign in to comment.