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

Merge pull request #50 from AB1908/master

Browse source 
Fix MediaDB note updates so that they preserve content
This commit is contained in:
Moritz Jung 2022-09-23 13:25:20 +02:00 • committed by GitHub
commit 72b7eb8982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/main.ts
View file

@ -185,16 +185,10 @@ export default class MediaDbPlugin extends Plugin {
async createMediaDbNoteFromModel(mediaTypeModel: MediaTypeModel, attachFile?: TFile): Promise<void> { async createMediaDbNoteFromModel(mediaTypeModel: MediaTypeModel, attachFile?: TFile): Promise<void> {
try { try {
console.log('MDB | Creating new note...'); console.log('MDB | Creating new note...');
// console.log(mediaTypeModel);
let fileMetadata = this.modelPropertyMapper.convertObject(mediaTypeModel.toMetaDataObject()); let fileContent = await this.generateMediaDbNoteContents(mediaTypeModel, attachFile);
let fileContent = '';
({fileMetadata, fileContent} = await this.attachFile(fileMetadata, fileContent, attachFile));
({fileMetadata, fileContent} = await this.attachTemplate(fileMetadata, fileContent, await this.mediaTypeManager.getTemplate(mediaTypeModel, this.app)));
fileContent = `---\n${this.settings.useCustomYamlStringifier ? YAMLConverter.toYaml(fileMetadata) : stringifyYaml(fileMetadata)}---\n` + fileContent;
console.log("Inside createMediaDbNote", fileContent)
await this.createNote(this.mediaTypeManager.getFileName(mediaTypeModel), fileContent); await this.createNote(this.mediaTypeManager.getFileName(mediaTypeModel), fileContent);
} catch (e) { } catch (e) {
console.warn(e); console.warn(e);
@ -202,6 +196,18 @@ export default class MediaDbPlugin extends Plugin {
} }
} }
private async generateMediaDbNoteContents(mediaTypeModel: MediaTypeModel, attachFile: TFile) {
let fileMetadata = this.modelPropertyMapper.convertObject(mediaTypeModel.toMetaDataObject());
let fileContent = '';
({ fileMetadata, fileContent } = await this.attachFile(fileMetadata, fileContent, attachFile));
console.log("Inside createYAML", attachFile);
({ fileMetadata, fileContent } = await this.attachTemplate(fileMetadata, fileContent, await this.mediaTypeManager.getTemplate(mediaTypeModel, this.app)));
fileContent = `---\n${this.settings.useCustomYamlStringifier ? YAMLConverter.toYaml(fileMetadata) : stringifyYaml(fileMetadata)}---` + fileContent;
return fileContent;
}
async attachFile(fileMetadata: any, fileContent: string, fileToAttach?: TFile): Promise<{ fileMetadata: any, fileContent: string }> { async attachFile(fileMetadata: any, fileContent: string, fileToAttach?: TFile): Promise<{ fileMetadata: any, fileContent: string }> {
if (!fileToAttach) { if (!fileToAttach) {
return {fileMetadata: fileMetadata, fileContent: fileContent}; return {fileMetadata: fileMetadata, fileContent: fileContent};
@ -219,7 +225,8 @@ export default class MediaDbPlugin extends Plugin {
let attachFileContent: string = await this.app.vault.read(fileToAttach); let attachFileContent: string = await this.app.vault.read(fileToAttach);
const regExp = new RegExp('^(---)\\n[\\s\\S]*\\n---'); const regExp = new RegExp('^(---)\\n[\\s\\S]*\\n---');
attachFileContent = attachFileContent.replace(regExp, ''); attachFileContent = attachFileContent.replace(regExp, '');
fileContent += '\n' + attachFileContent; fileContent += attachFileContent;
console.log("Inside attachfile", fileContent)
return {fileMetadata: fileMetadata, fileContent: fileContent}; return {fileMetadata: fileMetadata, fileContent: fileContent};
} }
@ -234,7 +241,7 @@ export default class MediaDbPlugin extends Plugin {
const regExp = new RegExp('^(---)\\n[\\s\\S]*\\n---'); const regExp = new RegExp('^(---)\\n[\\s\\S]*\\n---');
const attachFileContent = template.replace(regExp, ''); const attachFileContent = template.replace(regExp, '');
fileContent += '\n' + attachFileContent; fileContent += attachFileContent;
return {fileMetadata: fileMetadata, fileContent: fileContent}; return {fileMetadata: fileMetadata, fileContent: fileContent};
} }
@ -331,8 +338,7 @@ export default class MediaDbPlugin extends Plugin {
newMediaTypeModel = Object.assign(oldMediaTypeModel, newMediaTypeModel.getWithOutUserData()); newMediaTypeModel = Object.assign(oldMediaTypeModel, newMediaTypeModel.getWithOutUserData());
console.log('MDB | deleting old entry'); console.log('MDB | deleting old entry');
await this.app.vault.delete(activeFile); await this.createMediaDbNoteFromModel(newMediaTypeModel, activeFile);
await this.createMediaDbNoteFromModel(newMediaTypeModel);
} }
async createEntriesFromFolder(folder: TFolder) { async createEntriesFromFolder(folder: TFolder) {
@ -347,7 +353,7 @@ export default class MediaDbPlugin extends Plugin {
for (const child of folder.children) { for (const child of folder.children) {
if (child instanceof TFile) { if (child instanceof TFile) {
const file = child as TFile; const file: TFile = child;
if (canceled) { if (canceled) {
erroredFiles.push({filePath: file.path, error: 'user canceled'}); erroredFiles.push({filePath: file.path, error: 'user canceled'});
continue; continue;
@ -426,7 +432,7 @@ export default class MediaDbPlugin extends Plugin {
const filePath = `${this.settings.folder.replace(/\/$/, '')}/${title}.md`; const filePath = `${this.settings.folder.replace(/\/$/, '')}/${title}.md`;
const table = [['file', 'error']].concat(erroredFiles.map(x => [x.filePath, x.error])); const table = [['file', 'error']].concat(erroredFiles.map(x => [x.filePath, x.error]));
// console.log(table)
let fileContent = `# ${title}\n\n${markdownTable(table)}`; let fileContent = `# ${title}\n\n${markdownTable(table)}`;
const targetFile = await this.app.vault.create(filePath, fileContent); const targetFile = await this.app.vault.create(filePath, fileContent);