From 22046e35326bf7e51ddd193b33949a9c85eea869 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 19 Jun 2023 18:09:44 +0800 Subject: [PATCH] feat: allow dataPublished and dateSaved to be used as filename --- esbuild.config.mjs | 1 - package-lock.json | 27 +++++++-------------------- src/main.ts | 5 ++--- src/settings/template.ts | 9 +++++++-- 4 files changed, 16 insertions(+), 26 deletions(-) diff --git a/esbuild.config.mjs b/esbuild.config.mjs index 15cdd00..9271ad3 100644 --- a/esbuild.config.mjs +++ b/esbuild.config.mjs @@ -31,7 +31,6 @@ esbuild.build({ '@lezer/common', '@lezer/highlight', '@lezer/lr', - 'out-of-character', ...builtins], format: 'cjs', watch: !prod, diff --git a/package-lock.json b/package-lock.json index 4196b7a..c337703 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "luxon": "^3.1.1", "markdown-escape": "^2.0.0", "mustache": "^4.2.0", + "out-of-character": "^1.2.1", "process": "^0.11.10" }, "devDependencies": { @@ -36,7 +37,6 @@ "jest-cli": "^29.4.3", "jest-junit-reporter": "^1.1.0", "obsidian": "^1.2.8", - "out-of-character": "^1.2.1", "prettier": "^2.8.1", "semantic-release": "^19.0.5", "ts-jest": "^29.0.5", @@ -2314,8 +2314,7 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/before-after-hook": { "version": "2.2.3", @@ -2333,7 +2332,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2600,8 +2598,7 @@ "node_modules/colorette": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" }, "node_modules/compare-func": { "version": "2.0.0", @@ -2616,8 +2613,7 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/config-chain": { "version": "1.1.13", @@ -3872,8 +3868,7 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { "version": "2.3.2", @@ -4247,7 +4242,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -4256,8 +4250,7 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ini": { "version": "1.3.8", @@ -5659,7 +5652,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -8413,7 +8405,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -8455,7 +8446,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/out-of-character/-/out-of-character-1.2.1.tgz", "integrity": "sha512-clqCX4lNQa5Qr7urMNej2DbKVt+SO5CZ9Sq4XYEJ04qzvDHA4yFMhz0F+vLrfxO89640x8W56D7wtNoAgCCcAA==", - "dev": true, "dependencies": { "colorette": "1.2.2", "glob": "7.1.7" @@ -8471,7 +8461,6 @@ "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -8634,7 +8623,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -10312,8 +10300,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/write-file-atomic": { "version": "4.0.2", diff --git a/src/main.ts b/src/main.ts index 7d252d5..2d1480f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -172,7 +172,6 @@ export default class OmnivorePlugin extends Plugin { template, folder, filename, - folderDateFormat, isSingleFile, frontMatterVariables, frontMatterTemplate, @@ -254,7 +253,7 @@ export default class OmnivorePlugin extends Plugin { ); // use the custom filename const customFilename = replaceIllegalChars( - renderFilename(article, filename, folderDateFormat) + renderFilename(article, filename, this.settings.filenameDateFormat) ); const pageName = `${folderName}/${customFilename}.md`; const normalizedPath = normalizePath(pageName); @@ -642,7 +641,7 @@ class OmnivoreSettingTab extends PluginSettingTab { new Setting(containerEl) .setName("Filename") .setDesc( - "Enter the filename where the data will be stored. {{{title}}} and {{{date}}} could be used in the filename" + "Enter the filename where the data will be stored. {{{title}}}, {{{date}}} and {{{datePublished}}} could be used in the filename" ) .addText((text) => text diff --git a/src/settings/template.ts b/src/settings/template.ts index eaff5e4..6b17f04 100644 --- a/src/settings/template.ts +++ b/src/settings/template.ts @@ -124,12 +124,17 @@ const functionMap: FunctionMap = { export const renderFilename = ( article: Article, filename: string, - folderDateFormat: string + dateFormat: string ) => { - const date = formatDate(article.savedAt, folderDateFormat); + const date = formatDate(article.savedAt, dateFormat); + const datePublished = article.publishedAt + ? formatDate(article.publishedAt, dateFormat).trim() + : undefined; const renderedFilename = Mustache.render(filename, { ...article, date, + dateSaved: date, + datePublished, }); // truncate the filename to 100 characters