fix: optimize code string parser

Signed-off-by: Innei <[email protected]>
RSSNext · Aug 12, 2024 · b3d32d0 · b3d32d0
1 parent bca6276
commit b3d32d0
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 5 deletions.
diff --git a/src/renderer/src/components/ui/media.tsx b/src/renderer/src/components/ui/media.tsx
@@ -198,6 +198,7 @@ const MediaImpl: FC<MediaProps> = ({
     type,
   ])
 
+  if (hidden) return <FallbackMedia {...props} />
   return (
     <div className={cn("overflow-hidden rounded", className)} style={style}>
       {InnerContent}
@@ -208,3 +209,34 @@ const MediaImpl: FC<MediaProps> = ({
 export const Media: FC<MediaProps> = memo((props) => (
   <MediaImpl {...props} key={props.src} />
 ))
+
+const FallbackMedia: FC<MediaProps> = ({
+  type,
+  mediaContainerClassName,
+  ...props
+}) => (
+  <div
+    className={cn(
+      !(props.width || props.height) && "size-full",
+      "center relative h-24 rounded bg-zinc-100 object-cover dark:bg-neutral-900",
+      "not-prose flex max-h-full flex-col space-y-1",
+      mediaContainerClassName,
+    )}
+    style={{
+      height: props.height ? `${props.height}px` : "",
+      width: props.width ? `${props.width}px` : "100%",
+      ...props.style,
+    }}
+  >
+    <p>Media loaded failed</p>
+    <p className="flex items-center gap-1">
+      Go to
+      {" "}
+      <a href={props.src} target="_blank" rel="noreferrer" className="follow-link--underline">
+        {props.src}
+
+      </a>
+      <i className="i-mgc-external-link-cute-re" />
+    </p>
+  </div>
+)
diff --git a/src/renderer/src/lib/parse-html.ts b/src/renderer/src/lib/parse-html.ts
@@ -44,6 +44,7 @@ export const parseHtml = async (
         "video": ["src", "poster"],
       },
     })
+
     .use(rehypeInferDescriptionMeta)
     .use(rehypeStringify)
 
@@ -165,16 +166,27 @@ function extractCodeFromHtml(htmlString: string) {
   const tempDiv = document.createElement("div")
   tempDiv.innerHTML = htmlString
 
+  // 1. line break via <div />
   const divElements = tempDiv.querySelectorAll("div")
 
   let code = ""
 
-  divElements.forEach((div) => {
-    code += `${div.textContent}\n`
-  })
+  if (divElements.length > 0) {
+    divElements.forEach((div) => {
+      code += `${div.textContent}\n`
+    })
+    return code
+  }
+
+  // 2. line wrapper like <span><span>...</span></span>
+  const spanElements = tempDiv.querySelectorAll("span > span")
+
+  if (spanElements.length > 0) {
+    for (const node of tempDiv.children) {
+      code += `${node.textContent}\n`
+    }
 
-  if (divElements.length === 0) {
-    return tempDiv.textContent
+    return code
   }
 
   return code