hugo/bDS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: more work on calendar

Browse Source
This commit is contained in:
hugo
2026-02-22 14:31:31 +01:00
parent 64e1fb3d90
commit 947b1250e3
21 changed files with 191 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/engine/BlogGenerationEngine.ts
View File

@@ -106,6 +106,11 @@ export interface SiteValidationApplyResult {
removedEmptyDirCount: number;
}
export interface CalendarRegenerationResult {
calendarPath: string;
changed: boolean;
}
export function resolvePublicBaseUrl(publicUrl?: string): string | null {
const trimmed = (publicUrl || '').trim();
if (!trimmed) {
@@ -473,6 +478,41 @@ export class BlogGenerationEngine {
};
}
async regenerateCalendar(
options: BlogGenerationOptions,
onProgress: (progress: number, message?: string) => void,
): Promise<CalendarRegenerationResult> {
onProgress(0, 'Loading posts...');
const categorySettings = resolveCategorySettings(options.categoryMetadata, options.categorySettings);
const listExcludedCategories = Object.entries(categorySettings)
.filter(([, settings]) => settings.renderInLists === false)
.map(([category]) => category);
const { publishedListPosts } = await loadPublishedGenerationSets(this.postEngine, listExcludedCategories);
onProgress(50, 'Building calendar data...');
const calendarJson = `${JSON.stringify(buildCalendarArchiveData(publishedListPosts), null, 2)}\n`;
const htmlDir = path.join(options.dataDir, 'html');
await fs.mkdir(htmlDir, { recursive: true });
const calendarPath = path.join(htmlDir, 'calendar.json');
const changed = await writeFileIfHashChanged({
projectId: options.projectId,
filePath: calendarPath,
relativePath: 'calendar.json',
content: calendarJson,
});
onProgress(100, 'Calendar data regenerated');
return {
calendarPath,
changed,
};
}
async validateSite(
options: BlogGenerationOptions,
onProgress: (progress: number, message?: string) => void,
@@ -748,6 +788,14 @@ export class BlogGenerationEngine {
}
}
if (renderedUrlCount > 0 || deletedUrlCount > 0) {
onProgress(90, 'Regenerating calendar data...');
await this.regenerateCalendar(options, (progress, message) => {
const mappedProgress = 90 + Math.floor((progress / 100) * 9);
onProgress(Math.min(99, mappedProgress), message || 'Regenerating calendar data...');
});
}
onProgress(100, `Apply complete (${deletedUrlCount} deleted, ${renderedUrlCount} rendered)`);
return {

23
src/main/engine/PreviewServer.ts
View File

@@ -28,6 +28,8 @@ import {
loadPublishedSnapshots,
loadPublishedSnapshotsPage,
} from './SharedSnapshotService';
import { buildCalendarArchiveData } from './GenerationSitemapFeedService';
import { loadPublishedGenerationSets } from './GenerationPostSnapshotService';
interface ActiveProjectContext {
projectId: string;
@@ -254,6 +256,12 @@ export class PreviewServer {
const picoStylesheetHref = getPicoStylesheetHref(appliedTheme);
const htmlRewriteContext = await this.buildHtmlRewriteContext();
if (pathname === '/calendar.json') {
const calendarJson = await this.resolveCalendarJson(context.dataDir, listExcludedCategories);
this.respondAsset(res, 'application/json; charset=utf-8', calendarJson);
return;
}
if (pathname === '/__style-preview') {
const stylePreviewHtml = await this.renderStylePreview(htmlRewriteContext, {
pageTitle,
@@ -491,6 +499,21 @@ export class PreviewServer {
}
}
private async resolveCalendarJson(dataDir: string | undefined, listExcludedCategories: string[]): Promise<Buffer> {
if (dataDir) {
const calendarPath = path.join(dataDir, 'html', 'calendar.json');
try {
return await readFile(calendarPath);
} catch {
// fall through to dynamic generation for preview runtime
}
}
const { publishedListPosts } = await loadPublishedGenerationSets(this.postEngine, listExcludedCategories);
const calendarJson = `${JSON.stringify(buildCalendarArchiveData(publishedListPosts), null, 2)}\n`;
return Buffer.from(calendarJson, 'utf-8');
}
private getMediaContentType(filePath: string): string {
const extension = path.extname(filePath).toLowerCase();
switch (extension) {

29
src/main/engine/templates/partials/styles.liquid
View File

@@ -17,19 +17,30 @@
.blog-menu-submenu .blog-menu-list { flex-direction: column; flex-wrap: nowrap; gap: .2rem; }
.blog-menu-item-with-children:hover > .blog-menu-submenu,
.blog-menu-item-with-children:focus-within > .blog-menu-submenu { display: block; }
.blog-menu-calendar { position: relative; display: inline-flex; align-items: center; justify-content: center; margin-left: auto; }
.blog-menu-calendar-button { display: inline-flex; align-items: center; justify-content: center; width: 2rem; height: 2rem; padding: 0; border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); background: var(--pico-card-background-color, var(--card-background-color)); color: var(--pico-muted-color, var(--muted-color)); border-radius: .25rem; cursor: pointer; }
.blog-menu-calendar-button svg { display: block; width: 1rem; height: 1rem; fill: none; stroke: currentColor; }
.blog-menu-calendar { position: relative; display: inline-flex; align-items: center; justify-content: center; margin-left: auto; align-self: center; }
.blog-menu-calendar-button { display: inline-flex; align-items: center; justify-content: center; width: auto; height: auto; padding: .2rem .1rem; border: 0; background: transparent; color: var(--pico-muted-color, var(--muted-color)); border-radius: 0; cursor: pointer; font-size: .94rem; line-height: 1.4; }
.blog-menu-calendar-button svg { display: block; width: .94rem; height: .94rem; fill: none; stroke: currentColor; transform: translateY(1px); }
.blog-menu-calendar-button:hover,
.blog-menu-calendar-button:focus-visible { color: var(--pico-color, var(--color)); border-color: var(--pico-color, var(--color)); }
.blog-calendar-panel { position: absolute; top: calc(100% + .3rem); right: 0; width: min(21.5rem, 92vw); border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); background: var(--pico-card-background-color, var(--card-background-color)); padding: .55rem; z-index: 30; }
.blog-calendar-header { display: flex; align-items: center; justify-content: space-between; margin-bottom: .35rem; }
.blog-calendar-close { border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); background: transparent; color: var(--pico-muted-color, var(--muted-color)); width: 1.8rem; height: 1.8rem; border-radius: .2rem; padding: 0; cursor: pointer; }
.blog-menu-calendar-button:focus-visible { color: var(--pico-color, var(--color)); }
.blog-calendar-panel { position: absolute; top: calc(100% + .2rem); right: 0; width: min(19rem, 92vw); border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); background: var(--pico-card-background-color, var(--card-background-color)); padding: .4rem; z-index: 30; }
.blog-calendar-header { display: flex; align-items: center; justify-content: space-between; margin-bottom: .2rem; }
.blog-calendar-close { border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); background: transparent; color: var(--pico-muted-color, var(--muted-color)); width: 1.55rem; height: 1.55rem; border-radius: .2rem; padding: 0; cursor: pointer; }
.blog-calendar-close:hover,
.blog-calendar-close:focus-visible { color: var(--pico-color, var(--color)); border-color: var(--pico-color, var(--color)); }
.blog-calendar-status { margin: .45rem 0 0; color: var(--pico-muted-color, var(--muted-color)); font-size: .85rem; }
.blog-calendar-content { display: grid; gap: .18rem; }
.blog-calendar-status { margin: .2rem 0 0; color: var(--pico-muted-color, var(--muted-color)); font-size: .78rem; }
[data-blog-calendar-root] [data-vc=header] { margin-bottom: .2rem; }
[data-blog-calendar-root] [data-vc=month],
[data-blog-calendar-root] [data-vc=year] { padding: .15rem .25rem; }
[data-blog-calendar-root] [data-vc=months],
[data-blog-calendar-root] [data-vc=years] { row-gap: .5rem; }
[data-blog-calendar-root] [data-vc-months-month],
[data-blog-calendar-root] [data-vc-years-year] { height: 2rem; }
[data-blog-calendar-root] [data-vc-week=days] { margin-bottom: .25rem; }
[data-blog-calendar-root] [data-vc-date] { padding-top: 0; padding-bottom: 0; }
[data-blog-calendar-root] [data-vc-date-btn] { min-height: 1.65rem; min-width: 1.65rem; }
[data-blog-calendar-has-posts='true'] [data-vc-date-btn] { border-color: var(--pico-primary, var(--pico-color, var(--color))); }
.blog-calendar-post-count { display: inline-flex; align-items: center; justify-content: center; min-width: 1.15rem; height: 1.15rem; margin-left: .22rem; border-radius: 999px; font-size: .62rem; line-height: 1; border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); color: var(--pico-color, var(--color)); }
.blog-calendar-post-count { display: inline-flex; align-items: center; justify-content: center; min-width: .95rem; height: .95rem; margin-left: .16rem; border-radius: 999px; font-size: .56rem; line-height: 1; border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); color: var(--pico-color, var(--color)); }
.post { border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); padding: 1rem; background: var(--pico-card-background-color, var(--card-background-color)); min-width: 0; }
.post pre { position: relative; overflow-x: auto; max-width: 100%; border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); border-radius: .3rem; margin: .9rem 0; padding: .85rem .9rem; background: var(--pico-code-background-color, rgba(33, 38, 45, .82)); box-sizing: border-box; }
.post pre code { display: block; font-size: .88rem; line-height: 1.5; white-space: pre; }