1
0
mirror of https://github.com/JuanCanham/HackMyResume.git synced 2025-05-02 20:37:08 +01:00

Improve proc spawn behavior.

Interim until async / promises support is in.
This commit is contained in:
hacksalot
2016-02-01 09:25:22 -05:00
parent 36d641801b
commit 212b01092c
8 changed files with 75 additions and 95 deletions

View File

@ -139,7 +139,6 @@ assembleError = ( ex ) ->
when HMSTATUS.pdfGeneration
msg = M2C( this.msgs.pdfGeneration.msg, 'bold' )
msg += chalk.red('\n' + ex.inner) if ex.inner
withStack = true
quit = false
etype = 'error'

View File

@ -15,7 +15,7 @@ module.exports =
resumeNotFoundAlt: 6
inputOutputParity: 7
createNameMissing: 8
pdfgeneration: 9
pdfGeneration: 9
missingPackageJSON: 10
invalid: 11
invalidFormat: 12

View File

@ -6,12 +6,12 @@ Definition of the HtmlPdfCLIGenerator class.
TemplateGenerator = require('./template-generator')
FS = require('fs-extra')
HTML = require( 'html' )
PATH = require('path')
SPAWN = require('../utils/safe-spawn')
SLASH = require('slash');
TemplateGenerator = require './template-generator'
FS = require 'fs-extra'
PATH = require 'path'
SLASH = require 'slash'
_ = require 'underscore'
HMSTATUS = require '../core/status-codes'
@ -29,25 +29,18 @@ HtmlPdfCLIGenerator = module.exports = TemplateGenerator.extend
###* Generate the binary PDF. ###
onBeforeSave: ( info ) ->
try
safe_eng = info.opts.pdf || 'wkhtmltopdf';
if safe_eng != 'none'
engines[ safe_eng ].call this, info.mk, info.outputFile
return null # halt further processing
catch ex
# { [Error: write EPIPE] code: 'EPIPE', errno: 'EPIPE', ... }
# { [Error: ENOENT] }
if ex.inner && ex.inner.code == 'ENOENT'
throw
fluenterror: this.codes.notOnPath
inner: ex.inner
engine: ex.cmd,
stack: ex.inner && ex.inner.stack
else
throw
fluenterror: this.codes.pdfGeneration
inner: ex
stack: ex.stack
safe_eng = info.opts.pdf || 'wkhtmltopdf';
if safe_eng == 'phantom'
safe_eng = 'phantomjs'
if _.has engines, safe_eng
@SPAWN = require '../utils/safe-spawn'
@errHandler = info.opts.errHandler
engines[ safe_eng ].call @, info.mk, info.outputFile, @onError
return null # halt further processing
onError: (ex, param) ->
param.errHandler.err HMSTATUS.pdfGeneration, ex
return
@ -63,11 +56,11 @@ engines =
TODO: If HTML generation has run, reuse that output
TODO: Local web server to ease wkhtmltopdf rendering
###
wkhtmltopdf: (markup, fOut) ->
wkhtmltopdf: (markup, fOut, on_error) ->
# Save the markup to a temporary file
tempFile = fOut.replace /\.pdf$/i, '.pdf.html'
FS.writeFileSync tempFile, markup, 'utf8'
info = SPAWN 'wkhtmltopdf', [ tempFile, fOut ]
@SPAWN 'wkhtmltopdf', [ tempFile, fOut ], false, on_error, @
@ -78,8 +71,7 @@ engines =
TODO: If HTML generation has run, reuse that output
TODO: Local web server to ease Phantom rendering
###
phantom: ( markup, fOut ) ->
phantomjs: ( markup, fOut, on_error ) ->
# Save the markup to a temporary file
tempFile = fOut.replace(/\.pdf$/i, '.pdf.html');
@ -88,4 +80,4 @@ engines =
PATH.resolve( __dirname, '../utils/rasterize.js' ) ) );
sourcePath = SLASH( PATH.relative( process.cwd(), tempFile) );
destPath = SLASH( PATH.relative( process.cwd(), fOut) );
info = SPAWN('phantomjs', [ scriptPath, sourcePath, destPath ]);
@SPAWN 'phantomjs', [ scriptPath, sourcePath, destPath ], false, on_error, @

View File

@ -4,7 +4,9 @@ Safe spawn utility for HackMyResume / FluentCV.
@license MIT. See LICENSE.md for details.
###
module.exports = ( cmd, args, isSync, callback ) ->
###* Safely spawn a process synchronously or asynchronously without throwing an
exception ###
module.exports = ( cmd, args, isSync, callback, param ) ->
try
@ -12,17 +14,17 @@ module.exports = ( cmd, args, isSync, callback ) ->
spawn = require('child_process')[ if isSync then 'spawnSync' else 'spawn'];
info = spawn cmd, args
# Check for error depending on whether we're sync or async
# Check for error depending on whether we're sync or async TODO: Promises
if !isSync
info.on 'error', (err) ->
if callback? then callback err; return
else throw cmd: cmd, inner: err
callback?(err, param)
return
return
else
if info.error
if callback? then callback err; return
else throw cmd: cmd, inner: info.error
callback?(info.error, param)
return cmd: cmd, inner: info.error
catch
if callback? then callback _error
else throw _error
callback?(_error, param)
_error