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

several fixes and tweaks...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-10-07 21:24:18 +03:00
parent dc2d302406
commit f434e5af5f
4 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Viewer/Makefile
View File

@ -175,6 +175,7 @@ LESSC := npx lessc
# 2) set path and launch a child make -- not sure how to # 2) set path and launch a child make -- not sure how to
# do this... # do this...
ELECTRON := npx electron ELECTRON := npx electron
# XXX stopped working while sharp started working out of the box...
ELECTRON_REBUILD := npx electron-rebuild ELECTRON_REBUILD := npx electron-rebuild
ASAR := npx asar ASAR := npx asar
ELECTRON_VERSION_FALLBACK ?= v1.8.1 ELECTRON_VERSION_FALLBACK ?= v1.8.1
@ -319,9 +320,6 @@ DEPENDENCIES_WEB = node npm npx
DEPENDENCIES = $(DEPENDENCIES_WEB) \ DEPENDENCIES = $(DEPENDENCIES_WEB) \
$(DEPENDENCIES_HELP) \ $(DEPENDENCIES_HELP) \
wget zip unzip zipnote git wget zip unzip zipnote git
# # XXX not needed with npx...
# electron electron-rebuild asar
# $(ELECTRON) $(ELECTRON_REBUILD) $(ASAR)
@ -631,7 +629,7 @@ $(BUILD_INFO): $(CSS_FILES) $(NODE_DIR) $(PROJECT_FILES) \
$(NODE_DIR): package.json $(NODE_DIR): package.json
npm install npm install
# NOTE: this may break on some systems due to a dependency issue... # NOTE: this may break on some systems due to a dependency issue...
$(ELECTRON_REBUILD) # $(ELECTRON_REBUILD)
@touch "$@" @touch "$@"

36
Viewer/features/filesystem.js
View File

