fix #70 #71 #68 #57

src/utils/MediaTypeManager.ts

@@ -2,19 +2,21 @@ import { MediaDbPluginSettings } from '../settings/Settings';
 import { MediaType } from './MediaType';
 import { MediaTypeModel } from '../models/MediaTypeModel';
 import { replaceTags } from './Utils';
-import { App, TFile } from 'obsidian';
+import { App, TAbstractFile, TFile, TFolder } from 'obsidian';
 import { MovieModel } from '../models/MovieModel';
 import { SeriesModel } from '../models/SeriesModel';
 import { GameModel } from '../models/GameModel';
 import { WikiModel } from '../models/WikiModel';
 import { MusicReleaseModel } from '../models/MusicReleaseModel';
 import { BoardGameModel } from '../models/BoardGameModel';
+import { awaitExpression } from '@babel/types';
 
 export const MEDIA_TYPES: MediaType[] = [MediaType.Movie, MediaType.Series, MediaType.Game, MediaType.Wiki, MediaType.MusicRelease, MediaType.BoardGame];
 
 export class MediaTypeManager {
 	mediaFileNameTemplateMap: Map<MediaType, string>;
 	mediaTemplateMap: Map<MediaType, string>;
+	mediaFolderMap: Map<MediaType, string>;
 
 	constructor() {}
 
@@ -36,6 +38,16 @@ export class MediaTypeManager {
 		this.mediaTemplateMap.set(MediaType.BoardGame, settings.boardgameTemplate);
 	}
 
+	updateFolders(settings: MediaDbPluginSettings) {
+		this.mediaFolderMap = new Map<MediaType, string>();
+		this.mediaFolderMap.set(MediaType.Movie, settings.movieFolder);
+		this.mediaFolderMap.set(MediaType.Series, settings.seriesFolder);
+		this.mediaFolderMap.set(MediaType.Game, settings.gameFolder);
+		this.mediaFolderMap.set(MediaType.Wiki, settings.wikiFolder);
+		this.mediaFolderMap.set(MediaType.MusicRelease, settings.musicReleaseFolder);
+		this.mediaFolderMap.set(MediaType.BoardGame, settings.boardgameFolder);
+	}
+
 	getFileName(mediaTypeModel: MediaTypeModel): string {
 		return replaceTags(this.mediaFileNameTemplateMap.get(mediaTypeModel.getMediaType()), mediaTypeModel);
 	}
@@ -61,6 +73,26 @@ export class MediaTypeManager {
 		return replaceTags(template, mediaTypeModel);
 	}
 
+	async getFolder(mediaTypeModel: MediaTypeModel, app: App): Promise<TFolder> {
+		let folderPath = this.mediaFolderMap.get(mediaTypeModel.getMediaType());
+
+		if (!folderPath) {
+			folderPath = `/`;
+		}
+		console.log(folderPath);
+
+		if (!(await app.vault.adapter.exists(folderPath))) {
+			await app.vault.createFolder(folderPath);
+		}
+		let folder: TAbstractFile = app.vault.getAbstractFileByPath(folderPath);
+
+		if (!(folder instanceof TFolder)) {
+			throw Error(`Expected ${folder} to be instance of TFolder`);
+		}
+
+		return folder;
+	}
+
 	/**
 	 * Takes an object and a MediaType and turns the object into an instance of a MediaTypeModel corresponding to the MediaType passed in.
 	 *

src/utils/ModalHelper.ts

@@ -7,6 +7,7 @@ import MediaDbPlugin from '../main';
 import { MediaDbPreviewModal } from 'src/modals/MediaDbPreviewModal';
 import { CreateNoteOptions } from './Utils';
 import { MediaDbSearchModal } from '../modals/MediaDbSearchModal';
+import { MediaType } from './MediaType';
 
 export enum ModalResultCode {
 	SUCCESS,
@@ -77,7 +78,7 @@ export interface PreviewModalResult {
  */
 export interface SearchModalData {
 	query: string;
-	types: string[];
+	types: MediaType[];
 }
 
 /**
@@ -124,7 +125,7 @@ export interface PreviewModalData {
  */
 export interface SearchModalOptions {
 	modalTitle?: string;
-	preselectedTypes?: string[];
+	preselectedTypes?: MediaType[];
 	prefilledSearchString?: string;
 }
 

src/utils/Utils.ts

@@ -202,6 +202,7 @@ export class PropertyMappingNameConflictError extends Error {
  * - attachTemplate: whether to attach the template (DEFAULT: false)
  * - attachFie: a file to attach (DEFAULT: undefined)
  * - openNote: whether to open the note after creation (DEFAULT: false)
+ * - folder: folder to put the note in
  */
 export interface CreateNoteOptions {
 	attachTemplate?: boolean;