fix: #58 upload to cos failed

Author: shaunthegeek

app/Coding/Disk.php

@@ -72,16 +72,22 @@ public function uploadAttachments(string $token, string $projectName, string $da
                 $projectName,
                 $filename
             );
-            $this->upload($uploadToken, $dataPath . $path);
-            $result = $this->createFile($token, $projectName, [
-                "OriginalFileName" => $filename,
-                "MimeType" => mime_content_type($dataPath . $path),
-                "FileSize" => filesize($dataPath . $path),
-                "StorageKey" => $uploadToken['StorageKey'],
-                "Time" => $uploadToken['Time'],
-                "AuthToken" => $uploadToken['AuthToken'],
-                "FolderId" => $folderId,
-            ]);
+            $result = [];
+            try {
+                $this->upload($uploadToken, $dataPath . $path);
+                $result = $this->createFile($token, $projectName, [
+                    "OriginalFileName" => $filename,
+                    "MimeType" => mime_content_type($dataPath . $path),
+                    "FileSize" => filesize($dataPath . $path),
+                    "StorageKey" => $uploadToken['StorageKey'],
+                    "Time" => $uploadToken['Time'],
+                    "AuthToken" => $uploadToken['AuthToken'],
+                    "FolderId" => $folderId,
+                ]);
+            } catch (\Exception $e) {
+                // TODO laravel log
+                error_log('ERROR: ' . $e->getMessage());
+            }
             $data[$path] = $result;
         }
         return $data;

app/Coding/Wiki.php

@@ -188,12 +188,14 @@ public function replaceAttachments(string $markdown, array $codingAttachments):
         if (empty($codingAttachments)) {
             return $markdown;
         }
-        $markdown .= "\n\nAttachments\n---\n";
+        $markdown .= "\n\nAttachments\n---\n\n";
         foreach ($codingAttachments as $attachmentPath => $codingAttachment) {
-            $markdown .= "\n-   #${codingAttachment['ResourceCode']} ${codingAttachment['FileName']}";
+            $resourceCode = $codingAttachment['ResourceCode'] ?? 0;
+            $filename = $codingAttachment['FileName'] ?? '此文件迁移失败';
+            $markdown .= "-   #${resourceCode} ${filename}\n";
             $markdown = preg_replace(
                 "|\[.*\]\(${attachmentPath}\)|",
-                " #${codingAttachment['ResourceCode']} `${codingAttachment['FileName']}`",
+                " #${resourceCode} `${filename}`",
                 $markdown
             );
         }

tests/Unit/CodingWikiTest.php

@@ -243,7 +243,7 @@ public function testGetWiki()
         $this->assertEquals(json_decode($responseBody, true)['Response']['Data'], $result);
     }
 
-    public function testupdateTitle()
+    public function testUpdateTitle()
     {
         $responseBody = file_get_contents($this->dataDir . 'coding/ModifyWikiTitleResponse.json');
         $codingToken = $this->faker->md5;
@@ -276,4 +276,34 @@ public function testupdateTitle()
         $result = $coding->updateTitle($codingToken, $codingProjectUri, $id, $title);
         $this->assertTrue($result);
     }
+
+    public function testReplaceAttachments()
+    {
+        $codingAttachments = [
+            'attachments/123/1.pdf' => [
+                "FileId" => 1234561,
+                "FileName" => "foo.pdf",
+                "ResourceCode" => 11,
+            ],
+            'attachments/123/2.ppt' => [
+                "FileId" => 1234562,
+                "FileName" => "bar.ppt",
+                "ResourceCode" => 12,
+            ],
+            'attachments/123/3.mp4' => [],
+        ];
+        $markdown = "hello [foo.pdf](attachments/123/1.pdf)\n"
+            . "world [bar.ppt](attachments/123/2.ppt) [hello.mp4](attachments/123/3.mp4)";
+        $expectedMarkdown = "hello  #11 `foo.pdf`\n"
+            . "world  #12 `bar.ppt`  #0 `此文件迁移失败`\n\n"
+            . "Attachments\n"
+            . "---\n\n"
+            . "-   #11 foo.pdf\n"
+            . "-   #12 bar.ppt\n"
+            . "-   #0 此文件迁移失败\n"
+        ;
+        $wiki = new Wiki();
+        $newMarkdown = $wiki->replaceAttachments($markdown, $codingAttachments);
+        $this->assertEquals($expectedMarkdown, $newMarkdown);
+    }
 }