chore: format code

AppFlowy-IO · Jul 19, 2023 · 800ebba · 800ebba
1 parent a0ca6d9
commit 800ebba
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 47 deletions.
diff --git a/lib/src/plugins/markdown/decoder/document_markdown_decoder.dart b/lib/src/plugins/markdown/decoder/document_markdown_decoder.dart
@@ -1,8 +1,13 @@
 import 'dart:convert';
 
 import 'package:appflowy_editor/appflowy_editor.dart';
+import 'package:path/path.dart' as p;
 
 class DocumentMarkdownDecoder extends Converter<String, Document> {
+  final imageRegex = RegExp(r'^!\[[^\]]*\]\((.*?)\)');
+  final assetRegex = RegExp(r'^\[[^\]]*\]\((.*?)\)');
+  final htmlRegex = RegExp('^(http|https)://');
+
   @override
   Document convert(String input) {
     final lines = input.split('\n');
@@ -52,9 +57,6 @@ class DocumentMarkdownDecoder extends Converter<String, Document> {
 
   Node _convertLineToNode(String line) {
     final decoder = DeltaMarkdownDecoder();
-    final imageRegex = RegExp(r'^!\[.*\]\(.*\)$');
-    final assetRegex = RegExp(r'^\[.*\]\(.*\)$');
-    final htmlRegex = RegExp('^(http|https)://');
     // Heading Style
     if (line.startsWith('### ')) {
       return headingNode(
@@ -94,29 +96,18 @@ class DocumentMarkdownDecoder extends Converter<String, Document> {
     } else if (line.startsWith('```') && line.endsWith('```')) {
       return _codeBlockNodeFromMarkdown(line, decoder);
     } else if (imageRegex.hasMatch(line.trim())) {
-      String? filepath = extractImagePath(line.trim());
-      //checking if filepath is present or if the filepath is an image or not
-      if (filepath == null ||
-          (!filepath.endsWith('.png') &&
-              !filepath.endsWith('.jpg') &&
-              !filepath.endsWith('.jpeg'))) {
-        return paragraphNode(
-          attributes: {'delta': decoder.convert(line).toJson()},
-        );
-      } else {
-        return imageNode(url: filepath);
+      final filePath = extractImagePath(line.trim());
+      // checking if filepath is present or if the filepath is an image or not
+      if (filePath == null ||
+          !['.png', '.jpg', 'jpeg'].contains(p.extension(filePath))) {
+        return paragraphNode(text: line.trim());
       }
+      return imageNode(url: filePath);
     } else if (assetRegex.hasMatch(line.trim())) {
-      //this might be a url or a file like pdf,videos,etc
-      String? filepath = extractFilePath(line.trim());
+      // this might be a url or a file like pdf, videos, etc
+      final filepath = extractFilePath(line.trim());
       if (filepath != null && !htmlRegex.hasMatch(filepath)) {
-        return paragraphNode(
-          text: "This file is cuurently not supported : $line",
-        );
-      } else {
-        return paragraphNode(
-          attributes: {'delta': decoder.convert(line).toJson()},
-        );
+        return paragraphNode(text: line);
       }
     }
 
@@ -132,31 +123,13 @@ class DocumentMarkdownDecoder extends Converter<String, Document> {
   }
 
   String? extractImagePath(String text) {
-    const startDelimiter = "![";
-    const endDelimiter = "](";
-    final startIndex = text.indexOf(startDelimiter);
-    final endIndex =
-        text.indexOf(endDelimiter, startIndex + startDelimiter.length);
-
-    if (startIndex != -1 && endIndex != -1) {
-      return text.substring(endIndex + endDelimiter.length, text.length - 1);
-    } else {
-      return null;
-    }
+    final match = imageRegex.firstMatch(text);
+    return match?.group(1);
   }
 
   String? extractFilePath(String text) {
-    const startDelimiter = "[";
-    const endDelimiter = "](";
-    final startIndex = text.indexOf(startDelimiter);
-    final endIndex =
-        text.indexOf(endDelimiter, startIndex + startDelimiter.length);
-
-    if (startIndex != -1 && endIndex != -1) {
-      return text.substring(endIndex + endDelimiter.length, text.length - 1);
-    } else {
-      return null;
-    }
+    final match = assetRegex.firstMatch(text);
+    return match?.group(1);
   }
 
   Node _codeBlockNodeFromMarkdown(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -35,6 +35,8 @@ dependencies:
   nanoid: ^1.0.0
   visibility_detector: ^0.4.0+2
   file_picker: ^5.3.1
+  path: ^1.8.3
+
 dev_dependencies:
   flutter_test:
     sdk: flutter

diff --git a/test/plugins/markdown/decoder/document_markdown_decoder_test.dart b/test/plugins/markdown/decoder/document_markdown_decoder_test.dart
@@ -197,11 +197,11 @@ void main() async {
             "data": {
                 "delta": [
                   {
-                    "insert": "This file is cuurently not supported : [Example file.pdf](path/to/file.pdf)"
+                    "insert": "[Example file.pdf](path/to/file.pdf)"
                   }
                 ]
               }
-      },      
+      },
       {
         "type": "paragraph",
         "data": {