暂存

app/service/ArticleImportService.php

@@ -70,6 +70,16 @@ class ArticleImportService
         }
     }
 
+    public function normalizeArchiveContentString(string $content): ?string
+    {
+        return $this->nullableClean($this->cleanMarkdownPage($content));
+    }
+
+    public function normalizeArchiveRawString(string $content): ?string
+    {
+        return $this->nullableClean($content);
+    }
+
     private function validate(array $payload): array
     {
         $errors = [];
@@ -182,8 +192,8 @@ class ArticleImportService
             'tags' => is_array($payload['tags'] ?? null) ? array_values($payload['tags']) : [],
             'summary' => $this->nullableClean($payload['summary'] ?? null),
             'metadata' => $payload['metadata'] ?? [],
-            'content' => $this->nullableClean($payload['content_url'] ?? $payload['content_path'] ?? null),
-            'raw' => $this->nullableClean($payload['raw_url'] ?? $payload['raw_path'] ?? null),
+            'content' => $this->normalizedArchiveContent($payload),
+            'raw' => $this->rawArchiveContent($payload),
         ];
     }
 
@@ -200,6 +210,57 @@ class ArticleImportService
         return $this->pageBlocksFromItems($payload, preg_split('/\R{2,}/u', $payload['content']));
     }
 
+    private function normalizedArchiveContent(array $payload): ?string
+    {
+        if (isset($payload['pages']) && is_array($payload['pages'])) {
+            $parts = [];
+            foreach ($payload['pages'] as $page) {
+                if (!is_array($page) || !isset($page['content']) || !is_string($page['content'])) {
+                    continue;
+                }
+
+                $content = $this->cleanMarkdownPage($page['content']);
+                if ($content !== '') {
+                    $parts[] = $content;
+                }
+            }
+
+            return $this->nullableClean(implode("\n\n", $parts));
+        }
+
+        if (isset($payload['paragraphs']) && is_array($payload['paragraphs'])) {
+            $parts = [];
+            foreach ($payload['paragraphs'] as $paragraph) {
+                $content = is_array($paragraph) ? ($paragraph['content'] ?? '') : $paragraph;
+                if (!is_string($content)) {
+                    continue;
+                }
+
+                $content = $this->clean($content);
+                if ($content !== '') {
+                    $parts[] = $content;
+                }
+            }
+
+            return $this->nullableClean(implode("\n\n", $parts));
+        }
+
+        if (isset($payload['content']) && is_string($payload['content'])) {
+            return $this->normalizeArchiveContentString($payload['content']);
+        }
+
+        return null;
+    }
+
+    private function rawArchiveContent(array $payload): ?string
+    {
+        if (isset($payload['content']) && is_string($payload['content'])) {
+            return $this->normalizeArchiveRawString($payload['content']);
+        }
+
+        return null;
+    }
+
     private function pageBlocksFromPages(array $payload): array
     {
         $pageBlocks = [];