diff options
| author | s-ol <s-ol@users.noreply.github.com> | 2020-02-15 14:37:49 +0000 |
|---|---|---|
| committer | s-ol <s-ol@users.noreply.github.com> | 2020-02-15 14:37:49 +0000 |
| commit | 0ffffd95dd0ec7ffcb67a712b72ec9ae4b0e8320 (patch) | |
| tree | a4c001e4c5996175807dd8c3bc95c248c16f0027 | |
| parent | text/html as default web view (diff) | |
| download | mmm-0ffffd95dd0ec7ffcb67a712b72ec9ae4b0e8320.tar.gz mmm-0ffffd95dd0ec7ffcb67a712b72ec9ae4b0e8320.zip | |
fix conversion want wildcard
| -rw-r--r-- | mmm/mmmfs/conversion.moon | 9 | ||||
| -rw-r--r-- | mmm/mmmfs/util.moon | 2 | ||||
| -rw-r--r-- | root/meta/mmm.component/text$moonscript -> fn -> mmm$dom.moon | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/mmm/mmmfs/conversion.moon b/mmm/mmmfs/conversion.moon index a61b0bd..0e034a1 100644 --- a/mmm/mmmfs/conversion.moon +++ b/mmm/mmmfs/conversion.moon @@ -3,7 +3,12 @@ refs = require 'mmm.refs' import Queue from require '.queue' count = (base, pattern='->') -> select 2, base\gsub pattern, '' -escape_pattern = (inp) -> "^#{inp\gsub '([^%w])', '%%%1'}$" +escape_pattern = (inp) -> + if '*' == inp\sub -1 + inp = inp\sub 1, -2 + "^#{inp\gsub '([^%w])', '%%%1'}" + else + "^#{inp\gsub '([^%w])', '%%%1'}$" escape_inp = (inp) -> "^#{inp\gsub '([-/])', '%%%1'}$" local print_conversions @@ -67,7 +72,7 @@ get_conversions = (want, have, converts=PLUGINS and PLUGINS.converts, limit=5, d had = {} queue = Queue! for start in *have - return {}, start if want\match start + return {}, start if start\match want queue\add { :start, rest: start, conversions: {} }, 0, start if debug diff --git a/mmm/mmmfs/util.moon b/mmm/mmmfs/util.moon index 5e99ebd..4f6b9bf 100644 --- a/mmm/mmmfs/util.moon +++ b/mmm/mmmfs/util.moon @@ -48,7 +48,7 @@ tourl = (path) -> name or= fileder\get 'title: mmm/dom' name or= fileder\gett 'name: alpha' - if href = fileder\get 'link: URL.*' + if href = fileder\get 'link: URL*' a name, merge attr, :href, target: '_blank' else a name, merge attr, { diff --git a/root/meta/mmm.component/text$moonscript -> fn -> mmm$dom.moon b/root/meta/mmm.component/text$moonscript -> fn -> mmm$dom.moon index 65556c3..b975c1d 100644 --- a/root/meta/mmm.component/text$moonscript -> fn -> mmm$dom.moon +++ b/root/meta/mmm.component/text$moonscript -> fn -> mmm$dom.moon @@ -20,8 +20,8 @@ source = do example = (name) -> for child in *@children if name == child\gett 'name: alpha' - moon_src = child\get 'text/moonscript.*' - lua_src = child\get 'text/lua.*' + moon_src = child\gett 'text/moonscript*' + lua_src = child\gett 'text/lua*' dom = child\gett 'mmm/dom' return source moon_src, lua_src, dom |