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

working on preview erporting options...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-04-07 17:50:22 +03:00
parent e86a471e63
commit 0e026c2f86
2 changed files with 132 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,8 @@ var SharpActions = actions.Actions({
// XXX should this account for non-jpeg images???
// XXX BUG?: this breaks on PNG images...
// XXX log: count gids and not specific images...
makePreviews: ['Sharp|File/Make image $previews',
core.doc`Make image previews
@ -140,6 +142,10 @@ var SharpActions = actions.Actions({
logger = logger || this.logger
logger = logger && logger.push('Previews')
// XXX
var logger_mode = 'report-gids'
//var logger_mode = 'report-previews'
// get/normalize images...
//images = images || this.current
@ -150,6 +156,19 @@ var SharpActions = actions.Actions({
: images
images = images instanceof Array ? images : [images]
//
// Format:
// {
// <base_path>: [
// {
// source: <image-path>,
// gid: <gid>,
// },
// ...
// ],
// ...
// }
//
// NOTE: if base_path is not provided this will base the
// previews in .base_path for each image, usually this
// is where the index resides but might not be the
@ -160,12 +179,10 @@ var SharpActions = actions.Actions({
var base = base_path || img.base_path || that.location.path
var d = data[base] = data[base] || []
d.push({
source: that.getImagePath(gid),
gid: gid,
})
})
}) })
// get/normalize sizes....
@ -191,8 +208,11 @@ var SharpActions = actions.Actions({
var path_tpl = that.config['preview-path-template']
.replace(/\$INDEX|\$\{INDEX\}/g, that.config['index-dir'] || '.ImageGrid')
var post_handler = function(err, data){
if(data.status == 'done' || data.status == 'skipped'){
if(data.res != 'all'
&& (data.status == 'done'
|| data.status == 'skipped')){
// get/make preview list...
var img = that.images[data.gid]
var preview = img.preview =
@ -210,48 +230,56 @@ var SharpActions = actions.Actions({
that.markChanged('images', [data.gid])
}
logger && logger.emit(data.status, data.path)
}
// NOTE: this will handle both 'queue' and 'resolved' statuses...
logger &&
( logger_mode == 'report-gids' ?
// report gid-level progress...
(data.res == 'all'
&& logger.emit(data.status, data.path))
// report preview-level progress...
: (data.res != 'all'
&& logger.emit(data.status, data.path)) ) }
// now do the work (async)...
if(this.previewConstructorWorker){
return Promise.all(Object.keys(data).map(function(base_path){
return Promise.all(
Object.keys(data)
.map(function(base_path){
return new Promise(function(resolve, reject){
do {
var ticket = Date.now()
while(ticket in that.previewConstructorWorker.__post_handlers){
ticket = Date.now()
}
} while(ticket in that.previewConstructorWorker.__post_handlers)
that.previewConstructorWorker.send({
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
that.previewConstructorWorker.__post_handlers[ticket] =
function(err, data){
if(err){
reject(err)
return reject(err)
}
if(data == 'completed'){
data == 'completed' ?
resolve()
} else {
post_handler(err, data)
}
}
})
}))
: post_handler(err, data) }
}) }))
// now do the work (sync)...
} else {
return Promise.all(Object.keys(data).map(function(base_path){
return Promise.all(
Object.keys(data)
// NOTE: this will handle images batched by .base_path...
.map(function(base_path){
return preview.makePreviews(
data[base_path], sizes, base_path, path_tpl, post_handler)
}))
}
data[base_path],
sizes,
base_path,
path_tpl,
post_handler) }))}
}],
})

24
ui (gen4)/lib/preview.js
View File

@ -41,6 +41,7 @@ if(typeof(process) != 'undefined'){
// ...
// ]
//
// XXX add a callback call when a gid is done...
var makePreviews =
module.makePreviews =
function(images, sizes, base_path, target_tpl, callback){
@ -54,6 +55,12 @@ function(images, sizes, base_path, target_tpl, callback){
var gid = data.gid || ''
var source = data.source
callback && callback(null, {
status: 'queued',
gid: gid,
res: 'all',
})
var ext = pathlib.extname(source)
var name = pathlib.basename(source)
.replace(RegExp(ext + '$'), '')
@ -68,7 +75,9 @@ function(images, sizes, base_path, target_tpl, callback){
var orig_res = Math.max(metadata.width, metadata.height)
// process previews...
return Promise.all(sizes.map(function(res){
return Promise
.all(sizes
.map(function(res){
// skip if image is smaller than res...
if(res >= orig_res){
return
@ -97,9 +106,7 @@ function(images, sizes, base_path, target_tpl, callback){
path: rel,
orientation: metadata.orientation,
})
return
}
return }
// make the actual previews...
return img.clone()
@ -120,7 +127,14 @@ function(images, sizes, base_path, target_tpl, callback){
orientation: metadata.orientation, }) })
})
}))
})
// report a gid is done...
.then(function(){
callback
&& callback(null, {
status: 'done',
gid: gid,
res: 'all',
}) }) })
}))
}