From a40b583d0340572943dc95acf7f096cb4d0cb743 Mon Sep 17 00:00:00 2001 From: v Date: Wed, 28 Nov 2018 18:41:09 +0300 Subject: [PATCH] minor --- wikizimmer.js | 62 ++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/wikizimmer.js b/wikizimmer.js index e2ee555..dba8d3a 100755 --- a/wikizimmer.js +++ b/wikizimmer.js @@ -445,13 +445,12 @@ class WikiItem { storeData ( data ) { if ( data == null ) - return Promise.reject( new Error( 'data == null' )) + return const savePath = osPath.join( wiki.saveDir, this.localPath()) log( '+', savePath ) return fs.outputFile( savePath, data ) - .then( () => this.localPath() ) } async storeMetadata ( ) { @@ -1187,41 +1186,38 @@ function initMetadataStorage ( samplePageDOM ) { .then( () => sqlite.open( dbName )) .then( db => { wiki.db = db - return wiki.db.exec( - 'PRAGMA synchronous = OFF;' + - //~ 'PRAGMA journal_mode = OFF;' + - 'PRAGMA journal_mode = WAL;' + + return wiki.db.exec( + 'PRAGMA synchronous = OFF;' + + //~ 'PRAGMA journal_mode = OFF;' + + 'PRAGMA journal_mode = WAL;' + - 'BEGIN;' + + 'BEGIN;' + - 'CREATE TABLE articles (' + [ - 'id INTEGER PRIMARY KEY', - 'mimeId INTEGER', - 'revision INTEGER', - 'urlKey TEXT', - 'titleKey TEXT', - ].join(',') + - ');' + - 'CREATE TABLE redirects (' + - 'id INTEGER PRIMARY KEY,' + - 'targetKey TEXT, ' + - 'fragment TEXT ' + - ');' + - 'CREATE TABLE mimeTypes (' + - 'id INTEGER PRIMARY KEY,' + - 'value TEXT' + - ');' + - 'CREATE TABLE continue (' + - 'id INTEGER PRIMARY KEY,' + - '"from" TEXT' + - ');' + + 'CREATE TABLE articles (' + [ + 'id INTEGER PRIMARY KEY', + 'mimeId INTEGER', + 'revision INTEGER', + 'urlKey TEXT UNIQUE', + 'titleKey TEXT', + ].join(',') + + ');' + + 'CREATE TABLE redirects (' + + 'id INTEGER PRIMARY KEY,' + + 'targetKey TEXT, ' + + 'fragment TEXT ' + + ');' + + 'CREATE TABLE mimeTypes (' + + 'id INTEGER PRIMARY KEY,' + + 'value TEXT' + + ');' + + 'CREATE TABLE continue (' + + 'id INTEGER PRIMARY KEY,' + + '"from" TEXT' + + ');' + - 'COMMIT;' + - '' - ) - } + 'COMMIT;' + + '' ) - .then( () => samplePageDOM ) } function closeMetadataStorage () {