suzanne.soy/wiki.gruntnetwork.com--zimmer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zimmer.js preProcessed

Browse Source
This commit is contained in:
vss-devel 2019-07-17 13:25:46 +03:00
parent 1d3ee5e10d
commit 5db38f9d12
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
zimmer.js
View File

@ -73,8 +73,6 @@ var wikiDb
var dirQueue var dirQueue
var clusterWriter var clusterWriter
let preProcessed = false
var mainPage = {} var mainPage = {}
// - layout, eg. the LayoutPage, CSS, favicon.png (48x48), JavaScript and images not related to the articles // - layout, eg. the LayoutPage, CSS, favicon.png (48x48), JavaScript and images not related to the articles
@ -1205,16 +1203,15 @@ function sortArticles () {
) )
} }
async function loadRedirects () { async function csvRedirects () {
var redirectsFile const csv = command.redirects ?
if ( preProcessed ) expandHomeDir( command.redirects ) :
redirectsFile = osPath.join( srcPath, 'redirects.csv' ) osPath.join( srcPath, 'redirects.csv' )
else if ( command.redirects )
redirectsFile = expandHomeDir( command.redirects ) if ( ! await fs.exists( csv ))
else
return return
const getRow = cvsReader( redirectsFile, { const getRow = cvsReader( csv, {
columns:[ 'nameSpace', 'path', 'title', 'to' ], columns:[ 'nameSpace', 'path', 'title', 'to' ],
delimiter: '\t', delimiter: '\t',
relax_column_count: true relax_column_count: true
@ -1222,7 +1219,7 @@ async function loadRedirects () {
let row let row
while ( row = await getRow() ) { while ( row = await getRow() ) {
log( 'loadRedirects', row ) log( 'csvRedirects', row )
await new Redirect( row ).process() await new Redirect( row ).process()
} }
} }
@ -1441,6 +1438,7 @@ async function initialise () {
await out.write( Buffer.alloc( headerLength + maxMimeLength )) await out.write( Buffer.alloc( headerLength + maxMimeLength ))
var dbPath = osPath.join( srcPath, 'metadata.db' ) var dbPath = osPath.join( srcPath, 'metadata.db' )
let preProcessed = false
if ( await fs.exists( dbPath )) { if ( await fs.exists( dbPath )) {
preProcessed = true preProcessed = true
try { try {
@ -1449,11 +1447,12 @@ async function initialise () {
warning( 'mainpage error', err ) warning( 'mainpage error', err )
} }
await openWikiDb( dbPath ) await openWikiDb( dbPath )
return loadMimeTypes() await loadMimeTypes()
} else { } else {
await newWikiDb() await newWikiDb()
return fillInMetadata() await fillInMetadata()
} }
return preProcessed
} }
async function rawLoader () { async function rawLoader () {
@ -1538,7 +1537,7 @@ async function loadMimeTypes () {
async function loadRawArticles () { async function loadRawArticles () {
await rawLoader() await rawLoader()
return loadRedirects() return csvRedirects()
} }
async function postProcess () { async function postProcess () {
@ -1558,7 +1557,7 @@ async function finalise () {
} }
async function core () { async function core () {
await initialise() const preProcessed = await initialise()
await ( preProcessed ? loadPreProcessedArticles() : loadRawArticles() ) await ( preProcessed ? loadPreProcessedArticles() : loadRawArticles() )
await postProcess() await postProcess()
await finalise() await finalise()