mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-31 03:10:07 +00:00 
			
		
		
		
	minor tweaks...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									34236bf334
								
							
						
					
					
						commit
						0b583e5e1d
					
				| @ -2010,21 +2010,18 @@ var FileSystemWriterActions = actions.Actions({ | |||||||
| 			// XXX
 | 			// XXX
 | ||||||
| 			if(path instanceof Array){ | 			if(path instanceof Array){ | ||||||
| 				console.error('saving to merged indexes not yet supported...') | 				console.error('saving to merged indexes not yet supported...') | ||||||
| 				return | 				return } | ||||||
| 			} |  | ||||||
| 
 | 
 | ||||||
| 			// XXX
 | 			// XXX
 | ||||||
| 			if(path == null && this.location.load != 'loadIndex'){ | 			if(path == null && this.location.load != 'loadIndex'){ | ||||||
| 				path = this.location.path | 				path = this.location.path } | ||||||
| 			} |  | ||||||
| 
 | 
 | ||||||
| 			// resolve relative paths...
 | 			// resolve relative paths...
 | ||||||
| 			if(/^(\.\.?[\\\/]|[^\\\/])/.test(path)  | 			if(/^(\.\.?[\\\/]|[^\\\/])/.test(path)  | ||||||
| 					// and skip windows drives...
 | 					// and skip windows drives...
 | ||||||
| 					&& !/^[a-z]:[\\\/]/i.test(path)){ | 					&& !/^[a-z]:[\\\/]/i.test(path)){ | ||||||
| 				// XXX do we need to normalize???
 | 				// XXX do we need to normalize???
 | ||||||
| 				path = this.location.path +'/'+ path | 				path = this.location.path +'/'+ path } | ||||||
| 			} |  | ||||||
| 
 | 
 | ||||||
| 			// XXX get real base path...
 | 			// XXX get real base path...
 | ||||||
| 			//path = path || this.location.path +'/'+ this.config['index-dir']
 | 			//path = path || this.location.path +'/'+ this.config['index-dir']
 | ||||||
| @ -2051,16 +2048,13 @@ var FileSystemWriterActions = actions.Actions({ | |||||||
| 						&& (process.platform == 'win32'  | 						&& (process.platform == 'win32'  | ||||||
| 							|| process.platform == 'win64') | 							|| process.platform == 'win64') | ||||||
| 						&& child_process | 						&& child_process | ||||||
| 							.spawn('attrib', ['+h', full_path]) | 							.spawn('attrib', ['+h', full_path]) }) | ||||||
| 				}) |  | ||||||
| 				.then(function(){ | 				.then(function(){ | ||||||
| 					location.load = 'loadIndex' | 					location.load = 'loadIndex' | ||||||
| 					location.from = index.date | 					location.from = index.date | ||||||
| 
 | 
 | ||||||
| 					//return location
 | 					//return location
 | ||||||
| 					return index | 					return index }) }], | ||||||
| 				}) |  | ||||||
| 		}], |  | ||||||
| 
 | 
 | ||||||
| 	// XXX add name conflict resolution strategies (pattern)...
 | 	// XXX add name conflict resolution strategies (pattern)...
 | ||||||
| 	// 		...use the same strategy as for .exportDirs(..)
 | 	// 		...use the same strategy as for .exportDirs(..)
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user