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

added padding to filename numbering...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-09-26 22:21:27 +03:00
parent 6047218125
commit 0337e15e42
1 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ui (gen4)/features/filesystem.js
View File

@ -1635,6 +1635,7 @@ var FileSystemWriterActions = actions.Actions({
'export-preview-name-pattern': '%f', 'export-preview-name-pattern': '%f',
'export-preview-name-patterns': [ 'export-preview-name-patterns': [
'%f', '%f',
'%i-%f',
'%n%(-bookmarked)b%e', '%n%(-bookmarked)b%e',
'%n%(-marked)m%e', '%n%(-marked)m%e',
], ],
@ -1965,6 +1966,25 @@ var FileSystemWriterActions = actions.Actions({
return Promise.all(queue) return Promise.all(queue)
}], }],
//
// Filename patterns:
// %f - full file name (same as: %n%e)
// %n - name without extension
// %e - extension with leading dot
//
// %gid - full image gid
// %g - short gid (XXX set length in options)
//
// %i - image index in ribbon
// %I - global image index (XXX global or crop???)
//
// %t - total number of images in ribbon
// %T - total number of images (XXX global or crop???)
//
// %(...)m - add text in braces if image marked
// %(...)b - add text in braces if image is bookmark
//
//
// XXX might also be good to save/load the export options to .ImageGrid-export.json // XXX might also be good to save/load the export options to .ImageGrid-export.json
// XXX resolve env variables in path... (???) // XXX resolve env variables in path... (???)
// XXX make custom previews (option)... // XXX make custom previews (option)...
@ -1972,6 +1992,7 @@ var FileSystemWriterActions = actions.Actions({
// XXX report errors... // XXX report errors...
// XXX stop the process on errors... // XXX stop the process on errors...
// XXX use tasks... // XXX use tasks...
// XXX check global index ('%I') in crop...
exportDirs: ['- File/Export/Export ribbons as directories', exportDirs: ['- File/Export/Export ribbons as directories',
function(path, pattern, level_dir, size, logger){ function(path, pattern, level_dir, size, logger){
logger = logger || this.logger logger = logger || this.logger
@ -2013,6 +2034,10 @@ var FileSystemWriterActions = actions.Actions({
.catch(function(err){ .catch(function(err){
logger && logger.emit('error', err) }) logger && logger.emit('error', err) })
.then(function(){ .then(function(){
// XXX revise...
var len = that.data.ribbons[ribbon].len
var total_len = that.data.length
that.data.ribbons[ribbon].forEach(function(gid){ that.data.ribbons[ribbon].forEach(function(gid){
var img = that.images[gid] var img = that.images[gid]
var img_name = pathlib.basename(img.path || (img.name + img.ext)) var img_name = pathlib.basename(img.path || (img.name + img.ext))
@ -2032,6 +2057,14 @@ var FileSystemWriterActions = actions.Actions({
var ext = pathlib.extname(img_name) var ext = pathlib.extname(img_name)
var tags = that.data.getTags(gid) var tags = that.data.getTags(gid)
var i = that.data.getImageOrder('ribbon', gid)
var I = that.data.getImageOrder('global', gid)
// pad indexes...
// XXX should these be optional???
i = ((('1e'+(len+'').length)*1 + i) + '').slice(1)
I = ((('1e'+(total_len+'').length)*1 + I) + '').slice(1)
var name = pattern var name = pattern
// file name... // file name...
.replace(/%f/, img_name) .replace(/%f/, img_name)
@ -2044,8 +2077,13 @@ var FileSystemWriterActions = actions.Actions({
.replace(/%g/, gid.slice(-7, -1)) .replace(/%g/, gid.slice(-7, -1))
// order... // order...
.replace(/%i/, that.data.getImageOrder(gid)) .replace(/%i/, i)
.replace(/%I/, that.data.getImageOrder(gid, 'global')) .replace(/%I/, I)
// totals...
// XXX revise...
.replace(/%t/, len)
.replace(/%T/, total_len)
// tags... // tags...
// XXX test: %n%(b)b%(m)m%e // XXX test: %n%(b)b%(m)m%e