@ -3124,9 +3124,6 @@ var FileSystemWriterUIActions = actions.Actions({
'exportDialog: "images"'], 'exportDialog: "images"'],
// XXX BUG: editing the path of a duplicate ("... (n)") preset first
// replaces the wrong preset in the list but after reopening
// the dialog everything is correct...
// XXX UI: // XXX UI:
// - element format: // - element format:
// TITLE // TITLE
@ -3141,6 +3138,7 @@ var FileSystemWriterUIActions = actions.Actions({
var that = this var that = this
var logger = this.logger && this.logger.push('exportPresets') var logger = this.logger && this.logger.push('exportPresets')
// generic helpers...
var getName = function(preset){ var getName = function(preset){
var date = preset.date var date = preset.date
&& Date.fromTimeStamp(preset.date).toShortDate() && Date.fromTimeStamp(preset.date).toShortDate()
@ -3168,7 +3166,7 @@ var FileSystemWriterUIActions = actions.Actions({
var presets = that.config['export-presets'] || [] var presets = that.config['export-presets'] || []
var [preset_index, preset_keys] = buildIndex(presets) var [preset_index, preset_keys] = buildIndex(presets)
var updateIndex = function(full=false){ var updatePresetIndex = function(full=false){
var k var k
;[preset_index, k] = full ? ;[preset_index, k] = full ?
buildIndex(presets) buildIndex(presets)
@ -3183,9 +3181,10 @@ var FileSystemWriterUIActions = actions.Actions({
// history... // history...
// NOTE: history is reversed in view... // NOTE: history is reversed in view...
var history = (that.config['export-history'] || []) var history =
.slice() (that.config['export-history'] || [])
.reverse() .slice()
.reverse()
var [history_index, history_keys] = buildIndex(history) var [history_index, history_keys] = buildIndex(history)
return browse.makeLister(null, function(path, make){ return browse.makeLister(null, function(path, make){
@ -3223,13 +3222,12 @@ var FileSystemWriterUIActions = actions.Actions({
['<small class="show-on-hover view-or-edit">edit</small>', ['<small class="show-on-hover view-or-edit">edit</small>',
function(title){ function(title){
var preset = preset_index.get(title) var preset = preset_index.get(title)
var o = getName(preset)
that.exportDialog(preset) that.exportDialog(preset)
.close(function(){ .close(function(){
var n = getName(preset) var n = getName(preset)
// update the list if name is affected... // update the list if name is affected...
if(n != o){ if(n != title){
n = renamePreset(o, n) n = renamePreset(title, n)
make.dialog.select(n) make.dialog.select(n)
make.dialog.update() } })}], make.dialog.update() } })}],
@ -3243,7 +3241,7 @@ var FileSystemWriterUIActions = actions.Actions({
preset.name = title + ' (copy)' preset.name = title + ' (copy)'
// place new preset in list... // place new preset in list...
presets.splice(preset_keys.indexOf(title)+1, 0, preset) presets.splice(preset_keys.indexOf(title)+1, 0, preset)
updateIndex(true) updatePresetIndex(true)
make.dialog.update() }], make.dialog.update() }],
['&diams;', 'TO_TOP'], ['&diams;', 'TO_TOP'],
'REMOVE'], 'REMOVE'],
@ -3252,7 +3250,6 @@ var FileSystemWriterUIActions = actions.Actions({
var preset = preset_index.get(title) var preset = preset_index.get(title)
// export only if we get a good preset... // export only if we get a good preset...
if(preset && getName(preset) == title){ if(preset && getName(preset) == title){
console.log('>>>>>>>>>', preset)
that.exportAs(preset) that.exportAs(preset)
return make.dialog.close() } return make.dialog.close() }
// error... // error...
@ -3266,7 +3263,7 @@ var FileSystemWriterUIActions = actions.Actions({
that.exportDialog() that.exportDialog()
// new preset saved... // new preset saved...
.on('save-preset', function(){ .on('save-preset', function(){
updateIndex(true) updatePresetIndex(true)
make.dialog.update() }) make.dialog.update() })
// close dialog on export... // close dialog on export...
.close(function(evt, reason){ .close(function(evt, reason){
@ -3293,7 +3290,7 @@ var FileSystemWriterUIActions = actions.Actions({
JSON.parse(JSON.stringify( preset )) ) JSON.parse(JSON.stringify( preset )) )
// new preset saved... // new preset saved...
.on('save-preset', function(){ .on('save-preset', function(){
updateIndex(true) updatePresetIndex(true)
make.dialog.update() }) make.dialog.update() })
// close dialog on export... // close dialog on export...
.close(function(evt, reason){ .close(function(evt, reason){
@ -3305,7 +3302,7 @@ var FileSystemWriterUIActions = actions.Actions({
var preset = history_index.get(title) var preset = history_index.get(title)
if(preset){ if(preset){
that.exportPresetSave(preset) that.exportPresetSave(preset)
updateIndex(true) updatePresetIndex(true)
make.dialog.update() } }], make.dialog.update() } }],
'REMOVE', 'REMOVE',
], ],
@ -3330,14 +3327,7 @@ var FileSystemWriterUIActions = actions.Actions({
that that
.select() .select()
.find('.view-or-edit') .find('.view-or-edit')
.click() }) .click() }) })
// mark for deletion...
// XXX move to browse...
.on('D', function(){
that
.select()
// XXX
}) })
// save things after we are done... // save things after we are done...
.close(function(){ .close(function(){
// update preset order and count... // update preset order and count...

32
Viewer/package-lock.json generated
View File

@ -549,11 +549,11 @@
} }
}, },
"debug": { "debug": {
"version": "4.1.1", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
"requires": { "requires": {
"ms": "^2.1.1" "ms": "2.1.2"
} }
}, },
"decamelize": { "decamelize": {
@ -636,9 +636,9 @@
} }
}, },
"electron": { "electron": {
"version": "9.3.1", "version": "9.3.2",
"resolved": "https://registry.npmjs.org/electron/-/electron-9.3.1.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-9.3.2.tgz",
"integrity": "sha512-DScrhqBT4a54KfdF0EoipALpHmdQTn3m7SSCtbpTcEcG+UDUiXad2cOfW6DHeVH7N+CVDKDG12q2PhVJjXkFAA==", "integrity": "sha512-0lleEf9msAXGDi2GukAuiGdw3VDgSTlONOnJgqDEz1fuSEVsXz5RX+hNPKDsVDerLTFg/C34RuJf4LwHvkKcBA==",
"requires": { "requires": {
"@electron/get": "^1.0.1", "@electron/get": "^1.0.1",
"@types/node": "^12.0.12", "@types/node": "^12.0.12",
@ -646,9 +646,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "12.12.58", "version": "12.12.64",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.58.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.64.tgz",
"integrity": "sha512-Be46CNIHWAagEfINOjmriSxuv7IVcqbGe+sDSg2SYCEz/0CRBy7LRASGfRbD8KZkqoePU73Wsx3UvOSFcq/9hA==" "integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA=="
} }
} }
}, },
@ -1112,9 +1112,9 @@
"integrity": "sha512-EzT4CP6d6lI8bnknNgT3W8mUQhSVXflO0yPbKD4dKsFcINiC6npjoEBz+8m3VQmWJhc+36pXD4JLwNxUEgzi+Q==" "integrity": "sha512-EzT4CP6d6lI8bnknNgT3W8mUQhSVXflO0yPbKD4dKsFcINiC6npjoEBz+8m3VQmWJhc+36pXD4JLwNxUEgzi+Q=="
}, },
"ig-types": { "ig-types": {
"version": "2.0.4", "version": "2.0.14",
"resolved": "https://registry.npmjs.org/ig-types/-/ig-types-2.0.4.tgz", "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-2.0.14.tgz",
"integrity": "sha512-yIeuVShcgZZsK5wMWO/u24jmKJ1hKpXk53x+YpCK3vmI5IzdI8Q34Vk2bZBIiveSFZ4kwHzfBHEvFNbkUpjmYw==", "integrity": "sha512-GSWHNbfiiypCbgmK1VhIXcDZrjECTiV14UBq2qGFeUXA+X5ji2O3aoj2b8kYhiGhsELErKU+sgXzl6HBc4oGRg==",
"requires": { "requires": {
"ig-object": "^5.2.8", "ig-object": "^5.2.8",
"object-run": "^1.0.1" "object-run": "^1.0.1"
@ -1420,9 +1420,9 @@
"integrity": "sha1-jrbgqZ+HrTT/8YJzMRBJadjFBP4=" "integrity": "sha1-jrbgqZ+HrTT/8YJzMRBJadjFBP4="
}, },
"moment": { "moment": {
"version": "2.29.0", "version": "2.29.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
"integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==" "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
}, },
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",

6
Viewer/package.json
View File

@ -20,7 +20,7 @@
"dependencies": { "dependencies": {
"app-module-path": "^1.0.6", "app-module-path": "^1.0.6",
"async-json": "0.0.2", "async-json": "0.0.2",
"electron": "^9.3.1", "electron": "^9.3.2",
"exiftool": "^0.0.3", "exiftool": "^0.0.3",
"fs-extra": "^7.0.1", "fs-extra": "^7.0.1",
"fs-walk": "^0.0.1", "fs-walk": "^0.0.1",
@ -31,8 +31,8 @@
"ig-argv": "^2.15.0", "ig-argv": "^2.15.0",
"ig-features": "^3.4.2", "ig-features": "^3.4.2",
"ig-object": "^5.2.8", "ig-object": "^5.2.8",
"ig-types": "^2.0.4", "ig-types": "^2.0.14",
"moment": "^2.29.0", "moment": "^2.29.1",
"object-run": "^1.0.1", "object-run": "^1.0.1",
"requirejs": "^2.3.6", "requirejs": "^2.3.6",
"requirejs-plugins": "^1.0.2", "requirejs-plugins": "^1.0.2",