From d85d8b30593b3e66a91ffcecf6e60c19da67d18f Mon Sep 17 00:00:00 2001 From: huangsimin Date: Fri, 7 Dec 2018 18:20:00 +0800 Subject: [PATCH] add --name option. fix parse \" error --- option.go | 9 +++++++-- parse_curl.go | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/option.go b/option.go index eefe7bc..d60f80c 100644 --- a/option.go +++ b/option.go @@ -36,6 +36,7 @@ func init() { // 自定义 {"--task", 10, parseITask, &extract{re: "--task +(.+)", execute: extractData}}, {"--crontab", 10, parseCrontab, &extract{re: "--crontab +(.+)", execute: extractData}}, + {"--name", 10, parseName, &extract{re: "--name +(.+)", execute: extractData}}, } for _, oe := range oelist { @@ -86,13 +87,17 @@ func judgeOptions(u *CURL, soption string) *parseFunction { return oe.BuildFunction(u, soption) } - log.Println(soption, " no haved this option") + log.Println(soption, " not this option") return nil } func extractData(re, soption string) string { datas := regexp.MustCompile(re).FindStringSubmatch(soption) - return strings.Trim(datas[1], "'") + return strings.Trim(datas[1], "'\"") +} + +func parseName(u *CURL, value string) { + u.Name = value } func parseCrontab(u *CURL, value string) { diff --git a/parse_curl.go b/parse_curl.go index 9cb1c58..2a06a65 100644 --- a/parse_curl.go +++ b/parse_curl.go @@ -25,6 +25,7 @@ type CURL struct { ITask string Crontab string + Name string } // New new 一个 curl 出来