flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

parallel preview creation done...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-05-26 00:49:09 +03:00
parent 83ff6380c2
commit 85191b261a
1 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
ui (gen4)/features/sharp.js
View File

@ -57,9 +57,12 @@ var SharpActions = actions.Actions({
] ]
}, },
// XXX BUG (nw.js): this does not work until child_process.fork(..) is fixed... // NOTE: post handlers are pushed in .makePreviews(..)
// XXX might be a good idea to make this a bit more generic...
// XXX might be a good idea to use tasks to throttle....
startPreviewWorker: ['- Sharp/', startPreviewWorker: ['- Sharp/',
function(){ function(){
var that = this
if(this.previewConstructorWorker){ if(this.previewConstructorWorker){
return return
} }
@ -74,16 +77,18 @@ var SharpActions = actions.Actions({
} else { } else {
var ticket = res.ticket var ticket = res.ticket
// clear listener...
if(res.status == 'completed'){ if(res.status == 'completed'){
// XXX clear the listener... that.previewConstructorWorker.__post_handlers[res.ticket](null, 'completed')
// XXX delete that.previewConstructorWorker.__post_handlers[res.ticket]
} else { } else {
// XXX get listener and pass it the res.data that.previewConstructorWorker.__post_handlers[res.ticket](res.err, res.data)
// XXX
} }
} }
}) })
this.previewConstructorWorker.__post_handlers = {}
}], }],
stopPreviewWorker: ['- Sharp/', stopPreviewWorker: ['- Sharp/',
function(){ function(){
@ -106,7 +111,6 @@ var SharpActions = actions.Actions({
// -> actions // -> actions
// //
// XXX should this account for non-jpeg images??? // XXX should this account for non-jpeg images???
// XXX do this in the background...
makePreviews: ['Sharp/Make image previews', makePreviews: ['Sharp/Make image previews',
function(images, sizes, base_path, logger){ function(images, sizes, base_path, logger){
var that = this var that = this
@ -162,17 +166,49 @@ var SharpActions = actions.Actions({
var path_tpl = that.config['preview-path-template'] var path_tpl = that.config['preview-path-template']
.replace(/\$INDEX|\$\{INDEX\}/g, that.config['index-dir'] || '.ImageGrid') .replace(/\$INDEX|\$\{INDEX\}/g, that.config['index-dir'] || '.ImageGrid')
var post_handler = function(err, data){
if(data.status == 'done' || data.status == 'skipped'){
// get/make preview list...
var preview = that.images[data.gid].preview =
that.images[data.gid].preview || {}
preview[data.res + 'px'] = data.path
that.markChanged(data.gid)
}
logger && logger.emit(data.status, data.path)
}
// now do the work (async)... // now do the work (async)...
if(this.previewConstructorWorker){ if(this.previewConstructorWorker){
return Promise.all(Object.keys(data).map(function(base_path){ return Promise.all(Object.keys(data).map(function(base_path){
// XXX need feedback... return new Promise(function(resolve, reject){
// XXX need to resolve the promises on completion... var ticket = Date.now()
// XXX need to update image data and mark images as changed... while(ticket in that.previewConstructorWorker.__post_handlers){
that.previewConstructorWorker.send({ ticket = Date.now()
images: data[base_path], }
sizes: sizes,
base_path: base_path, that.previewConstructorWorker.send({
target_tpl: path_tpl, ticket: ticket,
images: data[base_path],
sizes: sizes,
base_path: base_path,
target_tpl: path_tpl,
})
that.previewConstructorWorker.__post_handlers[ticket] = function(err, data){
// XXX
if(err){
reject(err)
}
if(data == 'completed'){
resolve()
} else {
post_handler(err, data)
}
}
}) })
})) }))
@ -180,23 +216,7 @@ var SharpActions = actions.Actions({
} else { } else {
return Promise.all(Object.keys(data).map(function(base_path){ return Promise.all(Object.keys(data).map(function(base_path){
return preview.makePreviews( return preview.makePreviews(
data[base_path], data[base_path], sizes, base_path, path_tpl, post_handler)
sizes,
base_path,
path_tpl,
function(err, data){
if(data.status == 'done' || data.status == 'skipped'){
// get/make preview list...
var preview = that.images[data.gid].preview =
that.images[data.gid].preview || {}
preview[data.res + 'px'] = data.path
that.markChanged(data.gid)
}
logger && logger.emit(data.status, data.path)
})
})) }))
} }
}], }],