diff --git a/bun.lockb b/bun.lockb index bc729f4..88a3ee5 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index b5f3492..1d4f84f 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "eslint": "^9.32.0", "eslint-plugin-import": "^2.32.0", "eslint-plugin-only-warn": "^1.1.0", + "iso-639-2": "^3.0.2", "obsidian": "latest", "openapi-fetch": "^0.14.0", "openapi-typescript": "^7.8.0", diff --git a/src/api/apis/MusicBrainzAPI.ts b/src/api/apis/MusicBrainzAPI.ts index c512886..5bebd6d 100644 --- a/src/api/apis/MusicBrainzAPI.ts +++ b/src/api/apis/MusicBrainzAPI.ts @@ -3,8 +3,9 @@ import type MediaDbPlugin from '../../main'; import type { MediaTypeModel } from '../../models/MediaTypeModel'; import { MusicReleaseModel } from '../../models/MusicReleaseModel'; import { MediaType } from '../../utils/MediaType'; -import { contactEmail, extractTracksFromMedia, mediaDbVersion, pluginName } from '../../utils/Utils'; +import { contactEmail, extractTracksFromMedia, getLanguageName, mediaDbVersion, pluginName } from '../../utils/Utils'; import { APIModel } from '../APIModel'; +import { iso6392 } from 'iso-639-2'; // sadly no open api schema available @@ -187,8 +188,10 @@ export class MusicBrainzAPI extends APIModel { image: 'https://coverartarchive.org/release-group/' + result.id + '/front-500.jpg', artists: result['artist-credit'].map(a => a.name), + language: releaseData['text-representation'].language ? getLanguageName(releaseData['text-representation'].language) : 'Unknown', genres: result.genres.map(g => g.name), subType: result['primary-type'], + trackCount: releaseData.media[0]['track-count'] ?? 0, tracks: tracks, rating: result.rating.value * 2, diff --git a/src/models/MusicReleaseModel.ts b/src/models/MusicReleaseModel.ts index 456a6dc..a358089 100644 --- a/src/models/MusicReleaseModel.ts +++ b/src/models/MusicReleaseModel.ts @@ -1,6 +1,6 @@ import { MediaType } from '../utils/MediaType'; import type { ModelToData } from '../utils/Utils'; -import { mediaDbTag, migrateObject } from '../utils/Utils'; +import { mediaDbTag, migrateObject, getLanguageName } from '../utils/Utils'; import { MediaTypeModel } from './MediaTypeModel'; export type MusicReleaseData = ModelToData; @@ -8,9 +8,11 @@ export type MusicReleaseData = ModelToData; export class MusicReleaseModel extends MediaTypeModel { genres: string[]; artists: string[]; + language: string; image: string; rating: number; releaseDate: string; + trackCount: number; tracks: { number: number; title: string; @@ -42,7 +44,9 @@ export class MusicReleaseModel extends MediaTypeModel { } this.type = this.getMediaType(); + this.trackCount = obj.trackCount ?? 0; this.tracks = obj.tracks ?? []; + this.language = obj.language ?? ''; } getTags(): string[] { diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts index aa9786d..10e6746 100644 --- a/src/utils/Utils.ts +++ b/src/utils/Utils.ts @@ -1,6 +1,7 @@ import type { TFile, TFolder, App } from 'obsidian'; import { requestUrl } from 'obsidian'; import type { MediaTypeModel } from '../models/MediaTypeModel'; +import { iso6392 } from 'iso-639-2'; export const pluginName: string = 'obsidian-media-db-plugin'; export const contactEmail: string = 'm.projects.code@gmail.com'; @@ -318,3 +319,8 @@ export function extractTracksFromMedia(media: any[]): { }; }); } +export function getLanguageName(code: string): string | null { + const language = iso6392.find(lang => lang.iso6392B === code || lang.iso6392T === code); + + return language?.name ?? null; +}