afiqzudinhadi/obsidian-media-db-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

cleanup of new result code

Browse source
This commit is contained in:
Moritz Jung 2026-05-06 17:03:31 +02:00
parent 498e2611ae
commit 5a032a87ae
23 changed files with 323 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

32
packages/obsidian/src/api/apis/TMDBMovieAPI.ts
View file

@ -3,9 +3,9 @@ import { APIModel } from 'packages/obsidian/src/api/APIModel';
import type MediaDbPlugin from 'packages/obsidian/src/main';
import type { MediaTypeModel } from 'packages/obsidian/src/models/MediaTypeModel';
import { MovieModel } from 'packages/obsidian/src/models/MovieModel';
import type { AppError } from 'packages/obsidian/src/utils/AppError';
import { AppErrorKind, toAppError } from 'packages/obsidian/src/utils/AppError';
import { Logger } from 'packages/obsidian/src/utils/Logger';
import type { MDBError } from 'packages/obsidian/src/utils/MDBError';
import { MDBErrorKind, toMdbError } from 'packages/obsidian/src/utils/MDBError';
import { MediaType } from 'packages/obsidian/src/utils/MediaType';
import type { Result } from 'packages/obsidian/src/utils/result';
import { err, fromPromise, ok } from 'packages/obsidian/src/utils/result';
@ -59,13 +59,13 @@ export class TMDBMovieAPI extends APIModel {
this.typeMappings.set('movie', 'movie');
}
async searchByTitle(title: string): Promise<Result<MediaTypeModel[], AppError>> {
async searchByTitle(title: string): Promise<Result<MediaTypeModel[], MDBError>> {
Logger.log(`MDB | api "${this.apiName}" queried by Title`);
const key = this.plugin.app.secretStorage.getSecret(this.plugin.settings.TMDBKeyId);
if (!key) {
return err({
kind: AppErrorKind.Validation,
kind: MDBErrorKind.Validation,
message: `MDB | API key for ${this.apiName} missing.`,
userMessage: `API key for ${this.apiName} missing.`,
context: { apiName: this.apiName },
@ -87,8 +87,8 @@ export class TMDBMovieAPI extends APIModel {
fetch: obsidianFetch,
}),
cause =>
toAppError(cause, {
kind: AppErrorKind.Network,
toMdbError(cause, {
kind: MDBErrorKind.Network,
message: `MDB | Network error querying ${this.apiName}`,
userMessage: `Network error querying ${this.apiName}`,
context: { apiName: this.apiName, title },
@ -103,7 +103,7 @@ export class TMDBMovieAPI extends APIModel {
if (response.response.status === 401) {
return err({
kind: AppErrorKind.Api,
kind: MDBErrorKind.Api,
message: `MDB | Authentication for ${this.apiName} failed. Check the API key.`,
userMessage: `Authentication for ${this.apiName} failed. Check the API key.`,
context: { apiName: this.apiName },
@ -111,7 +111,7 @@ export class TMDBMovieAPI extends APIModel {
}
if (response.response.status !== 200) {
return err({
kind: AppErrorKind.Api,
kind: MDBErrorKind.Api,
message: `MDB | Received status code ${response.response.status} from ${this.apiName}.`,
userMessage: `Received status code ${response.response.status} from ${this.apiName}.`,
context: { apiName: this.apiName, status: response.response.status },
@ -122,7 +122,7 @@ export class TMDBMovieAPI extends APIModel {
if (!data) {
return err({
kind: AppErrorKind.Api,
kind: MDBErrorKind.Api,
message: `MDB | No data received from ${this.apiName}.`,
userMessage: `No data received from ${this.apiName}.`,
context: { apiName: this.apiName },
@ -153,13 +153,13 @@ export class TMDBMovieAPI extends APIModel {
return ok(ret);
}
async getById(id: string): Promise<Result<MediaTypeModel, AppError>> {
async getById(id: string): Promise<Result<MediaTypeModel, MDBError>> {
Logger.log(`MDB | api "${this.apiName}" queried by ID`);
const key = this.plugin.app.secretStorage.getSecret(this.plugin.settings.TMDBKeyId);
if (!key) {
return err({
kind: AppErrorKind.Validation,
kind: MDBErrorKind.Validation,
message: `MDB | API key for ${this.apiName} missing.`,
userMessage: `API key for ${this.apiName} missing.`,
context: { apiName: this.apiName },
@ -181,8 +181,8 @@ export class TMDBMovieAPI extends APIModel {
fetch: obsidianFetch,
}),
cause =>
toAppError(cause, {
kind: AppErrorKind.Network,
toMdbError(cause, {
kind: MDBErrorKind.Network,
message: `MDB | Network error querying ${this.apiName}`,
userMessage: `Network error querying ${this.apiName}`,
context: { apiName: this.apiName, id },
@ -197,7 +197,7 @@ export class TMDBMovieAPI extends APIModel {
if (response.response.status === 401) {
return err({
kind: AppErrorKind.Api,
kind: MDBErrorKind.Api,
message: `MDB | Authentication for ${this.apiName} failed. Check the API key.`,
userMessage: `Authentication for ${this.apiName} failed. Check the API key.`,
context: { apiName: this.apiName },
@ -205,7 +205,7 @@ export class TMDBMovieAPI extends APIModel {
}
if (response.response.status !== 200) {
return err({
kind: AppErrorKind.Api,
kind: MDBErrorKind.Api,
message: `MDB | Received status code ${response.response.status} from ${this.apiName}.`,
userMessage: `Received status code ${response.response.status} from ${this.apiName}.`,
context: { apiName: this.apiName, status: response.response.status, id },
@ -216,7 +216,7 @@ export class TMDBMovieAPI extends APIModel {
if (!result) {
return err({
kind: AppErrorKind.Api,
kind: MDBErrorKind.Api,
message: `MDB | No data received from ${this.apiName}.`,
userMessage: `No data received from ${this.apiName}.`,
context: { apiName: this.apiName, id },