fix: external link adopt normal link

quanru · Mar 30, 2024 · b9b8a30 · b9b8a30
1 parent 2204639
commit b9b8a30
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/src/periodic/DailyRecord.ts b/src/periodic/DailyRecord.ts
@@ -116,6 +116,10 @@ export class DailyRecord {
       if (Array.isArray(data)) {
         await Promise.all(
           data.map(async (resource) => {
+            if (resource.externalLink) {
+              return;
+            }
+
             const folder = `${this.settings.periodicNotesPath}/Attachments`;
             const resourcePath = normalizePath(
               `${folder}/${generateFileName(resource)}`
@@ -129,10 +133,6 @@ export class DailyRecord {
               return;
             }
 
-            if (resource.externalLink) {
-              return;
-            }
-
             const resourceURL = `${origin}/o/r/${resource.name || resource.id}`;
             const { data } = await this.axios.get(resourceURL, {
               responseType: 'arraybuffer',

diff --git a/src/type.ts b/src/type.ts
@@ -51,6 +51,7 @@ export type ContextType = {
 export type ResourceType = {
   name?: string;
   externalLink?: string;
+  type?: string;
   id: string;
   filename: string;
 };

diff --git a/src/util.ts b/src/util.ts
@@ -122,9 +122,7 @@ export function formatDailyRecord(record: DailyRecordType) {
   const targetResourceLine = resourceList?.length // 资源文件
     ? '\n' +
       resourceList
-        ?.map(
-          (resource: ResourceType) => `\t - ![[${generateFileName(resource)}]]`
-        )
+        ?.map((resource: ResourceType) => `\t- ${generateFileLink(resource)}`)
         .join('\n')
     : '';
   const finalTargetContent =
@@ -133,11 +131,20 @@ export function formatDailyRecord(record: DailyRecordType) {
   return [date, timeStamp, finalTargetContent].map(String);
 }
 
+export function generateFileLink(resource: ResourceType): string {
+  if (!resource.externalLink) {
+    return `![[${generateFileName(resource)}]]`;
+  }
+
+  const prefix = resource.type?.includes('image') ? '!' : ''; // only add ! for image type
+
+  return `${prefix}[${resource.name || resource.filename}](${
+    resource.externalLink
+  })`;
+}
+
 export function generateFileName(resource: ResourceType): string {
-  return (
-    resource.externalLink ||
-    `${resource.id}-${resource.filename.replace(/[/\\?%*:|"<>]/g, '-')}`
-  );
+  return `${resource.id}-${resource.filename.replace(/[/\\?%*:|"<>]/g, '-')}`;
 }
 
 export function logMessage(message: string, level: LogLevel = LogLevel.info) {