chhoumann
diff --git a/‎docs/docs/templates.md‎
Lines changed: 12 additions & 3 deletions b/‎docs/docs/templates.md‎
Lines changed: 12 additions & 3 deletions
diff --git a/‎scripts/provision-obsidian-e2e-vault.mjs‎
Lines changed: 19 additions & 1 deletion b/‎scripts/provision-obsidian-e2e-vault.mjs‎
Lines changed: 19 additions & 1 deletion
diff --git a/‎src/TemplateEngine.test.ts‎
Lines changed: 155 additions & 1 deletion b/‎src/TemplateEngine.test.ts‎
Lines changed: 155 additions & 1 deletion
diff --git a/‎src/TemplateEngine.ts‎
Lines changed: 60 additions & 6 deletions b/‎src/TemplateEngine.ts‎
Lines changed: 60 additions & 6 deletions
@@ -12,9 +12,10 @@ This template will be used to create the file path for the note. You can use the
 - `{{podcast}}`: The name of the podcast. You can add a format, e.g. `{{podcast:_}}` to replace spaces with underscores.
 - `{{date}}`: The publish date of the podcast episode. Please note that this is not always available, and will be empty if it is not.
 	- You can use `{{date:format}}` to specify a custom [Moment.js](https://momentjs.com) format. E.g. `{{date:YYYY-MM-DD}}`.
+- `{{currentDate}}`: The current date (when the note is created), as opposed to `{{date}}` (the episode publish date). Supports the same format argument, e.g. `{{currentDate:YYYY-MM-DD}}`.
+- `{{episodeNumber}}`: The episode number (see the [note template](#note-template) section for how it is sourced). Use an all-zeros width to zero-pad for sortable file names, e.g. `{{episodeNumber:000}}` → `042`. Empty when the number is unknown.
 
-Both syntax items will be formatted such that it is safe to use in a file path.
-This means the following characters will be removed: `\ , # % & / { } * < > $ ' " : @ ‣ | ?`.
+`{{title}}` and `{{podcast}}` are sanitized so they are safe to use in a file path: the following characters are removed: `\ , # % & / { } * < > $ ' " : @ ‣ | ?`. `{{episodeNumber}}` is always file-safe. `{{date}}` and `{{currentDate}}` are inserted as-is, so when using them in a path, avoid format strings that contain path-illegal characters (e.g. `{{currentDate:HH:mm}}`).
 
 ## Note template
 This template will be used to create the note text. You can use the following syntax:
@@ -30,6 +31,14 @@ This template will be used to create the note text. You can use the following sy
 - `{{url}}`: The URL of the podcast episode.
 - `{{date}}`: The publish date of the podcast episode.
 	- You can use `{{date:format}}` to specify a custom [Moment.js](https://momentjs.com) format. E.g. `{{date:YYYY-MM-DD}}`.
+- `{{currentDate}}`: The current date — i.e. when the note is created — as opposed to `{{date}}`, which is the episode's publish date. Useful for a "captured on" metadata field.
+	- Supports the same format argument, e.g. `{{currentDate:YYYY-MM-DD}}`.
+- `{{episodeNumber}}`: The episode number. PodNotes uses the feed's `<itunes:episode>` tag when present. If it is missing or not a number, PodNotes makes a **best-effort** guess from the start of the episode title — a leading marker (`#12 ...`, `Ep 12 ...`, `Ep. 12 ...`, `Ep #12 ...`, `Episode 12 ...`, `E12 ...`) or a leading number followed by a separator (`12: ...`, `12 - ...`, `12. ...`, `12) ...`). This guess can be wrong for titles that simply begin with an unrelated number (e.g. `2024: A Year in Review`), so for feeds without `<itunes:episode>` treat it as approximate. The tag is empty when no number can be determined.
+	- You can zero-pad with an all-zeros width, e.g. `{{episodeNumber:000}}` → `042` (handy for sortable file names). Any other argument is ignored and the bare number is returned.
+- `{{duration}}`: The episode's duration, from the feed's `<itunes:duration>` tag. Empty when the feed doesn't provide one. Not available in file-path/download-path templates — even though `{{duration:seconds}}`/`{{duration:minutes}}` would be file-safe, the tag is excluded from path templates entirely so the default colon-containing clock output can't accidentally end up in a file name. Note: an episode that was already the *current* episode before you upgraded PodNotes may show an empty duration until you re-open it from its feed (older saved episodes predate this field).
+	- With no argument it renders a human clock: `4:05` (under an hour) or `1:02:03` (an hour or more).
+	- `{{duration:minutes}}` → total whole minutes (e.g. `62`); `{{duration:seconds}}` → total seconds (e.g. `3723`).
+	- Any other argument is treated as a clock format using the tokens `H`/`HH`, `h`/`hh`, `m`/`mm`, `s`/`ss`, `A`/`a` — e.g. `{{duration:HH:mm:ss}}` → `01:02:03`. (Unlike `{{date}}`, `[literal]` bracket escaping is not supported here.)
 - `{{artwork}}`: The URL of the podcast artwork. If no artwork is found, an empty string will be used.
 
 ### Linking an episode to its podcast (feed) note
@@ -70,7 +79,7 @@ In a feed note, `{{url}}` and `{{artwork}}` describe the **feed** (the note's su
 - `{{artwork}}` / `{{feedartwork}}`: The URL of the podcast artwork.
 - `{{author}}`: The podcast author (`<itunes:author>`), if present.
 - `{{description}}`: The podcast's description. Supports the `{{description:> }}` prepend syntax, like episode notes.
-- `{{date}}`: The current date (when the note is created). Supports `{{date:format}}`.
+- `{{date}}`: The current date (when the note is created). Supports `{{date:format}}`. (In feed notes, `{{date}}` already returns the current date, so `{{currentDate}}` is not registered here — use `{{date}}`.)
 
 The file path template supports `{{title}}`/`{{podcast}}` (with the optional `{{podcast:_}}` whitespace-replacement format) and `{{date}}`.
 
 
@@ -42,6 +42,7 @@ export const DEFAULT_PODNOTES_DATA = {
 		shouldRepeat: false,
 		episodes: [],
 	},
+	autoQueue: true,
 	playlists: {},
 	skipBackwardLength: 15,
 	skipForwardLength: 15,
@@ -53,8 +54,25 @@ export const DEFAULT_PODNOTES_DATA = {
 		path: "",
 		template: "",
 	},
+	feedNote: {
+		path: "PodNotes/Podcasts/{{podcast}}.md",
+		template:
+			"---\n" +
+			"type: podcast\n" +
+			'podcast: "{{podcast}}"\n' +
+			'image: "{{artwork}}"\n' +
+			'url: "{{url}}"\n' +
+			'feedUrl: "{{feedurl}}"\n' +
+			"tags:\n" +
+			"  - podcast\n" +
+			"---\n" +
+			"# {{title}}\n" +
+			"{{author}}\n\n" +
+			"![]({{artwork}})\n\n" +
+			"{{description}}\n",
+	},
 	download: {
-		path: "",
+		path: "PodNotes/{{podcast}}/{{title}}",
 	},
 	downloadedEpisodes: {},
 	localFiles: {
 
@@ -1,9 +1,11 @@
-import { describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
 	DownloadPathTemplateEngine,
 	FeedFilePathTemplateEngine,
 	FeedNoteTemplateEngine,
+	FilePathTemplateEngine,
 	NoteTemplateEngine,
+	TranscriptTemplateEngine,
 	getFeedNoteWikilink,
 } from "./TemplateEngine";
 import type { Episode } from "./types/Episode";
@@ -222,3 +224,155 @@ describe("getFeedNoteWikilink (#163)", () => {
 		expect(getFeedNoteWikilink("My Show: A Podcast")).toBe("[[My Show A Podcast]]");
 	});
 });
+
+describe("{{currentDate}} tag (#75)", () => {
+	beforeEach(() => {
+		plugin.set({ settings: { feedNote: { path: "" }, savedFeeds: {} } } as never);
+		vi.useFakeTimers();
+		// A creation date deliberately different from the episode publish date.
+		vi.setSystemTime(new Date("2026-06-15T08:30:00"));
+	});
+
+	afterEach(() => {
+		vi.useRealTimers();
+	});
+
+	it("renders today's date, defaulting to YYYY-MM-DD", () => {
+		expect(NoteTemplateEngine("{{currentDate}}", demoEpisode)).toBe("2026-06-15");
+	});
+
+	it("supports a Moment.js format and is distinct from the episode {{date}}", () => {
+		expect(
+			NoteTemplateEngine("{{currentDate:YYYY}} vs {{date:YYYY}}", demoEpisode),
+		).toBe("2026 vs 2024");
+	});
+
+	it("supports a format containing commas (not truncated by the engine)", () => {
+		expect(
+			NoteTemplateEngine("{{currentDate:MMMM D, YYYY}}", demoEpisode),
+		).toBe("June 15, 2026");
+	});
+
+	it("is available in file-path and download-path templates", () => {
+		expect(FilePathTemplateEngine("{{currentDate}}", demoEpisode)).toBe(
+			"2026-06-15",
+		);
+		expect(DownloadPathTemplateEngine("{{currentDate}}", demoEpisode)).toBe(
+			"2026-06-15",
+		);
+	});
+});
+
+describe("{{episodeNumber}} tag (#34)", () => {
+	const numbered: Episode = { ...demoEpisode, episodeNumber: 42 };
+
+	beforeEach(() => {
+		plugin.set({ settings: { feedNote: { path: "" }, savedFeeds: {} } } as never);
+	});
+
+	it("renders the episode number", () => {
+		expect(NoteTemplateEngine("{{episodeNumber}}", numbered)).toBe("42");
+	});
+
+	it("zero-pads when given an all-zeros width", () => {
+		expect(NoteTemplateEngine("{{episodeNumber:000}}", numbered)).toBe("042");
+	});
+
+	it("renders a stored episode number of 0 (not treated as absent)", () => {
+		const ep0: Episode = { ...demoEpisode, episodeNumber: 0 };
+		expect(NoteTemplateEngine("{{episodeNumber}}", ep0)).toBe("0");
+	});
+
+	it("falls back to the title when no number is stored (e.g. persisted episodes)", () => {
+		const titleOnly: Episode = { ...demoEpisode, title: "#7 Lucky Seven" };
+		expect(NoteTemplateEngine("{{episodeNumber}}", titleOnly)).toBe("7");
+	});
+
+	it("renders empty when neither the field nor the title has a number", () => {
+		const noNumber: Episode = { ...demoEpisode, title: "A Show With No Number" };
+		expect(NoteTemplateEngine("{{episodeNumber}}", noNumber)).toBe("");
+	});
+
+	it("is available (and file-safe) in file-path and download-path templates", () => {
+		expect(
+			FilePathTemplateEngine("{{episodeNumber:000}} {{title}}", numbered),
+		).toBe("042 Episode 1");
+		expect(
+			DownloadPathTemplateEngine("{{episodeNumber:000}} {{title}}", numbered),
+		).toBe("042 Episode 1");
+	});
+});
+
+describe("{{duration}} tag (#88)", () => {
+	// 1h 02m 03s.
+	const withDuration: Episode = { ...demoEpisode, duration: 3723 };
+
+	beforeEach(() => {
+		plugin.set({ settings: { feedNote: { path: "" }, savedFeeds: {} } } as never);
+	});
+
+	it("renders a human clock by default", () => {
+		expect(NoteTemplateEngine("{{duration}}", withDuration)).toBe("1:02:03");
+	});
+
+	it("supports the minutes and seconds keywords", () => {
+		expect(NoteTemplateEngine("{{duration:minutes}}", withDuration)).toBe("62");
+		expect(NoteTemplateEngine("{{duration:seconds}}", withDuration)).toBe("3723");
+	});
+
+	it("supports a Moment.js clock format", () => {
+		expect(NoteTemplateEngine("{{duration:HH:mm:ss}}", withDuration)).toBe(
+			"01:02:03",
+		);
+	});
+
+	it("renders a zero duration as 0:00 (not empty)", () => {
+		const zero: Episode = { ...demoEpisode, duration: 0 };
+		expect(NoteTemplateEngine("{{duration}}", zero)).toBe("0:00");
+	});
+
+	it("renders empty when the episode has no duration", () => {
+		expect(NoteTemplateEngine("{{duration}}", demoEpisode)).toBe("");
+	});
+
+	it("is not registered in file-path/download-path templates (left unreplaced)", () => {
+		// Intentionally absent there — the clock format's colons are path-illegal.
+		expect(FilePathTemplateEngine("{{duration}}", withDuration)).toBe(
+			"{{duration}}",
+		);
+		expect(DownloadPathTemplateEngine("{{duration}}", withDuration)).toBe(
+			"{{duration}}",
+		);
+	});
+});
+
+describe("TranscriptTemplateEngine new tags (#75/#34/#88)", () => {
+	const fixture: Episode = { ...demoEpisode, episodeNumber: 42, duration: 3723 };
+
+	beforeEach(() => {
+		plugin.set({ settings: { feedNote: { path: "" }, savedFeeds: {} } } as never);
+		vi.useFakeTimers();
+		vi.setSystemTime(new Date("2026-06-15T08:30:00"));
+	});
+
+	afterEach(() => {
+		vi.useRealTimers();
+	});
+
+	it("renders all three new tags in transcript notes", () => {
+		expect(
+			TranscriptTemplateEngine(
+				"{{currentDate}}|{{episodeNumber:000}}|{{duration:minutes}}",
+				fixture,
+				"the transcript",
+			),
+		).toBe("2026-06-15|042|62");
+	});
+
+	it("leaves number/duration empty when absent", () => {
+		const blank: Episode = { ...demoEpisode, title: "A Show With No Number" };
+		expect(
+			TranscriptTemplateEngine("[{{episodeNumber}}][{{duration}}]", blank, "t"),
+		).toBe("[][]");
+	});
+});
@@ -6,8 +6,14 @@ import type { Episode } from "src/types/Episode";
 import type { PodcastFeed } from "src/types/PodcastFeed";
 import getUrlExtension from "./utility/getUrlExtension";
 import { formatDate } from "./utility/formatDate";
+import { formatDuration } from "./utility/formatDuration";
+import { formatEpisodeNumber } from "./utility/formatEpisodeNumber";
+import { parseEpisodeNumberFromTitle } from "./utility/parseEpisodeNumber";
 
-type TagValue = string | ((...args: string[]) => string);
+// Each tag is either a literal string or a function taking at most one argument
+// (the raw text after the leading colon, e.g. the format in {{date:YYYY}}). The
+// engine never passes more than one argument; commas are part of that argument.
+type TagValue = string | ((arg?: string) => string);
 
 interface Tags {
 	[tag: string]: TagValue;
@@ -53,11 +59,11 @@ function useTemplateEngine(): Readonly<[ReplacerFn, AddTagFn]> {
 
 				if (typeof tagValue === "function") {
 					if (params) {
-						// Remove initial colon with splice.
-						const splitParams = params.slice(1).split(",");
-						const args = Array.isArray(splitParams) ? splitParams : [params];
-
-						return tagValue(...args);
+						// Pass everything after the leading colon as a single argument.
+						// No tag takes more than one argument, and splitting on "," would
+						// corrupt format strings that legitimately contain commas
+						// (e.g. {{currentDate:MMMM D, YYYY}}).
+						return tagValue(params.slice(1));
 					}
 
 					return tagValue();
@@ -71,6 +77,16 @@ function useTemplateEngine(): Readonly<[ReplacerFn, AddTagFn]> {
 	return [replacer, addTag] as const;
 }
 
+/**
+ * Resolve the episode number for templates: prefer the value captured at parse
+ * time (from `<itunes:episode>` or the title), then fall back to a title parse so
+ * persisted/older episode snapshots that predate the stored field (e.g. a restored
+ * `currentEpisode`) still resolve `{{episodeNumber}}`.
+ */
+function resolveEpisodeNumber(episode: Episode): number | undefined {
+	return episode.episodeNumber ?? parseEpisodeNumberFromTitle(episode.title);
+}
+
 export function NoteTemplateEngine(template: string, episode: Episode) {
 	const [replacer, addTag] = useTemplateEngine();
 
@@ -108,6 +124,21 @@ export function NoteTemplateEngine(template: string, episode: Episode) {
 			? formatDate(episode.episodeDate, format ?? "YYYY-MM-DD")
 			: "",
 	);
+	// The current date the note is created on, distinct from {{date}} (the episode
+	// publish date). Supports the same Moment.js format arg. See issue #75.
+	addTag("currentdate", (format?: string) =>
+		formatDate(new Date(), format ?? "YYYY-MM-DD"),
+	);
+	// Episode number from <itunes:episode>, else best-effort from the title. See #34.
+	addTag("episodenumber", (pad?: string) =>
+		formatEpisodeNumber(resolveEpisodeNumber(episode), pad),
+	);
+	// Episode duration from <itunes:duration>. See issue #88.
+	addTag("duration", (format?: string) =>
+		episode.duration !== undefined
+			? formatDuration(episode.duration, format)
+			: "",
+	);
 	addTag(
 		"podcast",
 		replaceIllegalFileNameCharactersInString(episode.podcastName),
@@ -171,6 +202,12 @@ export function FilePathTemplateEngine(template: string, episode: Episode) {
 			? formatDate(episode.episodeDate, format ?? "YYYY-MM-DD")
 			: "",
 	);
+	addTag("currentdate", (format?: string) =>
+		formatDate(new Date(), format ?? "YYYY-MM-DD"),
+	);
+	addTag("episodenumber", (pad?: string) =>
+		formatEpisodeNumber(resolveEpisodeNumber(episode), pad),
+	);
 
 	return replacer(template);
 }
@@ -207,6 +244,12 @@ export function DownloadPathTemplateEngine(template: string, episode: Episode) {
 			? formatDate(episode.episodeDate, format ?? "YYYY-MM-DD")
 			: "",
 	);
+	addTag("currentdate", (format?: string) =>
+		formatDate(new Date(), format ?? "YYYY-MM-DD"),
+	);
+	addTag("episodenumber", (pad?: string) =>
+		formatEpisodeNumber(resolveEpisodeNumber(episode), pad),
+	);
 
 	return replacer(templateWithoutExtension);
 }
@@ -239,6 +282,17 @@ export function TranscriptTemplateEngine(
 			? formatDate(episode.episodeDate, format ?? "YYYY-MM-DD")
 			: "",
 	);
+	addTag("currentdate", (format?: string) =>
+		formatDate(new Date(), format ?? "YYYY-MM-DD"),
+	);
+	addTag("episodenumber", (pad?: string) =>
+		formatEpisodeNumber(resolveEpisodeNumber(episode), pad),
+	);
+	addTag("duration", (format?: string) =>
+		episode.duration !== undefined
+			? formatDuration(episode.duration, format)
+			: "",
+	);
 	addTag("transcript", transcription);
 	addTag("description", (prependToLines?: string) => {
 		if (prependToLines) {