diff --git a/wikizimmer.js b/wikizimmer.js index 0aef964..db5a9d2 100755 --- a/wikizimmer.js +++ b/wikizimmer.js @@ -742,25 +742,8 @@ class MainPage extends WikiMetadata { constructor ( ) { super( 'mainpage' ) } - async getData ( ) { - const reply = await apiPost({ - action: 'query', - titles: wiki.mainPage, - redirects: '', - prop: 'info', - inprop: 'url', - }) - try { - const to = Object.keys( reply.query.pages ).map( key => this.to = reply.query.pages[ key ])[0] - const target = new ArticleStub( to ) - - return target.basePath() - } catch ( err ) { - return null - } - } async save () { - const data = await this.getData() + const data = wiki.mainPage await this.storeData( data ) return this.localPath() } diff --git a/zimmer.js b/zimmer.js index 5c60f1f..01f9ca6 100755 --- a/zimmer.js +++ b/zimmer.js @@ -1319,8 +1319,6 @@ async function storeUrlIndex () { count: header.articleCount, logPrefix: 'storeUrlIndex', rowCb: ( row, index ) => { - if ( row.urlKey == mainPage.urlKey ) - mainPage.index = index return BigInt( row.offset ) } }) @@ -1350,6 +1348,8 @@ async function storeTitleIndex () { count: header.articleCount, logPrefix: 'storeTitleIndex', rowCb: ( row, index ) => { + if ( row.titleKey == mainPage.titleKey ) + mainPage.index = row.articleNumber return row.articleNumber } }) @@ -1444,7 +1444,7 @@ async function initialise () { if ( await fs.exists( dbPath )) { preProcessed = true try { - mainPage.urlKey = 'A' + ( await fs.readFile( osPath.join( srcPath, 'M', 'mainpage' ))).toString() + mainPage.titleKey = 'A' + ( await fs.readFile( osPath.join( srcPath, 'M', 'mainpage' ))).toString() } catch ( err ) { warning( 'mainpage error', err ) }