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

blacklist option

Browse Source
This commit is contained in:
v 2018-11-28 18:17:01 +03:00
parent 8302e7c991
commit 9a616283cb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wikizimmer.js
View File

@ -466,7 +466,9 @@ class WikiItem {
} }
process () { process () {
return Promise.resolve() if ( this.blackListed() )
return ''
return Promise.resolve()
.then( () => this.getData()) .then( () => this.getData())
.then( data => this.store( data )) .then( data => this.store( data ))
.then( () => this.storeMetadata() ) .then( () => this.storeMetadata() )
@ -860,6 +862,8 @@ class Style extends LayoutItem {
if ( rurl != null ) { if ( rurl != null ) {
let newUrl = this.pathToTop() + '..' + rurl let newUrl = this.pathToTop() + '..' + rurl
out = start + newUrl + end out = start + newUrl + end
} else {
out = ''
} }
return out return out
}) })
@ -882,7 +886,7 @@ class GlobalCss extends LayoutItem {
const requests = cssLinks.map( elem => this.getCss( elem.attribs.href )) const requests = cssLinks.map( elem => this.getCss( elem.attribs.href ))
const stub = osPath.resolve( module.filename, '../stub.css' ) const stub = osPath.resolve( module.filename, '../stub.css' )
requests.unshift( fs.readFile( stub )) requests.unshift( fs.readFile( stub, 'utf8' ))
const chunks = await Promise.all( requests ) const chunks = await Promise.all( requests )
return chunks.join( '\n' ) return chunks.join( '\n' )
@ -890,14 +894,14 @@ class GlobalCss extends LayoutItem {
async getCss( cssUrl ) { async getCss( cssUrl ) {
let css = new Style( cssUrl ) let css = new Style( cssUrl )
const src = await css.getData() const data = await css.getData()
const outcss = `/* const outcss = `/*
* *
* from ${cssUrl} * from ${cssUrl}
* *
*/ */
${src} ${data}
` `
return outcss return outcss
} }
@ -1247,7 +1251,6 @@ function core ( samplePage ) {
} }
function main () { function main () {
command command
.version( packageInfo.version ) .version( packageInfo.version )
.arguments( '<wiki-page-URL>' ) .arguments( '<wiki-page-URL>' )
@ -1266,10 +1269,13 @@ function main () {
.option( '-d, --no-download-errors', "ignore download errors, 404 error is ignored anyway" ) .option( '-d, --no-download-errors', "ignore download errors, 404 error is ignored anyway" )
.option( '-e, --retry-external [times]', "number of retries on external site error" ) .option( '-e, --retry-external [times]', "number of retries on external site error" )
.option( '--user-agent [firefox or string]', "set user agent" ) .option( '--user-agent [firefox or string]', "set user agent" )
.option( '-p, --url-replace [parrern|replacement,...]', "URL replacements", ( patterns ) => { .option( '-p, --url-replace [pattern|replacement,...]', "URL replacements", ( patterns ) => {
const repls = patterns.split( ',' ) const repls = patterns.split( ',' )
return repls.map( r => r.split( '|' )) return repls.map( r => r.split( '|' ))
} ) } )
.option( '-b, --url-blacklist [pattern|...]', "blacklisted URLs", ( patterns ) => {
return patterns.split( '|' )
} )
.parse( process.argv ) .parse( process.argv )
log( command.opts() ) log( command.opts() )