c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-16 16:56:46 +01:00
Code Releases Activity

save to tmp path then rename

Browse source
This commit is contained in:
mertalev 2024-05-27 18:33:58 -04:00
parent 4c7347d653
commit dda736840b
No known key found for this signature in database
GPG key ID: 9181CD92C0A1C5E3
2 changed files with 675 additions and 665 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1323
server/src/services/media.service.spec.ts
View file

File diff suppressed because it is too large Load diff

17
server/src/services/media.service.ts
View file

@ -188,6 +188,7 @@ export class MediaService {
const { image, ffmpeg } = await this.configCore.getConfig(); const { image, ffmpeg } = await this.configCore.getConfig();
const size = type === AssetPathType.PREVIEW ? image.previewSize : image.thumbnailSize; const size = type === AssetPathType.PREVIEW ? image.previewSize : image.thumbnailSize;
const path = StorageCore.getImagePath(asset, type, format); const path = StorageCore.getImagePath(asset, type, format);
const tmpPath = StorageCore.getTempPathInDir(dirname(path));
this.storageCore.ensureFolders(path); this.storageCore.ensureFolders(path);
switch (asset.type) { switch (asset.type) {
@ -201,8 +202,8 @@ export class MediaService {
const colorspace = this.isSRGB(asset) ? Colorspace.SRGB : image.colorspace; const colorspace = this.isSRGB(asset) ? Colorspace.SRGB : image.colorspace;
const imageOptions = { format, size, colorspace, quality: image.quality }; const imageOptions = { format, size, colorspace, quality: image.quality };
const outputPath = useExtracted ? extractedPath : asset.originalPath; const inputPath = useExtracted ? extractedPath : asset.originalPath;
await this.mediaRepository.generateThumbnail(outputPath, path, imageOptions); await this.mediaRepository.generateThumbnail(inputPath, tmpPath, imageOptions);
} finally { } finally {
if (didExtract) { if (didExtract) {
await this.storageRepository.unlink(extractedPath); await this.storageRepository.unlink(extractedPath);
@ -221,7 +222,7 @@ export class MediaService {
const mainAudioStream = this.getMainStream(audioStreams); const mainAudioStream = this.getMainStream(audioStreams);
const config = ThumbnailConfig.create({ ...ffmpeg, targetResolution: size.toString() }); const config = ThumbnailConfig.create({ ...ffmpeg, targetResolution: size.toString() });
const options = config.getCommand(TranscodeTarget.VIDEO, mainVideoStream, mainAudioStream); const options = config.getCommand(TranscodeTarget.VIDEO, mainVideoStream, mainAudioStream);
await this.mediaRepository.transcode(asset.originalPath, path, options); await this.mediaRepository.transcode(asset.originalPath, tmpPath, options);
break; break;
} }
@ -229,6 +230,9 @@ export class MediaService {
throw new UnsupportedMediaTypeException(`Unsupported asset type for thumbnail generation: ${asset.type}`); throw new UnsupportedMediaTypeException(`Unsupported asset type for thumbnail generation: ${asset.type}`);
} }
} }
await this.storageRepository.rename(tmpPath, path);
this.logger.log( this.logger.log(
`Successfully generated ${format.toUpperCase()} ${asset.type.toLowerCase()} ${type} for asset ${asset.id}`, `Successfully generated ${format.toUpperCase()} ${asset.type.toLowerCase()} ${type} for asset ${asset.id}`,
); );
@ -340,8 +344,9 @@ export class MediaService {
} }
this.logger.log(`Started encoding video ${asset.id} ${JSON.stringify(command)}`); this.logger.log(`Started encoding video ${asset.id} ${JSON.stringify(command)}`);
const tmpPath = StorageCore.getTempPathInDir(dirname(output));
try { try {
await this.mediaRepository.transcode(input, output, command); await this.mediaRepository.transcode(input, tmpPath, command);
} catch (error) { } catch (error) {
this.logger.error(error); this.logger.error(error);
if (ffmpeg.accel !== TranscodeHWAccel.DISABLED) { if (ffmpeg.accel !== TranscodeHWAccel.DISABLED) {
@ -351,9 +356,11 @@ export class MediaService {
} }
const config = BaseConfig.create({ ...ffmpeg, accel: TranscodeHWAccel.DISABLED }); const config = BaseConfig.create({ ...ffmpeg, accel: TranscodeHWAccel.DISABLED });
command = config.getCommand(target, mainVideoStream, mainAudioStream); command = config.getCommand(target, mainVideoStream, mainAudioStream);
await this.mediaRepository.transcode(input, output, command); await this.mediaRepository.transcode(input, tmpPath, command);
} }
await this.storageRepository.rename(tmpPath, output);
this.logger.log(`Successfully encoded ${asset.id}`); this.logger.log(`Successfully encoded ${asset.id}`);
await this.assetRepository.update({ id: asset.id, encodedVideoPath: output }); await this.assetRepository.update({ id: asset.id, encodedVideoPath: output });