Skip to content

fix(server): extract make/model from sony video files #26833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danieldietzler merged 6 commits into from
Mar 11, 2026
+11 −2
Merged

fix(server): extract make/model from sony video files #26833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b78648
fix(server): extract make/model from Sony XAVC DeviceManufacturer and…
brendanngo-maker Mar 10, 2026
29122e4
Added tests for DeviceManufacturer and DeviceModelName
brendanngo-maker Mar 10, 2026
cd0e151
Additional test to ensure standard make/model tags take priority over…
brendanngo-maker Mar 10, 2026
237e809
Update ImmichTags interface
brendanngo-maker Mar 11, 2026
4116532
Explicitly return null rather than "" DeviceManufacturer/DeviceModel…
brendanngo-maker Mar 11, 2026
41d63dd
chore: fix formatting
danieldietzler Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions server/src/repositories/metadata.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ export interface ImmichTags extends Omit<Tags, TagsWithWrongTypes> {

AndroidMake?: string;
AndroidModel?: string;
DeviceManufacturer?: string;
DeviceModelName?: string;
}

@Injectable()
Expand Down
5 changes: 5 additions & 0 deletions server/src/services/metadata.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1568,6 +1568,11 @@ describe(MetadataService.name, () => {
expected: { make: '1', model: '2' },
},
{ exif: { AndroidMake: '1', AndroidModel: '2' }, expected: { make: '1', model: '2' } },
{ exif: { DeviceManufacturer: '1', DeviceModelName: '2' }, expected: { make: '1', model: '2' } },
{
exif: { Make: '1', Model: '2', DeviceManufacturer: '3', DeviceModelName: '4' },
expected: { make: '1', model: '2' },
},
])('should read camera make and model $exif -> $expected', async ({ exif, expected }) => {
const asset = AssetFactory.create();
mocks.assetJob.getForMetadataExtraction.mockResolvedValue(asset);
Expand Down
6 changes: 4 additions & 2 deletions server/src/services/metadata.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,10 @@ export class MetadataService extends BaseService {
colorspace: exifTags.ColorSpace === undefined ? null : String(exifTags.ColorSpace),

// camera
make: exifTags.Make ?? exifTags.Device?.Manufacturer ?? exifTags.AndroidMake ?? null,
model: exifTags.Model ?? exifTags.Device?.ModelName ?? exifTags.AndroidModel ?? null,
make:
exifTags.Make ?? exifTags.Device?.Manufacturer ?? exifTags.AndroidMake ?? (exifTags.DeviceManufacturer || null),
model:
exifTags.Model ?? exifTags.Device?.ModelName ?? exifTags.AndroidModel ?? (exifTags.DeviceModelName || null),
fps: validate(Number.parseFloat(exifTags.VideoFrameRate!)),
iso: validate(exifTags.ISO) as number,
exposureTime: exifTags.ExposureTime ?? null,
Expand Down
Loading