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

a minor fix to browse-walk...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-04-26 04:01:44 +03:00
parent 85de35f4e3
commit a17c298b2e
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ui (gen4)/lib/widget/browse-walk.js
View File

@ -123,6 +123,24 @@ function(path, make){
// list dirs... // list dirs...
} else { } else {
var _countDirFiles = function(path, file, elem){
if(that.options.fileCountPattern){
var i = 0
glob(path +'/'+ file +'/'+ that.options.fileCountPattern)
/*
.on('match', function(){
i += 1
elem.attr('count', '('+ i +')')
})
*/
.on('end', function(lst){
i += 1
elem.attr('count', lst.length)
})
}
return elem
}
return new Promise(function(resolve, reject){ return new Promise(function(resolve, reject){
// XXX should this be a promise??? // XXX should this be a promise???
fs.readdir(path, function(err, files){ fs.readdir(path, function(err, files){
@ -134,7 +152,14 @@ function(path, make){
var res = [] var res = []
if(that.options.dotDirs){ if(that.options.dotDirs){
files.splice(0, 0, '.', '..') //files.splice(0, 0, '.', '..')
// NOTE: we are counting these here so as to ensure
// they are always first and not delayed by some
// odd delay on a stat...
_countDirFiles(path, './',
make(fullpath ? path + './' : './'))
_countDirFiles(path, '../',
make(fullpath ? path + '../' : '../'))
} }
files.map(function(file){ files.map(function(file){
@ -163,20 +188,7 @@ function(path, make){
// count the number of files... // count the number of files...
// NOTE: we do not care how long it will take // NOTE: we do not care how long it will take
// so we'll not wait... // so we'll not wait...
if(res && dir && that.options.fileCountPattern){ res && dir && _countDirFiles(path, file, elem)
var i = 0
glob(path +'/'+ file +'/'+ that.options.fileCountPattern)
/*
.on('match', function(){
i += 1
elem.attr('count', '('+ i +')')
})
*/
.on('end', function(lst){
i += 1
elem.attr('count', lst.length)
})
}
}) })
// NOTE: we are not using promise.all(..) here because it // NOTE: we are not using promise.all(..) here because it
// triggers BEFORE the first make(..) is called... // triggers BEFORE the first make(..) is called...