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

fix some issues; migrate to bun'

Browse source
This commit is contained in:
Moritz Jung 2024-04-11 22:30:55 +02:00
parent cf3d5c6d6f
commit 54293ac3a1
56 changed files with 1360 additions and 764 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/settings/Icon.svelte
View file

@ -1,8 +1,8 @@
<!--adapted from @joethei's code: https://github.com/joethei/obsidian-rss/blob/master/src/view/IconComponent.svelte-->
<!--adapted from @javalent's code: https://discord.com/channels/686053708261228577/840286264964022302/902949764209987654-->
<script lang="ts">
import {setIcon} from 'obsidian';
import {onMount} from 'svelte';
import { setIcon } from 'obsidian';
import { onMount } from 'svelte';
export let iconName: string = '';
export let iconSize: number = 20;
@ -14,23 +14,23 @@
});
</script>
<style>
.icon-wrapper {
display: inline-block;
position: relative;
width: 20px;
}
.icon {
position: absolute;
height: 20px;
width: 20px;
top: calc(50% - 10px);
}
</style>
{#if iconName.length > 0}
<div class="icon-wrapper">
<div bind:this={iconEl} class="icon"></div>
</div>
{/if}
<style>
.icon-wrapper {
display: inline-block;
position: relative;
width: 20px;
}
.icon {
position: absolute;
height: 20px;
width: 20px;
top: calc(50% - 10px);
}
</style>

14
src/settings/PropertyMapper.ts
View file

@ -15,15 +15,13 @@ export class PropertyMapper {
*
* @param obj
*/
convertObject(obj: object): object {
convertObject(obj: Record<string, unknown>): Record<string, unknown> {
if (!obj.hasOwnProperty('type')) {
return obj;
}
// @ts-ignore
// console.log(obj.type);
// @ts-ignore
if (MEDIA_TYPES.filter(x => x.toString() == obj.type).length < 1) {
return obj;
}
@ -31,7 +29,7 @@ export class PropertyMapper {
// @ts-ignore
const propertyMappings = this.plugin.settings.propertyMappingModels.find(x => x.type === obj.type).properties;
const newObj: object = {};
const newObj: Record<string, unknown> = {};
for (const [key, value] of Object.entries(obj)) {
for (const propertyMapping of propertyMappings) {
@ -59,20 +57,18 @@ export class PropertyMapper {
*
* @param obj
*/
convertObjectBack(obj: object): object {
convertObjectBack(obj: Record<string, unknown>): Record<string, unknown> {
if (!obj.hasOwnProperty('type')) {
return obj;
}
// @ts-ignore
if (MEDIA_TYPES.contains(obj.type)) {
if (MEDIA_TYPES.contains(obj.type as any)) {
return obj;
}
// @ts-ignore
const propertyMappings = this.plugin.settings.propertyMappingModels.find(x => x.type === obj.type).properties;
const originalObj: object = {};
const originalObj: Record<string, unknown> = {};
objLoop: for (const [key, value] of Object.entries(obj)) {
// first try if it is a normal property

2
src/settings/PropertyMapping.ts
View file

@ -68,7 +68,7 @@ export class PropertyMappingModel {
};
}
getMappedProperties() {
getMappedProperties(): PropertyMapping[] {
return this.properties.filter(x => x.mapping === PropertyMappingOption.Map);
}

44
src/settings/PropertyMappingModelComponent.svelte
View file

@ -1,12 +1,12 @@
<script lang="ts">
import {PropertyMappingModel, PropertyMappingOption, propertyMappingOptions} from './PropertyMapping';
import {capitalizeFirstLetter} from '../utils/Utils';
import { PropertyMappingModel, PropertyMappingOption, propertyMappingOptions } from './PropertyMapping';
import { capitalizeFirstLetter } from '../utils/Utils';
import Icon from './Icon.svelte';
export let model: PropertyMappingModel;
export let save: (model: PropertyMappingModel) => void;
let validationResult: { res: boolean, err?: Error };
let validationResult: { res: boolean; err?: Error };
$: modelChanged(model);
@ -15,23 +15,17 @@
}
</script>
<style>
</style>
<div class="media-db-plugin-property-mappings-model-container">
<div class="setting-item-name">{capitalizeFirstLetter(model.type)}</div>
<div class="media-db-plugin-property-mappings-container">
{ #each model.properties as property }
{#each model.properties as property}
<div class="media-db-plugin-property-mapping-element">
<div class="media-db-plugin-property-mapping-element-property-name-wrapper">
<pre class="media-db-plugin-property-mapping-element-property-name"><code>{property.property}</code></pre>
</div>
{ #if property.locked }
<div class="media-db-plugin-property-binding-text">
property can not be remapped
</div>
{ :else }
{#if property.locked}
<div class="media-db-plugin-property-binding-text">property can not be remapped</div>
{:else}
<select class="dropdown" bind:value={property.mapping}>
{#each propertyMappingOptions as remappingOption}
<option value={remappingOption}>
@ -40,23 +34,29 @@
{/each}
</select>
{ #if property.mapping === PropertyMappingOption.Map }
<Icon iconName="arrow-right"/>
{#if property.mapping === PropertyMappingOption.Map}
<Icon iconName="arrow-right" />
<div class="media-db-plugin-property-mapping-to">
<input type="text" spellcheck="false" bind:value="{property.newProperty}">
<input type="text" spellcheck="false" bind:value={property.newProperty} />
</div>
{ /if }
{ /if }
{/if}
{/if}
</div>
{ /each }
{/each}
</div>
{ #if !validationResult?.res }
{#if !validationResult?.res}
<div class="media-db-plugin-property-mapping-validation">
{validationResult?.err?.message}
</div>
{ /if }
{/if}
<button
class="media-db-plugin-property-mappings-save-button {validationResult?.res ? 'mod-cta' : 'mod-muted'}"
on:click={() => { if(model.validate().res) save(model) }}>Save
on:click={() => {
if (model.validate().res) save(model);
}}
>Save
</button>
</div>
<style>
</style>

15
src/settings/PropertyMappingModelsComponent.svelte
View file

@ -1,19 +1,15 @@
<script lang="ts">
import {PropertyMappingModel} from './PropertyMapping';
import { PropertyMappingModel } from './PropertyMapping';
import PropertyMappingModelComponent from './PropertyMappingModelComponent.svelte';
export let models: PropertyMappingModel[] = [];
export let save: (model: PropertyMappingModel) => void;
</script>
<style>
</style>
<div class="setting-item" style="display: flex; gap: 10px; flex-direction: column; align-items: stretch;">
{ #each models as model }
<PropertyMappingModelComponent model={model} save={save}></PropertyMappingModelComponent>
{ /each }
{#each models as model}
<PropertyMappingModelComponent {model} {save}></PropertyMappingModelComponent>
{/each}
<!--
<pre>{JSON.stringify(models, null, 4)}</pre>
@ -25,3 +21,6 @@
{/each}
-->
</div>
<style>
</style>

115
src/settings/Settings.ts
View file

@ -13,7 +13,6 @@ export interface MediaDbPluginSettings {
OMDbKey: string;
MobyGamesKey: string;
sfwFilter: boolean;
useCustomYamlStringifier: boolean;
templates: boolean;
customDateFormat: string;
openNoteInNewTab: boolean;
@ -24,18 +23,18 @@ export interface MediaDbPluginSettings {
movie: boolean;
series: boolean;
game: boolean;
},
};
MALAPI: {
movie: boolean;
series: boolean;
},
};
SteamAPI: {
game: boolean;
},
};
MobyGamesAPI: {
game: boolean;
}
},
};
};
movieTemplate: string;
seriesTemplate: string;
mangaTemplate: string;
@ -79,7 +78,6 @@ const DEFAULT_SETTINGS: MediaDbPluginSettings = {
OMDbKey: '',
MobyGamesKey: '',
sfwFilter: true,
useCustomYamlStringifier: true,
templates: true,
customDateFormat: 'L',
openNoteInNewTab: true,
@ -100,7 +98,7 @@ const DEFAULT_SETTINGS: MediaDbPluginSettings = {
},
MobyGamesAPI: {
game: true,
}
},
},
movieTemplate: '',
seriesTemplate: '',
@ -190,7 +188,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.OMDbKey)
.onChange(data => {
this.plugin.settings.OMDbKey = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -202,7 +200,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.MobyGamesKey)
.onChange(data => {
this.plugin.settings.MobyGamesKey = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -212,17 +210,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.sfwFilter).onChange(data => {
this.plugin.settings.sfwFilter = data;
this.plugin.saveSettings();
});
});
new Setting(containerEl)
.setName('YAML formatter')
.setDesc('Add optional quotation marks around strings in the metadata block.')
.addToggle(cb => {
cb.setValue(this.plugin.settings.useCustomYamlStringifier).onChange(data => {
this.plugin.settings.useCustomYamlStringifier = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -232,7 +220,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.templates).onChange(data => {
this.plugin.settings.templates = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -241,10 +229,10 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setDesc(
fragWithHTML(
"Your custom date format. Use <em>'YYYY-MM-DD'</em> for example.<br>" +
"For more syntax, refer to <a href='https://momentjs.com/docs/#/displaying/format/'>format reference</a>.<br>" +
"Your current syntax looks like this: <b><a id='media-db-dateformat-preview' style='pointer-events: none; cursor: default; text-decoration: none;'>" +
this.plugin.dateFormatter.getPreview() +
'</a></b>',
"For more syntax, refer to <a href='https://momentjs.com/docs/#/displaying/format/'>format reference</a>.<br>" +
"Your current syntax looks like this: <b><a id='media-db-dateformat-preview' style='pointer-events: none; cursor: default; text-decoration: none;'>" +
this.plugin.dateFormatter.getPreview() +
'</a></b>',
),
)
.addText(cb => {
@ -254,7 +242,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
const newDateFormat = data ? data : DEFAULT_SETTINGS.customDateFormat;
this.plugin.settings.customDateFormat = newDateFormat;
document.getElementById('media-db-dateformat-preview').textContent = this.plugin.dateFormatter.getPreview(newDateFormat); // update preview
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -264,17 +252,17 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.openNoteInNewTab).onChange(data => {
this.plugin.settings.openNoteInNewTab = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
new Setting(containerEl)
.setName('Use default front matter')
.setDesc('Wheter to use the default front matter. If disabled, the front matter from the template will be used. Same as mapping everything to remove.')
.setDesc('Whether to use the default front matter. If disabled, the front matter from the template will be used. Same as mapping everything to remove.')
.addToggle(cb => {
cb.setValue(this.plugin.settings.useDefaultFrontMatter).onChange(data => {
this.plugin.settings.useDefaultFrontMatter = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
// Redraw settings to display/remove the property mappings
this.display();
});
@ -288,11 +276,10 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.enableTemplaterIntegration).onChange(data => {
this.plugin.settings.enableTemplaterIntegration = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
containerEl.createEl('h3', { text: 'APIs Per Media Type' });
containerEl.createEl('h5', { text: 'Movies' });
new Setting(containerEl)
@ -301,7 +288,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.apiToggle.OMDbAPI.movie).onChange(data => {
this.plugin.settings.apiToggle.OMDbAPI.movie = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
new Setting(containerEl)
@ -310,7 +297,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.apiToggle.MALAPI.movie).onChange(data => {
this.plugin.settings.apiToggle.MALAPI.movie = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
containerEl.createEl('h5', { text: 'Series' });
@ -320,7 +307,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.apiToggle.OMDbAPI.series).onChange(data => {
this.plugin.settings.apiToggle.OMDbAPI.series = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
new Setting(containerEl)
@ -329,7 +316,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.apiToggle.MALAPI.series).onChange(data => {
this.plugin.settings.apiToggle.MALAPI.series = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
containerEl.createEl('h5', { text: 'Games' });
@ -339,7 +326,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.apiToggle.OMDbAPI.game).onChange(data => {
this.plugin.settings.apiToggle.OMDbAPI.game = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
new Setting(containerEl)
@ -348,7 +335,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.apiToggle.SteamAPI.game).onChange(data => {
this.plugin.settings.apiToggle.SteamAPI.game = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
new Setting(containerEl)
@ -357,7 +344,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.addToggle(cb => {
cb.setValue(this.plugin.settings.apiToggle.MobyGamesAPI.game).onChange(data => {
this.plugin.settings.apiToggle.MobyGamesAPI.game = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -372,7 +359,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.movieFolder)
.onChange(data => {
this.plugin.settings.movieFolder = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -385,7 +372,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.seriesFolder)
.onChange(data => {
this.plugin.settings.seriesFolder = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -398,7 +385,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.mangaFolder)
.onChange(data => {
this.plugin.settings.mangaFolder = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -411,7 +398,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.gameFolder)
.onChange(data => {
this.plugin.settings.gameFolder = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -424,7 +411,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.wikiFolder)
.onChange(data => {
this.plugin.settings.wikiFolder = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -437,7 +424,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.musicReleaseFolder)
.onChange(data => {
this.plugin.settings.musicReleaseFolder = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -450,7 +437,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.boardgameFolder)
.onChange(data => {
this.plugin.settings.boardgameFolder = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
new Setting(containerEl)
@ -462,7 +449,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.bookFolder)
.onChange(data => {
this.plugin.settings.bookFolder = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
// endregion
@ -478,7 +465,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.movieTemplate)
.onChange(data => {
this.plugin.settings.movieTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -491,7 +478,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.seriesTemplate)
.onChange(data => {
this.plugin.settings.seriesTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -504,7 +491,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.mangaTemplate)
.onChange(data => {
this.plugin.settings.mangaTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -517,7 +504,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.gameTemplate)
.onChange(data => {
this.plugin.settings.gameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -530,7 +517,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.wikiTemplate)
.onChange(data => {
this.plugin.settings.wikiTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -543,7 +530,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.musicReleaseTemplate)
.onChange(data => {
this.plugin.settings.musicReleaseTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -556,7 +543,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.boardgameTemplate)
.onChange(data => {
this.plugin.settings.boardgameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -569,7 +556,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.bookTemplate)
.onChange(data => {
this.plugin.settings.bookTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
// endregion
@ -584,7 +571,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.movieFileNameTemplate)
.onChange(data => {
this.plugin.settings.movieFileNameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -596,7 +583,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.seriesFileNameTemplate)
.onChange(data => {
this.plugin.settings.seriesFileNameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -608,7 +595,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.mangaFileNameTemplate)
.onChange(data => {
this.plugin.settings.mangaFileNameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -620,7 +607,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.gameFileNameTemplate)
.onChange(data => {
this.plugin.settings.gameFileNameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -632,7 +619,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.wikiFileNameTemplate)
.onChange(data => {
this.plugin.settings.wikiFileNameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -644,7 +631,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.musicReleaseFileNameTemplate)
.onChange(data => {
this.plugin.settings.musicReleaseFileNameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -656,7 +643,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.boardgameFileNameTemplate)
.onChange(data => {
this.plugin.settings.boardgameFileNameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
@ -668,7 +655,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
.setValue(this.plugin.settings.bookFileNameTemplate)
.onChange(data => {
this.plugin.settings.bookFileNameTemplate = data;
this.plugin.saveSettings();
void this.plugin.saveSettings();
});
});
// endregion
@ -709,7 +696,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
this.plugin.settings.propertyMappingModels = propertyMappingModels;
new Notice(`MDB: Property Mappings for ${model.type} saved successfully.`);
this.plugin.saveSettings();
void this.plugin.saveSettings();
},
},
});

2
src/settings/suggesters/Suggest.ts
View file

@ -165,7 +165,7 @@ export abstract class TextInputSuggest<T> implements ISuggestOwner<T> {
(<any>this.app).keymap.popScope(this.scope);
this.suggest.setSuggestions([]);
this.popper.destroy();
this.popper?.destroy();
this.suggestEl.detach();
}