From 55fcdade3346776f910db1effb6f568f9c43557b Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 18 Apr 2016 17:27:34 +0300 Subject: [PATCH] minor cleanup and docs... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/filesystem.js | 11 +++++++++-- ui (gen4)/lib/tasks.js | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ui (gen4)/features/filesystem.js b/ui (gen4)/features/filesystem.js index fda9f1e3..f683a1ae 100755 --- a/ui (gen4)/features/filesystem.js +++ b/ui (gen4)/features/filesystem.js @@ -917,6 +917,8 @@ var FileSystemWriterActions = actions.Actions({ // XXX resolve env variables in path... // XXX make custom previews... // ...should this be a function of .images.getBestPreview(..)??? + // XXX report errors... + // XXX stop the process on errors... exportDirs: ['File/Export as nested directories', function(path, pattern, level_dir, size, logger){ logger = logger || this.logger @@ -942,6 +944,8 @@ var FileSystemWriterActions = actions.Actions({ size = size || this.config['export-preview-size'] || 1000 pattern = pattern || this.config['export-preview-name-pattern'] || '%f' + + // XXX need to abort on fatal errors... this.data.ribbon_order .slice() .reverse() @@ -989,8 +993,11 @@ var FileSystemWriterActions = actions.Actions({ .replace(/%I/, that.data.getImageOrder(gid, 'global')) // tags... - .replace(/%\((.*)\)m/, tags.indexOf('selected') >= 0 ? '$1' : '') - .replace(/%\((.*)\)b/, tags.indexOf('bookmark') >= 0 ? '$1' : '') + // XXX test: %n%(b)b%(m)m%e + .replace( + /%\((.*)\)m/, tags.indexOf('selected') >= 0 ? '$1' : '') + .replace( + /%\((.*)\)b/, tags.indexOf('bookmark') >= 0 ? '$1' : '') // metadata... // XXX diff --git a/ui (gen4)/lib/tasks.js b/ui (gen4)/lib/tasks.js index b726e328..82443710 100755 --- a/ui (gen4)/lib/tasks.js +++ b/ui (gen4)/lib/tasks.js @@ -18,6 +18,7 @@ var object = require('lib/object') // XXX need a mechanism to either queue chains of tasks that depend on // on the previous results or a way to delay a task until what it // needs is finished... +// XXX add fatal .abort(..) of queue... var QueueActions = module.QueueActions = actions.Actions({ config: {