Merge pull request #17 from MarvNC/add-breadcrumbs-list

Add Breadcrumbs List
MarvNC · Jul 7, 2024 · 2ec5f33 · 2ec5f33
2 parents eb5acf1 + 561bac3
commit 2ec5f33
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "japanese-furigana-normalize": "^1.0.5",
     "prisma": "^5.9.1",
     "yargs": "^17.7.2",
-    "yomichan-dict-builder": "^2.5.0"
+    "yomichan-dict-builder": "^2.6.0"
   },
   "devDependencies": {
     "@types/cli-progress": "^3.11.5",

diff --git a/src/yomitan/createDetailedDefinition.ts b/src/yomitan/createDetailedDefinition.ts
@@ -16,7 +16,7 @@ export function createDetailedDefinition(
 ): DetailedDefinition {
   const scList: StructuredContentNode = [];
   // Parent tag/bracket stuff
-  addParentInfo(article, scList, bracketContent);
+  addParentInfo(article, scList, bracketContent, pixivLight);
   // Summary
   if (article.summary) {
     scList.push(

diff --git a/src/yomitan/detailedDefinition/addParentInfo.ts b/src/yomitan/detailedDefinition/addParentInfo.ts
@@ -5,6 +5,7 @@ export function addParentInfo(
   article: PixivArticle,
   scList: StructuredContentNode[],
   bracketContent: string,
+  pixivLight: boolean,
 ) {
   if (bracketContent) {
     scList.push({
@@ -21,7 +22,49 @@ export function addParentInfo(
     });
   }
 
-  if (article.parent) {
+  if (article.header) {
+    const headerArray = JSON.parse(article.header) as string[];
+    if (!Array.isArray(headerArray)) {
+      throw new Error('header should be an array');
+    }
+    if (headerArray.length <= 2) {
+      return;
+    }
+    // Remove last element (current article)
+    headerArray.pop();
+    const parent = headerArray.pop();
+    if (!parent) {
+      return;
+    }
+    headerArray.reverse();
+    const parentLink: StructuredContentNode = {
+      tag: 'a',
+      content: `←${parent}`,
+      href: `?query=${parent}`,
+    };
+    const contentListInsideDetails: StructuredContentNode[] = [
+      {
+        tag: 'summary',
+        content: parentLink,
+      },
+    ];
+    if (headerArray.length > 1) {
+      // Create ul list of breadcrumbs within details block
+      contentListInsideDetails.push({
+        tag: 'ul',
+        content: headerArray.map((header) => ({
+          tag: 'li',
+          content: {
+            tag: 'a',
+            content: header,
+            href: `?query=${header}`,
+          },
+        })),
+        data: {
+          pixiv: 'series',
+        },
+      });
+    }
     scList.push({
       tag: 'div',
       data: {
@@ -30,11 +73,13 @@ export function addParentInfo(
       style: {
         fontWeight: 'bold',
       },
-      content: {
-        tag: 'a',
-        content: `←${article.parent}`,
-        href: `?query=${article.parent}`,
-      },
+      // If lightweight mode, just show parent link, otherwise show list of breadcrumbs
+      content: pixivLight
+        ? parentLink
+        : {
+            tag: 'details',
+            content: contentListInsideDetails,
+          },
     });
   }
 }