feat: more work on calendar

2026-02-22 14:31:31 +01:00
parent 64e1fb3d90
commit 947b1250e3
21 changed files with 191 additions and 9 deletions
--- a/src/main/engine/BlogGenerationEngine.ts
+++ b/src/main/engine/BlogGenerationEngine.ts
@@ -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 {
--- a/src/main/engine/PreviewServer.ts
+++ b/src/main/engine/PreviewServer.ts
@@ -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) {
--- a/src/main/engine/templates/partials/styles.liquid
+++ b/src/main/engine/templates/partials/styles.liquid
@@ -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; }
--- a/src/main/ipc/blogHandlers.ts
+++ b/src/main/ipc/blogHandlers.ts
@@ -152,6 +152,22 @@ export function registerBlogHandlers(safeHandle: SafeHandle): void {
    });
  });

+  safeHandle('blog:regenerateCalendar', async () => {
+    const blogGenerationEngine = getBlogGenerationEngine();
+    const baseOptions = await resolveBlogGenerationBaseOptions();
+
+    const taskTimestamp = Date.now();
+    return taskManager.runTask({
+      id: `site-calendar-regenerate-${taskTimestamp}`,
+      name: 'Regenerate Calendar',
+      execute: async (onProgress) => {
+        return blogGenerationEngine.regenerateCalendar(baseOptions, (progress, message) => {
+          onProgress(progress, message || 'Regenerating calendar...');
+        });
+      },
+    });
+  });
+
  safeHandle('blog:applyValidation', async (_event, report: SiteValidationReport) => {
    const blogGenerationEngine = getBlogGenerationEngine();
    const baseOptions = await resolveBlogGenerationBaseOptions();
--- a/src/main/preload.ts
+++ b/src/main/preload.ts
@@ -256,6 +256,7 @@ export const electronAPI: ElectronAPI = {
    generateSitemap: () => ipcRenderer.invoke('blog:generateSitemap'),
    validateSite: () => ipcRenderer.invoke('blog:validateSite'),
    applyValidation: (report: SiteValidationReport) => ipcRenderer.invoke('blog:applyValidation', report),
+    regenerateCalendar: () => ipcRenderer.invoke('blog:regenerateCalendar'),
  },

  menu: {
--- a/src/main/shared/electronApi.ts
+++ b/src/main/shared/electronApi.ts
@@ -427,6 +427,11 @@ export interface SiteValidationApplyResult {
  removedEmptyDirCount: number;
 }

+export interface CalendarRegenerationResult {
+  calendarPath: string;
+  changed: boolean;
+}
+
 export type MenuItemKind = 'page' | 'submenu' | 'category-archive' | 'home';

 export interface MenuItemData {
@@ -649,6 +654,7 @@ export interface ElectronAPI {
    }>;
    validateSite: () => Promise<SiteValidationReport>;
    applyValidation: (report: SiteValidationReport) => Promise<SiteValidationApplyResult>;
+    regenerateCalendar: () => Promise<CalendarRegenerationResult>;
  };
  menu: {
    get: () => Promise<MenuDocument>;
--- a/src/main/shared/i18n/locales/de.json
+++ b/src/main/shared/i18n/locales/de.json
@@ -38,6 +38,7 @@
  "menu.item.metadataDiff": "Metadaten-Diff-Werkzeug",
  "menu.item.editMenu": "Blog-Menü bearbeiten",
  "menu.item.generateSitemap": "Site rendern",
+  "menu.item.regenerateCalendar": "Kalender neu erzeugen",
  "menu.item.validateSite": "Website validieren",
  "menu.item.about": "Über Blogging Desktop Server",
  "menu.item.openDocumentation": "Dokumentation öffnen",
--- a/src/main/shared/i18n/locales/en.json
+++ b/src/main/shared/i18n/locales/en.json
@@ -38,6 +38,7 @@
  "menu.item.metadataDiff": "Metadata Diff Tool",
  "menu.item.editMenu": "Edit Blog Menu",
  "menu.item.generateSitemap": "Render Site",
+  "menu.item.regenerateCalendar": "Regenerate Calendar",
  "menu.item.validateSite": "Validate Site",
  "menu.item.about": "About Blogging Desktop Server",
  "menu.item.openDocumentation": "Open Documentation",
--- a/src/main/shared/i18n/locales/es.json
+++ b/src/main/shared/i18n/locales/es.json
@@ -38,6 +38,7 @@
  "menu.item.metadataDiff": "Herramienta diff de metadatos",
  "menu.item.editMenu": "Editar menú del blog",
  "menu.item.generateSitemap": "Renderizar sitio",
+  "menu.item.regenerateCalendar": "Regenerar calendario",
  "menu.item.validateSite": "Validar sitio",
  "menu.item.about": "Acerca de Blogging Desktop Server",
  "menu.item.openDocumentation": "Abrir documentación",
--- a/src/main/shared/i18n/locales/fr.json
+++ b/src/main/shared/i18n/locales/fr.json
@@ -38,6 +38,7 @@
  "menu.item.metadataDiff": "Outil de diff des métadonnées",
  "menu.item.editMenu": "Modifier le menu du blog",
  "menu.item.generateSitemap": "Rendre le site",
+  "menu.item.regenerateCalendar": "Régénérer le calendrier",
  "menu.item.validateSite": "Valider le site",
  "menu.item.about": "À propos de Blogging Desktop Server",
  "menu.item.openDocumentation": "Ouvrir la documentation",
--- a/src/main/shared/i18n/locales/it.json
+++ b/src/main/shared/i18n/locales/it.json
@@ -38,6 +38,7 @@
  "menu.item.metadataDiff": "Strumento diff metadati",
  "menu.item.editMenu": "Modifica menu blog",
  "menu.item.generateSitemap": "Renderizza sito",
+  "menu.item.regenerateCalendar": "Rigenera calendario",
  "menu.item.validateSite": "Valida sito",
  "menu.item.about": "Informazioni su Blogging Desktop Server",
  "menu.item.openDocumentation": "Apri documentazione",
--- a/src/main/shared/menuCommands.ts
+++ b/src/main/shared/menuCommands.ts
@@ -33,6 +33,7 @@ export type AppMenuAction =
  | 'metadataDiff'
  | 'editMenu'
  | 'generateSitemap'
+  | 'regenerateCalendar'
  | 'validateSite'
  | 'openDocumentation'
  | 'about'
@@ -126,6 +127,7 @@ export const APP_MENU_GROUPS: AppMenuGroupDefinition[] = [
      { label: 'menu.item.metadataDiff', action: 'metadataDiff' },
      { label: 'menu.item.editMenu', action: 'editMenu' },
      { label: 'menu.item.generateSitemap', action: 'generateSitemap', accelerator: 'CmdOrCtrl+R' },
+      { label: 'menu.item.regenerateCalendar', action: 'regenerateCalendar' },
      { label: 'menu.item.validateSite', action: 'validateSite', accelerator: 'CmdOrCtrl+Shift+L' },
    ],
  },
@@ -160,6 +162,7 @@ export const APP_MENU_ACTION_EVENT_MAP: Partial<Record<AppMenuAction, string>> =
  metadataDiff: 'menu:metadataDiff',
  editMenu: 'menu:editMenu',
  generateSitemap: 'menu:generateSitemap',
+  regenerateCalendar: 'menu:regenerateCalendar',
  validateSite: 'menu:validateSite',
  openDocumentation: 'menu:openDocumentation',
  about: 'menu:about',