beenull/immich
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: orientation

Browse source
This commit is contained in:
martabal 2023-12-01 20:07:17 +01:00
parent 0309bba7dd
commit 2d58d486e6
No known key found for this signature in database
GPG key ID: C00196E3148A52BD
2 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/src/domain/asset/asset.service.ts
View file

@ -593,7 +593,6 @@ export class AssetService {
private async updateMetadata(dto: ISidecarWriteJob) {
const { id, description, dateTimeOriginal, latitude, longitude, orientation } = dto;
const writes = _.omitBy({ description, dateTimeOriginal, latitude, longitude, orientation }, _.isUndefined);
console.log('updatemetadta', orientation);
if (Object.keys(writes).length > 0) {
await this.assetRepository.upsertExif({ assetId: id, ...writes });
await this.jobRepository.queue({ name: JobName.SIDECAR_WRITE, data: { id, ...writes } });

47
web/src/lib/components/asset-viewer/photo-viewer.svelte
View file

@ -6,7 +6,7 @@
import { notificationController, NotificationType } from '../shared-components/notification/notification';
import { useZoomImageWheel } from '@zoom-image/svelte';
import { photoZoomState } from '$lib/stores/zoom-image.store';
import { getAssetRatio, isWebCompatibleImage } from '$lib/utils/asset-utils';
import { isWebCompatibleImage } from '$lib/utils/asset-utils';
import { shouldIgnoreShortcut } from '$lib/utils/shortcut';
import { handleError } from '$lib/utils/handle-error';
@ -14,23 +14,23 @@
export let element: HTMLDivElement | undefined = undefined;
export let haveFadeTransition = true;
const getRotation = (value: string): number => {
switch (value) {
case '1':
return 0;
case '3':
return 180;
case '6':
return 90;
case '8':
return 270;
default:
return 0;
}
};
// const orientationToRotation = (value: string): number => {
// switch (value) {
// case '1':
// return 0;
// case '3':
// return 180;
// case '6':
// return 90;
// case '8':
// return 270;
// default:
// return 0;
// }
// };
const getRotationString = (rotation: number): number => {
switch (rotation % 360) {
const rotationToOrientation = (rotation: number): number => {
switch (((rotation % 360) + 360) % 360) {
case 0:
return 1;
case 90:
@ -46,11 +46,10 @@
export const rotate = async () => {
setZoomImageWheelState({ currentRotation: $zoomImageWheelState.currentRotation - 90 });
console.log(getRotationString($zoomImageWheelState.currentRotation));
try {
await api.assetApi.updateAsset({
id: asset.id,
updateAssetDto: { orientation: getRotationString($zoomImageWheelState.currentRotation) },
updateAssetDto: { orientation: rotationToOrientation($zoomImageWheelState.currentRotation) },
});
} catch (error) {
handleError(error, 'Unable to change orientation');
@ -158,16 +157,6 @@
maxZoom: 10,
wheelZoomRatio: 0.2,
});
if (asset.exifInfo?.orientation) {
const { width, height } = getAssetRatio(asset);
if (width > height && parseInt(asset.exifInfo?.orientation) != 1) {
setZoomImageWheelState({ currentRotation: getRotation(asset.exifInfo?.orientation) });
}
if (width < height && parseInt(asset.exifInfo?.orientation) != 6) {
setZoomImageWheelState({ currentRotation: getRotation(asset.exifInfo?.orientation) });
}
}
}
</script>