diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile index ef609d1d..8dcf60e0 100755 --- a/ui (gen4)/Makefile +++ b/ui (gen4)/Makefile @@ -479,7 +479,7 @@ electron-unpacked: $(BUILD_DIR)/$(APP_NAME)-$$(VERSION)-$(TARGET_OS)-$(ARCH)/ .PHONY: electron-run electron-run: ## Run app in electron electron-run: dev - electron . + electron e.js diff --git a/ui (gen4)/features/sharp.js b/ui (gen4)/features/sharp.js index 1b9a983e..e12a14c1 100755 --- a/ui (gen4)/features/sharp.js +++ b/ui (gen4)/features/sharp.js @@ -72,6 +72,11 @@ var SharpActions = actions.Actions({ config: { 'preview-normalized': true, + // can be: + // 'gids' + // 'files' + 'preview-progress-mode': 'gids', + // NOTE: this uses 'preview-sizes' and 'preview-path-template' // from filesystem.IndexFormat... }, @@ -139,14 +144,10 @@ var SharpActions = actions.Actions({ `, function(images, sizes, base_path, logger){ var that = this + var logger_mode = this.config['preview-progress-mode'] || 'gids' 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 images = images || 'all' @@ -232,10 +233,10 @@ var SharpActions = actions.Actions({ // NOTE: this will handle both 'queue' and 'resolved' statuses... logger && - ( logger_mode == 'report-gids' ? + ( logger_mode == 'gids' ? // report gid-level progress... (data.res == 'all' - && logger.emit(data.status, data.path)) + && logger.emit(data.status, data.gid)) // report preview-level progress... : (data.res != 'all' && logger.emit(data.status, data.path)) ) } diff --git a/ui (gen4)/features/ui-progress.js b/ui (gen4)/features/ui-progress.js index 5ab4dcd0..6e8a1a2c 100755 --- a/ui (gen4)/features/ui-progress.js +++ b/ui (gen4)/features/ui-progress.js @@ -42,6 +42,7 @@ var ProgressActions = actions.Actions({ // .showProgress('text', '+0', '+1') // // + // XXX add message to be shown... // XXX should we report errors and stoppages??? (error state??) // XXX multiple containers... // XXX shorten the nested css class names...