diff --git a/commands/utils.go b/commands/utils.go index 878e28435029cb39add696b2111c49db947d87d5..31123de932abda7fa651692c6c06f0d96903779d 100644 --- a/commands/utils.go +++ b/commands/utils.go @@ -90,25 +90,6 @@ func isEmptyDir(path string) bool { return match == nil } -func readMsgFromFile(filename string, edit bool, editorPrefix, editorTopic string) (title, body string, editor *github.Editor, err error) { - message, err := msgFromFile(filename) - if err != nil { - return - } - - if edit { - editor, err = github.NewEditor(editorPrefix, editorTopic, message) - if err != nil { - return - } - title, body, err = editor.EditTitleAndBody() - return - } else { - title, body = readMsg(message) - return - } -} - func msgFromFile(filename string) (string, error) { var content []byte var err error @@ -125,16 +106,6 @@ func msgFromFile(filename string) (string, error) { return strings.Replace(string(content), "\r\n", "\n", -1), nil } -func readMsg(message string) (title, body string) { - parts := strings.SplitN(message, "\n\n", 2) - - title = strings.TrimSpace(strings.Replace(parts[0], "\n", " ", -1)) - if len(parts) > 1 { - body = strings.TrimSpace(parts[1]) - } - return -} - func printBrowseOrCopy(args *Args, msg string, openBrowser bool, performCopy bool) { if performCopy { if err := clipboard.WriteAll(msg); err != nil { diff --git a/github/editor.go b/github/editor.go index ea011c2077ab8470846df6dd556aa6013fe94c19..9d29d8a69a2d5af4157f74e05994e1f9a4f4e031 100644 --- a/github/editor.go +++ b/github/editor.go @@ -4,7 +4,6 @@ import ( "bufio" "bytes" "fmt" - "io" "io/ioutil" "os" "path/filepath" @@ -65,23 +64,6 @@ func (e *Editor) DeleteFile() error { return os.Remove(e.File) } -func (e *Editor) EditTitleAndBody() (title, body string, err error) { - content, err := e.openAndEdit() - if err != nil { - return - } - - content = bytes.TrimSpace(content) - reader := bytes.NewReader(content) - title, body, err = readTitleAndBody(reader, e.CS) - - if err != nil || title == "" { - defer e.DeleteFile() - } - - return -} - func (e *Editor) EditContent() (content string, err error) { b, err := e.openAndEdit() if err != nil { @@ -159,34 +141,3 @@ func openTextEditor(program, file string) error { return editCmd.Spawn() } - -func readTitleAndBody(reader io.Reader, cs string) (title, body string, err error) { - var titleParts, bodyParts []string - - r := regexp.MustCompile("\\S") - scanner := bufio.NewScanner(reader) - for scanner.Scan() { - line := scanner.Text() - if strings.HasPrefix(line, cs) { - continue - } - - if len(bodyParts) == 0 && r.MatchString(line) { - titleParts = append(titleParts, line) - } else { - bodyParts = append(bodyParts, line) - } - } - - if err = scanner.Err(); err != nil { - return - } - - title = strings.Join(titleParts, " ") - title = strings.TrimSpace(title) - - body = strings.Join(bodyParts, "\n") - body = strings.TrimSpace(body) - - return -}