correct formatting of the date in Org-Mode

add tags to Org-Mode header add field `tags` to YAML front matter with same content as the `keywords` field
Release-Candidate · Oct 8, 2021 · ec88aee · ec88aee
1 parent 76cb9ad
commit ec88aee
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Notoy Browser Extensions Changelog
 
+## Version 1.0.1 (2021-10-08)
+
+- correct formatting of the date in Org-Mode (with angle brackets, like `<2021-10-08>`)
+- add tags to Org-Mode header
+- add field `tags` to YAML front matter with same content as the `keywords` field
+
 ## Version 1.0.0 (2021-10-05)
 
 - Translations finished:

diff --git a/Chrome/formatContent.js b/Chrome/formatContent.js
@@ -11,6 +11,8 @@
 /* eslint-disable no-undef */
 // Most names are not locally used.
 /* eslint-disable no-unused-vars */
+// Eslint and Prettier disagree on formatting
+/* eslint-disable indent */
 
 //=============================================================================
 // Translation constants
@@ -51,7 +53,7 @@ function getMarkdown({
 } = {}) {
     return `${getYamlFrontMatter({ title, keywords, addYaml })}# ${title}
 
-${getTimestamp(addTimestamp)}${transKeywords} ${tagifyKeywords(keywords)}
+${getTimestamp({ addTimestamp })}${transKeywords} ${tagifyKeywords(keywords)}
 
 ${description}
 [${title}](${url})
@@ -78,9 +80,13 @@ function getOrgMode({
 #+date:   ${getDateString()}
 #+FILETAGS: ${orgifyKeywords(keywords)}
 
-* ${title}
+* ${title}\t\t${orgifyKeywords(keywords)}
 
-${getTimestamp(addTimestamp)}${transKeywords} ${keywords}
+${getTimestamp({
+    addTimestamp,
+    start: "<",
+    end: ">",
+})}${transKeywords} ${keywords}
 
 ${description}
 [[${url}][${title}]]
@@ -106,7 +112,7 @@ function getPlainText({
 } = {}) {
     return `${getYamlFrontMatter({ title, keywords, addYaml })}${title}
 
-${getTimestamp(addTimestamp)}${transKeywords} ${keywords}
+${getTimestamp({ addTimestamp })}${transKeywords} ${keywords}
 
 ${description}
 ${url}
@@ -168,6 +174,7 @@ title: "${title}"
 author:
   -
 keywords: ${getKeywordsYAML(keywords)}
+tags: ${getKeywordsYAML(keywords)}
 lang: ${chrome.i18n.getUILanguage()}
 ---`
     return addYaml ? yamlString + "\n\n" : ""
@@ -178,11 +185,13 @@ lang: ${chrome.i18n.getUILanguage()}
  *
  * @param {*} addTimestamp If this is `true`, a date string is returned, else
  * the empty string.
+ * @param {*} start The string to add before the date string
+ * @param {*} end The string to add after the date string
  * @returns The current date as string, if `addTimestamp` is `true`, the empty
  * string ("") else.
  */
-function getTimestamp(addTimestamp) {
-    return addTimestamp ? getDateString() + "\n\n" : ""
+function getTimestamp({ addTimestamp, start = "", end = "" }) {
+    return addTimestamp ? start + getDateString() + end + "\n\n" : ""
 }
 
 /**

diff --git a/Chrome/manifest.json b/Chrome/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_extensionName__",
     "description": "__MSG_extensionDescription__",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "default_locale": "en",
     "manifest_version": 3,
     "author": "Roland Csaszar",

diff --git a/Edge/formatContent.js b/Edge/formatContent.js
@@ -11,6 +11,8 @@
 /* eslint-disable no-undef */
 // Most names are not locally used.
 /* eslint-disable no-unused-vars */
+// Eslint and Prettier disagree on formatting
+/* eslint-disable indent */
 
 //=============================================================================
 // Translation constants
@@ -51,7 +53,7 @@ function getMarkdown({
 } = {}) {
     return `${getYamlFrontMatter({ title, keywords, addYaml })}# ${title}
 
-${getTimestamp(addTimestamp)}${transKeywords} ${tagifyKeywords(keywords)}
+${getTimestamp({ addTimestamp })}${transKeywords} ${tagifyKeywords(keywords)}
 
 ${description}
 [${title}](${url})
@@ -78,9 +80,13 @@ function getOrgMode({
 #+date:   ${getDateString()}
 #+FILETAGS: ${orgifyKeywords(keywords)}
 
-* ${title}
+* ${title}\t\t${orgifyKeywords(keywords)}
 
-${getTimestamp(addTimestamp)}${transKeywords} ${keywords}
+${getTimestamp({
+    addTimestamp,
+    start: "<",
+    end: ">",
+})}${transKeywords} ${keywords}
 
 ${description}
 [[${url}][${title}]]
@@ -106,7 +112,7 @@ function getPlainText({
 } = {}) {
     return `${getYamlFrontMatter({ title, keywords, addYaml })}${title}
 
-${getTimestamp(addTimestamp)}${transKeywords} ${keywords}
+${getTimestamp({ addTimestamp })}${transKeywords} ${keywords}
 
 ${description}
 ${url}
@@ -168,6 +174,7 @@ title: "${title}"
 author:
   -
 keywords: ${getKeywordsYAML(keywords)}
+tags: ${getKeywordsYAML(keywords)}
 lang: ${chrome.i18n.getUILanguage()}
 ---`
     return addYaml ? yamlString + "\n\n" : ""
@@ -178,11 +185,13 @@ lang: ${chrome.i18n.getUILanguage()}
  *
  * @param {*} addTimestamp If this is `true`, a date string is returned, else
  * the empty string.
+ * @param {*} start The string to add before the date string
+ * @param {*} end The string to add after the date string
  * @returns The current date as string, if `addTimestamp` is `true`, the empty
  * string ("") else.
  */
-function getTimestamp(addTimestamp) {
-    return addTimestamp ? getDateString() + "\n\n" : ""
+function getTimestamp({ addTimestamp, start = "", end = "" }) {
+    return addTimestamp ? start + getDateString() + end + "\n\n" : ""
 }
 
 /**

diff --git a/Edge/manifest.json b/Edge/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "__MSG_extensionName__",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "__MSG_extensionDescription__",
     "author": "Roland Csaszar",
     "default_locale": "en",

diff --git a/Edge/options.css b/Edge/options.css
@@ -3,6 +3,7 @@ html {
     padding-left: 10vw;
     padding-top: 5vh;
     padding-bottom: 10vh;
+    width: 800px;
     margin: 0px;
     box-sizing: border-box;
     background-color: whitesmoke;

diff --git a/Firefox/formatContent.js b/Firefox/formatContent.js
@@ -11,6 +11,8 @@
 /* eslint-disable no-undef */
 // Most names are not locally used.
 /* eslint-disable no-unused-vars */
+// Eslint and Prettier disagree on formatting
+/* eslint-disable indent */
 
 //=============================================================================
 // Translation constants
@@ -51,7 +53,7 @@ function getMarkdown({
 } = {}) {
     return `${getYamlFrontMatter({ title, keywords, addYaml })}# ${title}
 
-${getTimestamp(addTimestamp)}${transKeywords} ${tagifyKeywords(keywords)}
+${getTimestamp({ addTimestamp })}${transKeywords} ${tagifyKeywords(keywords)}
 
 ${description}
 [${title}](${url})
@@ -78,9 +80,13 @@ function getOrgMode({
 #+date:   ${getDateString()}
 #+FILETAGS: ${orgifyKeywords(keywords)}
 
-* ${title}
+* ${title}\t\t${orgifyKeywords(keywords)}
 
-${getTimestamp(addTimestamp)}${transKeywords} ${keywords}
+${getTimestamp({
+    addTimestamp,
+    start: "<",
+    end: ">",
+})}${transKeywords} ${keywords}
 
 ${description}
 [[${url}][${title}]]
@@ -106,7 +112,7 @@ function getPlainText({
 } = {}) {
     return `${getYamlFrontMatter({ title, keywords, addYaml })}${title}
 
-${getTimestamp(addTimestamp)}${transKeywords} ${keywords}
+${getTimestamp({ addTimestamp })}${transKeywords} ${keywords}
 
 ${description}
 ${url}
@@ -168,6 +174,7 @@ title: "${title}"
 author:
   -
 keywords: ${getKeywordsYAML(keywords)}
+tags: ${getKeywordsYAML(keywords)}
 lang: ${browser.i18n.getUILanguage()}
 ---`
     return addYaml ? yamlString + "\n\n" : ""
@@ -178,11 +185,13 @@ lang: ${browser.i18n.getUILanguage()}
  *
  * @param {*} addTimestamp If this is `true`, a date string is returned, else
  * the empty string.
+ * @param {*} start The string to add before the date string
+ * @param {*} end The string to add after the date string
  * @returns The current date as string, if `addTimestamp` is `true`, the empty
  * string ("") else.
  */
-function getTimestamp(addTimestamp) {
-    return addTimestamp ? getDateString() + "\n\n" : ""
+function getTimestamp({ addTimestamp, start = "", end = "" }) {
+    return addTimestamp ? start + getDateString() + end + "\n\n" : ""
 }
 
 /**

diff --git a/Firefox/manifest.json b/Firefox/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "__MSG_extensionName__",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "__MSG_extensionDescription__",
     "author": "Roland Csaszar",
     "default_locale": "en",