Viewer/features/filesystem.js

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