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

minor cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-07-01 04:21:14 +04:00
parent ec4c347207
commit 4aceeb2a66
1 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ui/compatibility.js
View File

@ -127,7 +127,7 @@ if(window.CEF_dumpJSON != null){
// vips preview generation... // vips preview generation...
// XXX make this queuable... // XXX make this queuable...
window.makeImagePreviews = function(gid){ window.makeImagePreviews = function(gid, sizes){
var img = IMAGES[gid] var img = IMAGES[gid]
var source = normalizePath(img.path) var source = normalizePath(img.path)
@ -136,18 +136,23 @@ if(window.CEF_dumpJSON != null){
var previews = [] var previews = []
// XXX get real sizes from config... // prepare the sizes we are going to be working with...
var sizes = [ if(sizes == null){
150, // XXX get real sizes from config...
350, var sizes = [
900 150,
] 350,
900
]
} else if(typeof(sizes) == typeof(123)){
sizes = [ sizes ]
}
// XXX take this from config... // build usable local path (without 'file:///')...
var path = normalizePath(CACHE_DIR) var path = normalizePath(CACHE_DIR)
path = path.replace(fp, '') path = path.replace(fp, '')
// XXX get cur image size... // get cur image size...
var size_getter = $.Deferred() var size_getter = $.Deferred()
var _i = new Image() var _i = new Image()
_i.onload = function(){ _i.onload = function(){
@ -162,21 +167,24 @@ if(window.CEF_dumpJSON != null){
var deferred = $.Deferred() var deferred = $.Deferred()
previews.push(deferred) previews.push(deferred)
// NOTE: for some magical reason writing this like this: // NOTE: for some magical reason writing this like:
// (function(...){ // (function(...){
// ... // ...
// }(...)) // }(...))
// produces a "undefined is not a function" in except the // produces a "undefined is not a function" in part of the
// first invocation... // invocations, usually the later ones...
var _f = function(size, target_path, deferred){ var _f = function(size, target_path, deferred){
// wait for current image size if needed...
size_getter.done(function(source_size){ size_getter.done(function(source_size){
// skip previews larger than cur image... // skip previews larger than cur image...
if(fs.existsSync(target_path +'/'+ name) || source_size <= size){ if(fs.existsSync(target_path +'/'+ name) || source_size <= size){
console.log('>>> Preview:', name, '('+size+'): Skipped.') //console.log('>>> Preview:', name, '('+size+'): Skipped.')
deferred.notify(gid, size, 'skipped')
return deferred.resolve() return deferred.resolve()
} }
// create the directory then go to its content...
// XXX check for errors... // XXX check for errors...
fse.mkdirRecursive(target_path, function(err){ fse.mkdirRecursive(target_path, function(err){
@ -191,24 +199,23 @@ if(window.CEF_dumpJSON != null){
proc.exec(cmd, function(error, stdout, stderr){ proc.exec(cmd, function(error, stdout, stderr){
if(error != null){ if(error != null){
console.error('>>> Error: preview:', stderr) //console.error('>>> Error: preview:', stderr)
deferred.notify(gid, size, 'error', stderr)
deferred.reject() deferred.reject()
} else { } else {
//console.log('>>> Preview:', name, '('+size+'): Done.')
console.log('>>> Preview:', name, '('+size+'): Done.') deferred.notify(gid, size, 'done')
// update the image structure...
if(!('preview' in img)){ if(!('preview' in img)){
img.preview = {} img.preview = {}
} }
img.preview[size+'px'] = './' + CACHE_DIR +'/'+ preview_path.split(CACHE_DIR).pop() img.preview[size+'px'] = './' + CACHE_DIR +'/'+ preview_path.split(CACHE_DIR).pop()
// mark image dirty... // mark image dirty...
if(IMAGES_UPDATED.indexOf(gid) < 0){ if(IMAGES_UPDATED.indexOf(gid) < 0){
IMAGES_UPDATED.push(gid) IMAGES_UPDATED.push(gid)
} }
// we are done...
deferred.resolve() deferred.resolve()
} }
}) })
@ -223,9 +230,17 @@ if(window.CEF_dumpJSON != null){
return $.when.apply(null, previews) return $.when.apply(null, previews)
} }
// XXX is this robust enough???
window._PREVIW_CREATE_QUEUE = null window._PREVIW_CREATE_QUEUE = null
window.makeImagesPreviewsQ = function(gids){ // XXX is this robust enough???
// of one deferred hangs or breaks without finalizing this will
// stall the whole queue...
// ...need a way to jumpstart it again...
// XXX check if we are leaking the tail...
// XXX test progress...
// NOTE: this will remove the old deferred if it us resolved, thus
// clearing the "log" of previous operations, unless keep_log
// is set to true...
window.makeImagesPreviewsQ = function(gids, keep_log){
var previews = [] var previews = []
$.each(gids, function(i, e){ $.each(gids, function(i, e){
@ -233,9 +248,10 @@ if(window.CEF_dumpJSON != null){
var last = previews[previews.length-1] var last = previews[previews.length-1]
// first in this set... // first in this set -- attach to the queue...
if(last == null){ if(last == null){
if(_PREVIW_CREATE_QUEUE == null){ if(_PREVIW_CREATE_QUEUE == null
|| (!keep_log && _PREVIW_CREATE_QUEUE.state() == 'resolved')){
// if nothing in queue, start at once... // if nothing in queue, start at once...
last = $.Deferred().resolve() last = $.Deferred().resolve()
} else { } else {
@ -246,6 +262,9 @@ if(window.CEF_dumpJSON != null){
// append to deffered queue... // append to deffered queue...
last.always(function(){ last.always(function(){
makeImagePreviews(e) makeImagePreviews(e)
.progress(function(state){
deferred.notify(state)
})
.always(function(){ .always(function(){
deferred.resolve() deferred.resolve()
}) })