projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ability to limit videos history size
[oweals/peertube.git]
/
server
/
helpers
/
image-utils.ts
diff --git
a/server/helpers/image-utils.ts
b/server/helpers/image-utils.ts
index da3285b13da7c3cfc902abfcfeab2f46564ab913..e43ea3f1dad03c62cf65457e40fe461b22c98227 100644
(file)
--- a/
server/helpers/image-utils.ts
+++ b/
server/helpers/image-utils.ts
@@
-1,6
+1,7
@@
import 'multer'
import * as sharp from 'sharp'
import 'multer'
import * as sharp from 'sharp'
-import { move, remove } from 'fs-extra'
+import { readFile, remove } from 'fs-extra'
+import { logger } from './logger'
async function processImage (
physicalFile: { path: string },
async function processImage (
physicalFile: { path: string },
@@
-11,14
+12,11
@@
async function processImage (
throw new Error('Sharp needs an input path different that the output path.')
}
throw new Error('Sharp needs an input path different that the output path.')
}
- const sharpInstance = sharp(physicalFile.path)
- const metadata = await sharpInstance.metadata()
+ logger.debug('Processing image %s to %s.', physicalFile.path, destination)
- // No need to resize
- if (metadata.width === newSize.width && metadata.height === newSize.height) {
- await move(physicalFile.path, destination, { overwrite: true })
- return
- }
+ // Avoid sharp cache
+ const buf = await readFile(physicalFile.path)
+ const sharpInstance = sharp(buf)
await remove(destination)
await remove(destination)