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

a bug fixed + better defaults...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2023-08-12 11:03:36 +03:00
parent b7d355329f
commit 403f1779c4
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Viewer/features/filesystem.js
View File

@ -1867,9 +1867,8 @@ var FileSystemWriterActions = actions.Actions({
var gid = data.gid var gid = data.gid
if(!gid && name in this.images){ if(!gid && name in this.images){
gid = name gid = name
name = null name = null }
} gid = gid || this.current || ''
gid = gid || this.current
var ribbon = this.data.getRibbon(gid) var ribbon = this.data.getRibbon(gid)
data = Object.assign({}, data = Object.assign({},
this.images[gid] || {}, this.images[gid] || {},
@ -1877,20 +1876,26 @@ var FileSystemWriterActions = actions.Actions({
name = name name = name
|| pathlib.basename( || pathlib.basename(
data.path || ((data.name || '') + (data.ext || ''))) data.path
|| ((data.name || '') + (data.ext || '')))
name = name == '' ? name = name == '' ?
gid gid || ''
: name : name
var ext = pathlib.extname(name) var ext = name == '' ?
pathlib.extname(name)
: ''
var to_ext = data.ext var to_ext = data.ext
|| ext || ext
var tags = data.tags || this.data.getTags(gid) var tags = data.tags || this.data.getTags(gid)
// XXX revise defaults... // XXX revise defaults...
var len = data.len || this.data.ribbons[ribbon].len var len = data.len
var total_len = data.total_len || this.data.length || (this.data.ribbons[ribbon] || []).len
var r_len = data.r_len || Object.keys(this.data.ribbons).length var total_len = data.total_len
|| this.data.length
var r_len = data.r_len
|| Object.keys(this.data.ribbons).length
var i = data.i || this.data.getImageOrder('ribbon', gid) var i = data.i || this.data.getImageOrder('ribbon', gid)
var I = data.I || this.data.getImageOrder('loaded', gid) var I = data.I || this.data.getImageOrder('loaded', gid)
@ -1969,8 +1974,7 @@ var FileSystemWriterActions = actions.Actions({
+(new Array(r_len - r*1 - 1)).fill(level).join('/') +(new Array(r_len - r*1 - 1)).fill(level).join('/')
+(match.length + offset == str.length ? '' : '/') }) +(match.length + offset == str.length ? '' : '/') })
+ to_ext + to_ext }],
}],
// XXX should this be sync??? // XXX should this be sync???
@ -2673,21 +2677,31 @@ var FileSystemWriterUIActions = actions.Actions({
// XXX should this api be accessible from outside the ui??? // XXX should this api be accessible from outside the ui???
'export-presets': [ 'export-presets': [
{ {
'name': './select (ribbons to "./fav/..")',
'mode': 'Images only', 'mode': 'Images only',
'path': './select', 'path': 'select',
'include-virtual': true, 'include-virtual': true,
'clean-target': true, 'clean-target': true,
'preview-name-pattern': '%(fav)l%n%(-%c)c', 'preview-name-pattern': '%(fav)l%n%(-%c)c',
'preview-size': 1000, 'preview-size': '3000',
'preview-size-limit': 'no limit', 'preview-size-limit': 'no limit',
'export-mode': 'copy best match',
}, },
{ {
'mode': 'Images only', 'mode': 'Images only',
'path': 'L:/tmp/test/export-test/images-only/', 'path': 'numbered ribbons',
'include-virtual': true, 'include-virtual': true,
'clean-target': true, 'clean-target': true,
'preview-name-pattern': '%n%(-b)b%(-%c)c', 'preview-name-pattern': '%r/%i-%n',
'preview-size': 1000,
'preview-size-limit': 'no limit',
'export-mode': 'copy best match',
},
{
'mode': 'Current state as index',
'path': './state as index',
'include-virtual': true,
'clean-target': true,
'preview-name-pattern': '%(fav)l%n%(-%c)c',
'preview-size': 1000, 'preview-size': 1000,
'preview-size-limit': 'no limit', 'preview-size-limit': 'no limit',
}, },