mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-30 19:00:09 +00:00 
			
		
		
		
	more fixes to scripts...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									588d138b10
								
							
						
					
					
						commit
						ed2ccef269
					
				| @ -1,6 +1,6 @@ | |||||||
| #!/bin/bash | #!/bin/bash | ||||||
| 
 | 
 | ||||||
| if [ $1 ] ; then | if [ "$1" ] ; then | ||||||
| 	ARCHIVE_ROOT="$1" | 	ARCHIVE_ROOT="$1" | ||||||
| else | else | ||||||
| 	ARCHIVE_ROOT="." | 	ARCHIVE_ROOT="." | ||||||
| @ -34,12 +34,12 @@ JSON_NAME="%-:1d/${METADATA_DIR}/%f.json" | |||||||
| #		-srcfile "$PROCESSED_PREVIEW_NAME" -overwrite_original \ | #		-srcfile "$PROCESSED_PREVIEW_NAME" -overwrite_original \ | ||||||
| # XXX keep file dates... | # XXX keep file dates... | ||||||
| 
 | 
 | ||||||
| exiftool -if '$jpgfromraw' -b -jpgfromraw -w "$PREVIEW_NAME" \ | ##exiftool -if '$jpgfromraw' -b -jpgfromraw -w "$PREVIEW_NAME" \ | ||||||
| 	-execute -if '$previewimage' -b -previewimage -w "$PREVIEW_NAME" \ | ##	-execute -if '$previewimage' -b -previewimage -w "$PREVIEW_NAME" \ | ||||||
| 	-execute '-FileModifyDate<DateTimeOriginal' -tagsfromfile @ \ | ##	-execute '-FileModifyDate<DateTimeOriginal' -tagsfromfile @ \ | ||||||
| 		-srcfile "$PREVIEW_NAME" -overwrite_original \ | ##		-srcfile "$PREVIEW_NAME" -overwrite_original \ | ||||||
| 	-execute -j -w "$JSON_NAME" \ | ##	-execute -j -w "$JSON_NAME" \ | ||||||
| 	-common_args --ext jpg -r "$ARCHIVE_ROOT" -progress | ##	-common_args --ext jpg -r "./$ARCHIVE_ROOT" -progress | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| SIZE=900 | SIZE=900 | ||||||
| @ -85,13 +85,24 @@ makepreview(){ | |||||||
| 
 | 
 | ||||||
| # XXX use find... | # XXX use find... | ||||||
| 
 | 
 | ||||||
| cd "${ARCHIVE_ROOT}" | cd "./${ARCHIVE_ROOT}" | ||||||
| 
 | 
 | ||||||
|  | # XXX this is ugly but it works... | ||||||
|  | if [[ $ARCHIVE_ROOT == "." ]] ; then | ||||||
| 	for FROM in */DCIM/hi-res\ \(RAW\)/*jpg ; do | 	for FROM in */DCIM/hi-res\ \(RAW\)/*jpg ; do | ||||||
| 		TO="${FROM/hi-res\ /preview }" | 		TO="${FROM/hi-res\ /preview }" | ||||||
| 
 | 
 | ||||||
| 		# XXX do different-sized previews... | 		# XXX do different-sized previews... | ||||||
| 		makepreview "$SIZE" "./$FROM" "./$TO" | 		makepreview "$SIZE" "./$FROM" "./$TO" | ||||||
| 	done | 	done | ||||||
|  | else | ||||||
|  | 	for FROM in ./DCIM/hi-res\ \(RAW\)/*jpg ; do | ||||||
|  | 		TO="${FROM/hi-res\ /preview }" | ||||||
|  | 
 | ||||||
|  | 		# XXX do different-sized previews... | ||||||
|  | 		makepreview "$SIZE" "./$FROM" "./$TO" | ||||||
|  | 	done | ||||||
|  | fi | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
| # vim:set nowrap nospell : | # vim:set nowrap nospell : | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user