From 931def611f8730fc88fb9735d893a7f4096477fd Mon Sep 17 00:00:00 2001 From: v Date: Wed, 30 Aug 2017 18:38:15 +0300 Subject: [PATCH] commander instead of yargs --- package.json | 16 ++++++++--- zimmer.js | 75 +++++++++++++++++++++++++--------------------------- 2 files changed, 48 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index 2094e82..6e4084c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zimmer", - "version": "0.0.2", + "version": "0.1.0", "description": "Zim file packer", "main": "zimmer.js", "scripts": { @@ -8,28 +8,36 @@ }, "private": true, "keywords": [ + "mediawiki", "zim", "pack" ], "dependencies": { "bluebird": "*", "cheerio": "*", - "child-process": "^1.0.2", + "child-process": "*", "csv-parse": "*", - "csv-stringify": "*", + "encodeurl": "^1.0.1", "expand-home-dir": "*", "fs-extra": "^3.0.1", "generic-pool": "^3.1.7", + "iconv-lite": "^0.4.17", + "langs": "^2.0.0", "lzma-native": "*", "mime-db": "*", "mime-types": "*", "mmmagic": "*", "mozjpeg": "*", "mz": "^2.6.0", + "quick-lru": "^1.0.0", + "request": "^2.81.0", + "request-promise": "^4.2.1", + "sanitize-filename": "^1.6.1", "sharp": "^0.17.3", "sqlite": "^2.8.0", + "sqlite3": "*", "uuid": "*", - "yargs": "*" + "commander": "^2.11.0" }, "author": "Vadim Shlykahov", "license": "ISC" diff --git a/zimmer.js b/zimmer.js index 47ad2c2..27389fd 100755 --- a/zimmer.js +++ b/zimmer.js @@ -29,20 +29,21 @@ SOFTWARE. */ +const packageInfo = require('./package.json'); const Promise = require( 'bluebird' ) const os = require( 'os' ) -const process = require( 'process' ) -const yargs = require( 'yargs' ) -const util = require( 'util' ) -const fs = require( 'fs-extra' ) const osPath = require( 'path' ) +const process = require( 'process' ) +const url = require( 'url' ) +const crypto = require( "crypto" ) + +const argv = require('commander') +const fs = require( 'fs-extra' ) const expandHomeDir = require( 'expand-home-dir' ) const lzma = require( 'lzma-native' ) const cheerio = require('cheerio') -const url = require( 'url' ) const uuid = require( "uuid" ) -const crypto = require( "crypto" ) const csvParse = require( 'csv-parse' ) const csvParseSync = require( 'csv-parse/lib/sync' ) const zlib = require( 'mz/zlib' ) @@ -61,8 +62,6 @@ const mimeMagic = new mmmagic.Magic( mmmagic.MAGIC_MIME_TYPE ) const cpuCount = os.cpus().length -var argv - var srcPath var outPath var out // output file writer @@ -1552,42 +1551,40 @@ function core () { // -i, --withFullTextIndex index the content and add it to the ZIM. function main () { - argv = yargs.usage( 'Pack a directory into a zim file\nUsage: $0' - + '\nExample: $0 ' ) - //~ .boolean( 'optimg' ) - .options({ - 'w': {alias: 'welcome', default: 'index.htm'}, - 'f': {alias: 'favicon', default: 'favicon.png'}, - 'l': {alias: 'language', default: 'eng'}, - 't': {alias: 'title', default: ''}, - 'd': {alias: 'description', default: ''}, - 'c': {alias: 'creator', default: ''}, - 'p': {alias: 'publisher', default: ''}, - 'v': {alias: 'verbose', type: 'boolean', default: false}, - 'm': {alias: 'minChunkSize', type: 'number', default: ClusterSizeThreshold / 1024}, - 'x': {alias: 'inflateHtml', type: 'boolean', default: false}, - 'u': {alias: 'uniqueNamespace', type: 'boolean', default: false}, - //~ 'r': {alias: 'redirects', default: 'redirects.csv'}, - 'r': {alias: 'redirects', default: ''}, - //~ 'i': {alias: 'withFullTextIndex', type:'boolean', default: false}, - 'h': {alias: 'help'}, - 'optimg': {type: 'boolean', default: false}, - 'jpegquality': {type: 'number', default: 60}, - }) - .help( 'help' ) - //~ .strict() - .argv + + argv + .version( packageInfo.version ) + .description( 'Pack a directory into a zim file' ) + .arguments( ' [output...]' ) + // Mandatory arguments: + .option( '-w, --welcome ', 'path of default/main HTML page. The path must be relative to HTML_DIRECTORY', 'index.htm' ) + .option( '-f, --favicon ', 'path of ZIM file favicon. The path must be relative to HTML_DIRECTORY and the image a 48x48 PNG', 'favicon.png' ) + .option( '-l, --language ', 'language code of the content in ISO639-3', 'eng' ) + .option( '-t, --title ', 'title of the ZIM file', '' ) + .option( '-d, --description <text>', 'short description of the content', '' ) + .option( '-c, --creator <text>', 'creator(s) of the content', '' ) + .option( '-p, --publisher <text>', 'creator of the ZIM file itself', '' ) + // Optional arguments: + .option( '-v, --verbose', 'print processing details on STDOUT' ) + .option( '-m, --minChunkSize <size>', 'number of bytes per ZIM cluster (default: 2048)', parseInt, 2048 ) + .option( '-x, --inflateHtml', 'try to inflate HTML files before packing (*.html, *.htm, ...)' ) + .option( '-u, --uniqueNamespace', 'put everything in the same namespace "A". Might be necessary to avoid problems with dynamic/javascript data loading' ) + .option( '-r, --redirects <path>', 'path to the CSV file with the list of redirects (url, title, target_url tab separated)', '' ) + //~ .option( '-i, --withFullTextIndex', 'index the content and add it to the ZIM' ) + .option( '--optimg', 'optimise images' ) + .option( '--jpegquality <factor>', 'JPEG quality', parseInt, 60 ) + .parse( process.argv ) log( argv ) - var pargs = argv._ + var args = argv.args - while ( pargs[ 0 ] == '' ) // if mwoffliner prepends with empty extra parameter(s) - pargs.shift() + while ( args[ 0 ] == '' ) // if mwoffliner prepends with empty extra parameter(s) + args.shift() - srcPath = expandHomeDir( pargs[ 0 ]) - if ( argv._[ 1 ]) - outPath = expandHomeDir( pargs[ 1 ]) + srcPath = expandHomeDir( args[ 0 ]) + if ( args[ 1 ]) + outPath = expandHomeDir( args[ 1 ]) else { var parsed = osPath.parse( srcPath ) outPath = parsed.base + '.zim'