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

several fixes to files.js...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-05-11 15:28:56 +03:00
parent b6577a4e3b
commit 2690654695
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui (gen4)/file.js
View File

@ -237,11 +237,11 @@ function(list, from_date, logger){
logger && logger.emit('queued', n) logger && logger.emit('queued', n)
queued += 1 queued += 1
} }
}) }) }) });
// add base files back where needed... // add base files back where needed...
// <keyword>.json / non-diff // <keyword>.json / non-diff
dates.root (dates.root || [])
.forEach(function(n){ .forEach(function(n){
var b = pathlib.basename(n) var b = pathlib.basename(n)
var k = b.split(/\./g)[0] var k = b.split(/\./g)[0]
@ -292,6 +292,7 @@ function(path, index_dir){
// XXX handle errors... // XXX handle errors...
.on('error', function(err){ .on('error', function(err){
logger && logger.emit('error', err) logger && logger.emit('error', err)
console.error(err)
}) })
.on('end', function(files){ .on('end', function(files){
var data = groupByDate(files) var data = groupByDate(files)
@ -316,6 +317,7 @@ function(path, index_dir){
// XXX handle errors... // XXX handle errors...
.on('error', function(err){ .on('error', function(err){
logger && logger.emit('error', err) logger && logger.emit('error', err)
console.error(err)
}) })
// collect the found indexes... // collect the found indexes...
.on('match', function(path){ .on('match', function(path){
@ -447,13 +449,14 @@ function(path, index_dir, from_date, logger){
// XXX handle errors... // XXX handle errors...
.on('error', function(err){ .on('error', function(err){
logger && logger.emit('error', err) logger && logger.emit('error', err)
console.error(err)
}) })
.on('end', function(files){ .on('end', function(files){
var res = {} var res = {}
// XXX need to pass a filter date to this... // XXX need to pass a filter date to this...
var index = groupByKeyword(files, from_date, logger) var index = groupByKeyword(files, from_date, logger)
// load... // load...
Promise Promise
.all(Object.keys(index).map(function(keyword){ .all(Object.keys(index).map(function(keyword){
@ -464,11 +467,11 @@ function(path, index_dir, from_date, logger){
// XXX not sure about this... // XXX not sure about this...
if(keyword == '__dates'){ if(keyword == '__dates'){
res.__dates = index.__dates res.__dates = index.__dates
return return true
} }
if(keyword == '__date'){ if(keyword == '__date'){
res.__date = index.__date res.__date = index.__date
return return true
} }
// NOTE: so far I really do not like how nested and // NOTE: so far I really do not like how nested and
@ -495,6 +498,7 @@ function(path, index_dir, from_date, logger){
// XXX we should abort loading this index... // XXX we should abort loading this index...
.catch(function(err){ .catch(function(err){
logger && logger.emit('error', err) logger && logger.emit('error', err)
console.error(err)
}) })
.then(function(json){ .then(function(json){
// NOTE: we can't merge here // NOTE: we can't merge here
@ -541,6 +545,7 @@ function(path, index_dir, from_date, logger){
// XXX handle errors... // XXX handle errors...
.on('error', function(err){ .on('error', function(err){
logger && logger.emit('error', err) logger && logger.emit('error', err)
console.error(err)
}) })
// collect the found indexes... // collect the found indexes...
.on('match', function(path){ .on('match', function(path){
@ -861,6 +866,7 @@ function(json, path, date, filename_tpl, logger){
return ensureDir(path) return ensureDir(path)
.catch(function(err){ .catch(function(err){
logger && logger.emit('error', err) logger && logger.emit('error', err)
console.error(err)
}) })
.then(function(){ .then(function(){
logger && logger.emit('path', path) logger && logger.emit('path', path)
@ -885,6 +891,7 @@ function(json, path, date, filename_tpl, logger){
return writeFile(file, data, 'utf8') return writeFile(file, data, 'utf8')
.catch(function(err){ .catch(function(err){
logger && logger.emit('error', err) logger && logger.emit('error', err)
console.error(err)
}) })
.then(function(){ .then(function(){
logger && logger.emit('written', file) logger && logger.emit('written', file)