changes according to review comments

comments from https://github.com/obsidianmd/obsidian-releases/pull/1807#issuecomment-1486403991
This commit is contained in:
Lena Brueder 2023-04-01 20:31:19 +02:00
parent 2b5f7a67ce
commit e0ba9f81d2
6 changed files with 10 additions and 13 deletions

View file

@ -1,7 +1,7 @@
{ {
"id": "pocketbook-cloud-highlight-importer", "id": "pocketbook-cloud-highlight-importer",
"name": "Pocketbook Cloud Highlight Importer", "name": "Pocketbook Cloud Highlight Importer",
"version": "0.1.1", "version": "0.1.2",
"minAppVersion": "1.1.16", "minAppVersion": "1.1.16",
"description": "Imports notes and highlights from your Pocketbook Cloud account.", "description": "Imports notes and highlights from your Pocketbook Cloud account.",
"author": "Lena Brüder", "author": "Lena Brüder",

4
package-lock.json generated
View file

@ -9,8 +9,7 @@
"version": "1.0.0", "version": "1.0.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"epub-cfi-resolver": "^1.0.1", "epub-cfi-resolver": "^1.0.1"
"yaml": "^2.2.1"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^16.11.6", "@types/node": "^16.11.6",
@ -5031,6 +5030,7 @@
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
"integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==", "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
"dev": true,
"engines": { "engines": {
"node": ">= 14" "node": ">= 14"
} }

View file

@ -25,7 +25,6 @@
"typescript": "4.7.4" "typescript": "4.7.4"
}, },
"dependencies": { "dependencies": {
"epub-cfi-resolver": "^1.0.1", "epub-cfi-resolver": "^1.0.1"
"yaml": "^2.2.1"
} }
} }

View file

@ -1,5 +1,4 @@
import { App, Notice, TFile } from 'obsidian'; import { App, Notice, TFile, stringifyYaml } from 'obsidian';
import { stringify } from 'yaml';
import { PocketbookCloudApiClient, PocketbookCloudLoginClient } from './apiclient'; import { PocketbookCloudApiClient, PocketbookCloudLoginClient } from './apiclient';
import PocketbookCloudHighlightsImporterPlugin from './main'; import PocketbookCloudHighlightsImporterPlugin from './main';
import { PocketbookCloudHighlightsImporterPluginSettings } from './settings'; import { PocketbookCloudHighlightsImporterPluginSettings } from './settings';
@ -60,7 +59,7 @@ export class PocketbookCloudHighlightsImporter {
}; };
const content = // not using multiline strings because they mess up indentation const content = // not using multiline strings because they mess up indentation
'---\n' + '---\n' +
stringify(book_yaml_frontmatter) + stringifyYaml(book_yaml_frontmatter) +
'---\n\n' + '---\n\n' +
'```dataviewjs\n' + '```dataviewjs\n' +
'dv.header(2, dv.current().title)\n' + 'dv.header(2, dv.current().title)\n' +
@ -105,7 +104,7 @@ export class PocketbookCloudHighlightsImporter {
}; };
const content = // not using multiline strings because they mess up indentation const content = // not using multiline strings because they mess up indentation
'---\n' + '---\n' +
stringify(highlight_yaml_frontmatter) + stringifyYaml(highlight_yaml_frontmatter) +
'---\n\n' + '---\n\n' +
`> [!quote]\n> ${highlight.quotation?.text ?? ''}\n\n` + // `> [!quote]\n> ${highlight.quotation?.text ?? ''}\n\n` + //
(highlight.note?.text ? `> [!note]\n> ${highlight.note?.text ?? ''}\n` : ''); (highlight.note?.text ? `> [!note]\n> ${highlight.note?.text ?? ''}\n` : '');

View file

@ -2,8 +2,6 @@ import { Plugin } from 'obsidian';
import { PocketbookCloudHighlightsImporter } from './import'; import { PocketbookCloudHighlightsImporter } from './import';
import { DEFAULT_SETTINGS, PocketbookCloudHighlightsImporterPluginSettings, PocketbookCloudHighlightsImporterSettingTab } from './settings'; import { DEFAULT_SETTINGS, PocketbookCloudHighlightsImporterPluginSettings, PocketbookCloudHighlightsImporterSettingTab } from './settings';
// Remember to rename these classes and interfaces!
export default class PocketbookCloudHighlightsImporterPlugin extends Plugin { export default class PocketbookCloudHighlightsImporterPlugin extends Plugin {
settings: PocketbookCloudHighlightsImporterPluginSettings; settings: PocketbookCloudHighlightsImporterPluginSettings;
importer: PocketbookCloudHighlightsImporter; importer: PocketbookCloudHighlightsImporter;
@ -14,7 +12,7 @@ export default class PocketbookCloudHighlightsImporterPlugin extends Plugin {
// This adds a simple command that can be triggered anywhere // This adds a simple command that can be triggered anywhere
this.addCommand({ this.addCommand({
id: 'pocketbook-cloud-importer-perform-import', id: 'perform-import',
name: 'Import highlights & notes', name: 'Import highlights & notes',
callback: () => { callback: () => {
this.importer.importHighlights(); this.importer.importHighlights();

View file

@ -1,3 +1,4 @@
{ {
"0.1.1": "1.1.16" "0.1.1": "1.1.16",
"0.1.2": "1.1.16"
} }