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

naming

Browse Source
This commit is contained in:
v 2018-11-22 18:26:14 +03:00
parent dae82fcadb
commit a98b0d9a63
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
wikizimmer.js
View File

@ -401,22 +401,22 @@ class WikiItem {
}) })
} }
baseName () { basePath () {
const urlp = urlconv.parse( this.url ) const urlp = urlconv.parse( this.url )
const pathp = osPath.parse( urlp.pathname ) const pathp = osPath.parse( urlp.pathname )
return sanitizeFN( decodeURIComponent( pathp.base )) return sanitizeFN( decodeURIComponent( pathp.base ))
} }
localPath () { localPath () {
return '/' + this.zimNameSpace + '/' + this.baseName() return this.zimNameSpace + '/' + this.basePath()
} }
rootPath () { pathToTop () {
return '../'.repeat( this.baseName().split( '/' ).length - 1 ) return '../'.repeat( this.basePath().split( '/' ).length - 1 )
} }
urlKey () { urlKey () {
return this.zimNameSpace + this.baseName() return this.zimNameSpace + this.basePath()
} }
titleKey () { titleKey () {
@ -438,7 +438,7 @@ class WikiItem {
if ( data == null ) if ( data == null )
return Promise.reject( new Error( 'data == null' )) return Promise.reject( new Error( 'data == null' ))
const savePath = wiki.saveDir + this.localPath() const savePath = osPath.join( wiki.saveDir, this.localPath())
log( '+', savePath ) log( '+', savePath )
return fs.outputFile( savePath, data ) return fs.outputFile( savePath, data )
@ -497,14 +497,14 @@ class WikiItem {
// } // }
class ArticleStub extends WikiItem { class ArticleStub extends WikiItem {
constructor ( pageInfo ) { constructor ( pageInfo ) {
super( 'A', urlconv.resolve( wiki.articleBase, pageInfo.fullurl ), pageInfo.title ) super( 'A', urlconv.resolve( wiki.articleUriPrefix, pageInfo.fullurl ), pageInfo.title )
this.info = pageInfo this.info = pageInfo
this.mwId = pageInfo.pageid this.mwId = pageInfo.pageid
this.revision = pageInfo.lastrevid this.revision = pageInfo.lastrevid
} }
baseName () { basePath () {
if ( this.url && this.url.startsWith( wiki.articleBase )) { if ( this.url && this.url.startsWith( wiki.articleUriPrefix )) {
const urlParsed = urlconv.parse( this.url ) const urlParsed = urlconv.parse( this.url )
const subPath = urlParsed.pathname.replace( wiki.articlePath, '' ) const subPath = urlParsed.pathname.replace( wiki.articlePath, '' )
return sanitizeFN( decodeURIComponent( subPath )) + '.html' return sanitizeFN( decodeURIComponent( subPath )) + '.html'
@ -561,7 +561,7 @@ class Article extends ArticleStub {
// modify links // modify links
let css = dom( '#layout-css' ) let css = dom( '#layout-css' )
css.attr( 'href', this.rootPath() + css.attr( 'href' )) css.attr( 'href', this.pathToTop() + css.attr( 'href' ))
dom( 'a' ).each( (i, elem) => { dom( 'a' ).each( (i, elem) => {
this.transformGeoLink( elem ) this.transformGeoLink( elem )
@ -603,12 +603,12 @@ class Article extends ArticleStub {
if ( ! path || path == '/' ) if ( ! path || path == '/' )
return return
const baseName = link.baseName() const basePath = link.basePath()
if ( baseName != null ) { // local article link if ( basePath != null ) { // local article link
if ( path.includes( ':' )) { if ( path.includes( ':' )) {
delete elem.attribs.href // block other name spaces delete elem.attribs.href // block other name spaces
} else { } else {
elem.attribs.href = this.rootPath() + baseName elem.attribs.href = this.pathToTop() + basePath
} }
} }
const pathlc = path.toLowerCase() const pathlc = path.toLowerCase()
@ -644,7 +644,7 @@ class Article extends ArticleStub {
async saveImage ( url ) { async saveImage ( url ) {
const image = new Image( url ) const image = new Image( url )
const localPath = await image.process() const localPath = await image.process()
return encodeURI( this.rootPath() + '..' + localPath ) return encodeURI( this.pathToTop() + '../' + localPath )
} }
} }
@ -692,7 +692,7 @@ class MainPage extends Redirect {
constructor ( ) { constructor ( ) {
super({ fullurl: 'mainpage' }) super({ fullurl: 'mainpage' })
} }
baseName () { basePath () {
return 'mainpage' return 'mainpage'
} }
storeMetadata ( ) { storeMetadata ( ) {
@ -725,7 +725,7 @@ class Metadata extends WikiItem {
const urlCache = new lru({ maxSize:500 }) const urlCache = new lru({ maxSize:500 })
class PageComponent extends WikiItem { class PageComponent extends WikiItem {
baseName () { basePath () {
let name let name
const urlp = urlconv.parse( this.url ) const urlp = urlconv.parse( this.url )
if ( urlp.query && urlp.query.includes( '=' ) && this.mimeType ) { if ( urlp.query && urlp.query.includes( '=' ) && this.mimeType ) {
@ -745,7 +745,7 @@ class PageComponent extends WikiItem {
saved = super.process() saved = super.process()
urlCache.set( this.url, saved ) urlCache.set( this.url, saved )
saved.then( localPath => { // do keep item's data in the cache saved.then( localPath => { // keep item's data in the cache
urlCache.set( this.url, Promise.resolve( localPath )) urlCache.set( this.url, Promise.resolve( localPath ))
}) })
} }
@ -795,7 +795,7 @@ class FavIcon extends LayoutItem {
constructor ( ) { constructor ( ) {
super( wiki.info.general.logo || 'http://www.openzim.org/w/images/e/e8/OpenZIM-wiki.png' ) super( wiki.info.general.logo || 'http://www.openzim.org/w/images/e/e8/OpenZIM-wiki.png' )
} }
baseName () { basePath () {
return 'favicon' return 'favicon'
} }
} }
@ -833,7 +833,7 @@ class Style extends LayoutItem {
let out = match let out = match
const rurl = resolvedUrls.shift() const rurl = resolvedUrls.shift()
if ( rurl != null ) { if ( rurl != null ) {
let newUrl = this.rootPath() + '..' + rurl let newUrl = this.pathToTop() + '..' + rurl
out = start + newUrl + end out = start + newUrl + end
} }
return out return out
@ -939,8 +939,9 @@ async function getSiteInfo () {
wiki.indexUrl = info.general.script wiki.indexUrl = info.general.script
wiki.mainPage = info.general.mainpage wiki.mainPage = info.general.mainpage
wiki.articlePath = info.general.articlepath.split('$')[0] wiki.articlePath = info.general.articlepath.split('$')[0]
wiki.articleBase = info.general.base.split( wiki.articlePath )[0] + wiki.articlePath wiki.articleUriPrefix = info.general.base.split( wiki.articlePath )[0] + wiki.articlePath
wiki.baseParsed = urlconv.parse( wiki.articleBase ) wiki.baseParsed = urlconv.parse( wiki.articleUriPrefix )
wiki.uri = urlconv.resolve( wiki.articleUriPrefix, wiki.info.general.server )
wiki.nameSpaces = new NameSpaceSet( info ) wiki.nameSpaces = new NameSpaceSet( info )
} }
@ -977,7 +978,7 @@ async function saveMetadata () {
//~ Tags: '', //~ Tags: '',
//~ Relation: '', //~ Relation: '',
//~ Counter: '', //~ Counter: '',
Source: urlconv.resolve( wiki.articleBase, wiki.info.general.server ), Source: wiki.uri,
} }
await new MainPage().process() await new MainPage().process()