temporarily define a new image strategy

FranciscoMoretti · Sep 1, 2024 · 39623d3 · 39623d3
1 parent f2813fb
commit 39623d3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/downloader.config.cjs b/downloader.config.cjs
@@ -8,6 +8,7 @@ module.exports = {
     markdownPrefixes: {
       images: "/assets",
     },
+    imageNamingStrategy: "default-flat",
     pageLinkHasExtension: false,
     slugProperty: "slug",
   },

diff --git a/packages/download-notion/src/config/schema.ts b/packages/download-notion/src/config/schema.ts
@@ -15,13 +15,14 @@ export const conversionSchema = z.object({
     images: z.string().default(""),
   }),
   layoutStrategy: z
-    .enum(["HierarchicalNamedLayoutStrategy", "FlatGuidLayoutStrategy"])
+    .enum(["HierarchicalNamedLayoutStrategy", "FlatLayoutStrategy"])
     .default("HierarchicalNamedLayoutStrategy"),
   namingStrategy: z
     .enum(["github-slug", "notion-slug", "guid", "title"])
     .default("github-slug"),
   imageNamingStrategy: z
-    .enum(["default", "content-hash", "legacy"])
+    // TODO: Make image naming strategies independent of their path building
+    .enum(["default", "content-hash", "legacy", "default-flat"])
     .optional()
     .default("default"),
 })

diff --git a/packages/download-notion/src/getOutputImageFileName.ts b/packages/download-notion/src/getOutputImageFileName.ts
@@ -5,7 +5,7 @@ import { LegacyImageNamingStrategy } from "./LegacyImageNamingStrategy"
 import { NotionImage } from "./NotionImage"
 
 export function getStrategy(
-  format: "legacy" | "content-hash" | "default",
+  format: "legacy" | "content-hash" | "default" | "default-flat",
   getPageAncestorName: (image: NotionImage) => string
 ): ImageNamingStrategy {
   switch (format) {
@@ -14,6 +14,7 @@ export function getStrategy(
     case "content-hash":
       return new ContentHashImageNamingStrategy()
     case "default":
+    case "default-flat":
       return new DefaultImageNamingStrategy(getPageAncestorName)
     default:
       throw new Error(`Unknown image file name format: ${format}`)

diff --git a/packages/download-notion/src/notionPull.ts b/packages/download-notion/src/notionPull.ts
@@ -36,6 +36,7 @@ import { processImages } from "./processImages"
 import { getMarkdownForPage } from "./transform"
 import {
   convertToUUID,
+  getAncestorPageOrDatabaseFilename,
   getAncestorPageOrDatabaseFilepath,
   sanitizeMarkdownOutputPath,
   saveDataToJson,
@@ -121,7 +122,7 @@ export async function notionPull(options: NotionPullOptions): Promise<void> {
       ? new GuidNamingStrategy()
       : new TitleNamingStrategy()
   const layoutStrategy =
-    options.conversion.layoutStrategy === "FlatGuidLayoutStrategy"
+    options.conversion.layoutStrategy === "FlatLayoutStrategy"
       ? new FlatLayoutStrategy(namingStrategy)
       : new HierarchicalLayoutStrategy(namingStrategy)
 
@@ -229,9 +230,21 @@ export async function notionPull(options: NotionPullOptions): Promise<void> {
     options.conversion.imageNamingStrategy || "default",
     // TODO: A new strategy could be with ancestor filename `getAncestorPageOrDatabaseFilename`
     (image) =>
-      removePathExtension(
-        getAncestorPageOrDatabaseFilepath(image, allObjectsMap, newFilesManager)
-      )
+      options.conversion.imageNamingStrategy == "default"
+        ? removePathExtension(
+            getAncestorPageOrDatabaseFilepath(
+              image,
+              allObjectsMap,
+              newFilesManager
+            )
+          )
+        : options.conversion.imageNamingStrategy == "default-flat"
+        ? getAncestorPageOrDatabaseFilename(
+            image,
+            allObjectsMap,
+            newFilesManager
+          )
+        : ""
   )
 
   // --------  FILES ---------

diff --git a/packages/download-notion/src/processImages.ts b/packages/download-notion/src/processImages.ts
@@ -28,6 +28,7 @@ async function processImage({
 }) {
   if (existingFilesManager.isObjectNew(image)) {
     await image.read()
+    // TODO: Write here a layout naming strategy for images. Name is ok, but path is not.
     const imageFilename = imageNamingStrategy.getFileName(image)
     newFilesManager.set("base", "image", image.id, {
       path: imageFilename,
@@ -46,7 +47,7 @@ async function processImage({
   } else {
     copyRecord(existingFilesManager, newFilesManager, "image", image.id)
     const imageRecordFromDirectory = newFilesManager.get(
-      "base",
+      "markdown",
       "image",
       image.id
     )