From b33f13ccaf4ec14a94ee0ee467dda04cf4981d00 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 01 Jan 2024 22:20:34 +0000
Subject: [PATCH] fix: dont show last page if folder
---
quartz/plugins/emitters/contentIndex.ts | 83 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 28 deletions(-)
diff --git a/quartz/plugins/emitters/contentIndex.ts b/quartz/plugins/emitters/contentIndex.ts
index f3a0281..bc4c6c3 100644
--- a/quartz/plugins/emitters/contentIndex.ts
+++ b/quartz/plugins/emitters/contentIndex.ts
@@ -1,14 +1,19 @@
+import { Root } from "hast"
import { GlobalConfiguration } from "../../cfg"
-import { CanonicalSlug, ClientSlug, FilePath, ServerSlug, canonicalizeServer } from "../../path"
+import { getDate } from "../../components/Date"
+import { escapeHTML } from "../../util/escape"
+import { FilePath, FullSlug, SimpleSlug, joinSegments, simplifySlug } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
+import { toHtml } from "hast-util-to-html"
import path from "path"
-export type ContentIndex = Map<CanonicalSlug, ContentDetails>
+export type ContentIndex = Map<FullSlug, ContentDetails>
export type ContentDetails = {
title: string
- links: CanonicalSlug[]
+ links: SimpleSlug[]
tags: string[]
content: string
+ richContent?: string
date?: Date
description?: string
}
@@ -16,51 +21,70 @@
interface Options {
enableSiteMap: boolean
enableRSS: boolean
+ rssLimit?: number
+ rssFullHtml: boolean
includeEmptyFiles: boolean
}
const defaultOptions: Options = {
enableSiteMap: true,
enableRSS: true,
- includeEmptyFiles: false,
+ rssLimit: 10,
+ rssFullHtml: false,
+ includeEmptyFiles: true,
}
function generateSiteMap(cfg: GlobalConfiguration, idx: ContentIndex): string {
const base = cfg.baseUrl ?? ""
- const createURLEntry = (slug: CanonicalSlug, content: ContentDetails): string => `<url>
- <loc>https://${base}/${slug}</loc>
+ const createURLEntry = (slug: SimpleSlug, content: ContentDetails): string => `<url>
+ <loc>https://${joinSegments(base, encodeURI(slug))}</loc>
<lastmod>${content.date?.toISOString()}</lastmod>
</url>`
const urls = Array.from(idx)
- .map(([slug, content]) => createURLEntry(slug, content))
+ .map(([slug, content]) => createURLEntry(simplifySlug(slug), content))
.join("")
return `<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">${urls}</urlset>`
}
-function generateRSSFeed(cfg: GlobalConfiguration, idx: ContentIndex): string {
+function generateRSSFeed(cfg: GlobalConfiguration, idx: ContentIndex, limit?: number): string {
const base = cfg.baseUrl ?? ""
- const root = `https://${base}` as ClientSlug
+ const root = `https://${base}`
- const createURLEntry = (slug: CanonicalSlug, content: ContentDetails): string => `<items>
- <title>${content.title}</title>
- <link>${root}/${slug}</link>
- <guid>${root}/${slug}</guid>
- <description>${content.description}</description>
+ const createURLEntry = (slug: SimpleSlug, content: ContentDetails): string => `<item>
+ <title>${escapeHTML(content.title)}</title>
+ <link>${joinSegments(root, encodeURI(slug))}</link>
+ <guid>${joinSegments(root, encodeURI(slug))}</guid>
+ <description>${content.richContent ?? content.description}</description>
<pubDate>${content.date?.toUTCString()}</pubDate>
- </items>`
+ </item>`
const items = Array.from(idx)
- .map(([slug, content]) => createURLEntry(slug, content))
+ .sort(([_, f1], [__, f2]) => {
+ if (f1.date && f2.date) {
+ return f2.date.getTime() - f1.date.getTime()
+ } else if (f1.date && !f2.date) {
+ return -1
+ } else if (!f1.date && f2.date) {
+ return 1
+ }
+
+ return f1.title.localeCompare(f2.title)
+ })
+ .map(([slug, content]) => createURLEntry(simplifySlug(slug), content))
+ .slice(0, limit ?? idx.size)
.join("")
- return `<rss xmlns:atom="http://www.w3.org/2005/atom" version="2.0">
+
+ return `<?xml version="1.0" encoding="UTF-8" ?>
+<rss version="2.0">
<channel>
- <title>${cfg.pageTitle}</title>
+ <title>${escapeHTML(cfg.pageTitle)}</title>
<link>${root}</link>
- <description>Recent content on ${cfg.pageTitle}</description>
+ <description>${!!limit ? `Last ${limit} notes` : "Recent notes"} on ${escapeHTML(
+ cfg.pageTitle,
+ )}</description>
<generator>Quartz -- quartz.jzhao.xyz</generator>
- <atom:link href="${root}/index.xml" rel="self" type="application/rss+xml"/>
+ ${items}
</channel>
- ${items}
</rss>`
}
@@ -72,15 +96,18 @@
const cfg = ctx.cfg.configuration
const emitted: FilePath[] = []
const linkIndex: ContentIndex = new Map()
- for (const [_tree, file] of content) {
- const slug = canonicalizeServer(file.data.slug!)
- const date = file.data.dates?.modified ?? new Date()
+ for (const [tree, file] of content) {
+ const slug = file.data.slug!
+ const date = getDate(ctx.cfg.configuration, file.data) ?? new Date()
if (opts?.includeEmptyFiles || (file.data.text && file.data.text !== "")) {
linkIndex.set(slug, {
title: file.data.frontmatter?.title!,
links: file.data.links ?? [],
tags: file.data.frontmatter?.tags ?? [],
content: file.data.text ?? "",
+ richContent: opts?.rssFullHtml
+ ? escapeHTML(toHtml(tree as Root, { allowDangerousHtml: true }))
+ : undefined,
date: date,
description: file.data.description ?? "",
})
@@ -91,7 +118,7 @@
emitted.push(
await emit({
content: generateSiteMap(cfg, linkIndex),
- slug: "sitemap" as ServerSlug,
+ slug: "sitemap" as FullSlug,
ext: ".xml",
}),
)
@@ -100,14 +127,14 @@
if (opts?.enableRSS) {
emitted.push(
await emit({
- content: generateRSSFeed(cfg, linkIndex),
- slug: "index" as ServerSlug,
+ content: generateRSSFeed(cfg, linkIndex, opts.rssLimit),
+ slug: "index" as FullSlug,
ext: ".xml",
}),
)
}
- const fp = path.join("static", "contentIndex") as ServerSlug
+ const fp = path.join("static", "contentIndex") as FullSlug
const simplifiedIndex = Object.fromEntries(
Array.from(linkIndex).map(([slug, content]) => {
// remove description and from content index as nothing downstream
--
Gitblit v1.10.0