mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 19:12:26 -05:00 
			
		
		
		
	[chore] add back exif-terminator and use only for jpeg,png,webp (#3161)
* add back exif-terminator and use only for jpeg,png,webp * fix arguments passed to terminateExif() * pull in latest exif-terminator * fix test * update processed img --------- Co-authored-by: tobi <tobi.smethurst@protonmail.com>
This commit is contained in:
		
					parent
					
						
							
								7b5917d6ae
							
						
					
				
			
			
				commit
				
					
						94e87610c4
					
				
			
		
					 191 changed files with 38772 additions and 58 deletions
				
			
		
							
								
								
									
										77
									
								
								vendor/github.com/superseriousbusiness/go-png-image-structure/v2/testing_common.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										77
									
								
								vendor/github.com/superseriousbusiness/go-png-image-structure/v2/testing_common.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,77 @@ | |||
| package pngstructure | ||||
| 
 | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"os" | ||||
| 	"path" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| 	assetsPath = "assets" | ||||
| ) | ||||
| 
 | ||||
| func getModuleRootPath() (string, error) { | ||||
| 	moduleRootPath := os.Getenv("PNG_MODULE_ROOT_PATH") | ||||
| 	if moduleRootPath != "" { | ||||
| 		return moduleRootPath, nil | ||||
| 	} | ||||
| 
 | ||||
| 	currentWd, err := os.Getwd() | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
| 
 | ||||
| 	currentPath := currentWd | ||||
| 	visited := make([]string, 0) | ||||
| 
 | ||||
| 	for { | ||||
| 		tryStampFilepath := path.Join(currentPath, ".MODULE_ROOT") | ||||
| 
 | ||||
| 		_, err := os.Stat(tryStampFilepath) | ||||
| 		if err != nil && !os.IsNotExist(err) { | ||||
| 			return "", err | ||||
| 		} else if err == nil { | ||||
| 			break | ||||
| 		} | ||||
| 
 | ||||
| 		visited = append(visited, tryStampFilepath) | ||||
| 
 | ||||
| 		currentPath = path.Dir(currentPath) | ||||
| 		if currentPath == "/" { | ||||
| 			return "", fmt.Errorf("could not find module-root: %v", visited) | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	return currentPath, nil | ||||
| } | ||||
| 
 | ||||
| func getTestAssetsPath() (string, error) { | ||||
| 	if assetsPath == "" { | ||||
| 		moduleRootPath, err := getModuleRootPath() | ||||
| 		if err != nil { | ||||
| 			return "", err | ||||
| 		} | ||||
| 
 | ||||
| 		assetsPath = path.Join(moduleRootPath, "assets") | ||||
| 	} | ||||
| 
 | ||||
| 	return assetsPath, nil | ||||
| } | ||||
| 
 | ||||
| func getTestBasicImageFilepath() (string, error) { | ||||
| 	assetsPath, err := getTestAssetsPath() | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
| 
 | ||||
| 	return path.Join(assetsPath, "libpng.png"), nil | ||||
| } | ||||
| 
 | ||||
| func getTestExifImageFilepath() (string, error) { | ||||
| 	assetsPath, err := getTestAssetsPath() | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
| 
 | ||||
| 	return path.Join(assetsPath, "exif.png"), nil | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue