helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-14 17:36:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fixed upload asset to album in asset selection (#579)

Browse source 
* Fixed error uploading a file from album

* Fixed album selection mode show viewing asset stage

* Navigate back after uploading asset to album
This commit is contained in:
Alex 2022-09-05 00:18:53 -05:00 • committed by GitHub
parent 172eda3ce5
commit 6976a7241e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 46 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/apps/immich/src/api-v1/asset/asset.controller.ts
View file

@ -123,12 +123,12 @@ export class AssetController {
}
@Get('/thumbnail/:assetId')
@Header('Cache-Control', 'max-age=300')
async getAssetThumbnail(
@Response({ passthrough: true }) res: Res,
@Param('assetId') assetId: string,
@Query(new ValidationPipe({ transform: true })) query: GetAssetThumbnailDto,
): Promise<any> {
return this.assetService.getAssetThumbnail(assetId, query);
return this.assetService.getAssetThumbnail(assetId, query, res);
}
@Get('/curated-objects')

4
server/apps/immich/src/api-v1/asset/asset.service.ts
View file

@ -165,7 +165,7 @@ export class AssetService {
}
}
public async getAssetThumbnail(assetId: string, query: GetAssetThumbnailDto) {
public async getAssetThumbnail(assetId: string, query: GetAssetThumbnailDto, res: Res) {
let fileReadStream: ReadStream;
const asset = await this.assetRepository.findOne({ where: { id: assetId } });
@ -196,8 +196,10 @@ export class AssetService {
}
}
res.header('Cache-Control', 'max-age=300');
return new StreamableFile(fileReadStream);
} catch (e) {
res.header('Cache-Control', 'none');
Logger.error(`Cannot create read stream for asset ${asset.id}`, 'getAssetThumbnail');
throw new InternalServerErrorException(
e,