Ver Fonte

fix: sometimes two dots are used in page reference link in org

leizhe há 4 anos atrás
pai
commit
d84fec72e5

+ 1 - 1
src/main/frontend/handler/page.cljs

@@ -215,7 +215,7 @@
                          (re-find
                          (re-find
                           (re-pattern
                           (re-pattern
                            (util/format
                            (util/format
-                            "\\[\\[file:\\./.*%s\\.org\\]\\[(.*?)\\]\\]" old-name))
+                            "\\[\\[file:\\.*/.*%s\\.org\\]\\[(.*?)\\]\\]" old-name))
                           content))]
                           content))]
     (-> (if old-org-ref
     (-> (if old-org-ref
             (let [[old-full-ref old-label] old-org-ref
             (let [[old-full-ref old-label] old-org-ref

+ 4 - 1
src/test/frontend/handler/page_test.cljs

@@ -17,7 +17,7 @@
         old-org-ref (re-find
         old-org-ref (re-find
                      (re-pattern
                      (re-pattern
                       (util/format
                       (util/format
-                       "\\[\\[file:\\./.*%s\\.org\\]\\[(.*?)\\]\\]" old-name))
+                       "\\[\\[file:\\.*/.*%s\\.org\\]\\[(.*?)\\]\\]" old-name))
                      content)]
                      content)]
     (-> (if old-org-ref
     (-> (if old-org-ref
           (let [[old-full-ref old-label] old-org-ref
           (let [[old-full-ref old-label] old-org-ref
@@ -52,6 +52,9 @@
     ["bla [[file:./logseq.foo.org][logseq/foo]] bla" "logseq/foo" "logseq/bar"]
     ["bla [[file:./logseq.foo.org][logseq/foo]] bla" "logseq/foo" "logseq/bar"]
     "bla [[file:./logseq.bar.org][logseq/bar]] bla"
     "bla [[file:./logseq.bar.org][logseq/bar]] bla"
 
 
+    ["bla [[file:../pages/logseq.foo.org][logseq/foo]] bla" "logseq/foo" "logseq/bar"]
+    "bla [[file:../pages/logseq.bar.org][logseq/bar]] bla"
+
     ["bla [[file:./pages/logseq.foo.org][logseq/foo]] bla" "logseq/foo" "logseq/bar"]
     ["bla [[file:./pages/logseq.foo.org][logseq/foo]] bla" "logseq/foo" "logseq/bar"]
     "bla [[file:./pages/logseq.bar.org][logseq/bar]] bla"
     "bla [[file:./pages/logseq.bar.org][logseq/bar]] bla"