From 7edf34aafed703ff826331e7e69ae373ac38489d Mon Sep 17 00:00:00 2001 From: "Chih-Wei (Bert) Chang" Date: Wed, 24 Sep 2014 00:43:25 +0800 Subject: [PATCH] Add ApplySelectors so we can reuse it. --- main.go | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/main.go b/main.go index 67471d2..a6017e1 100644 --- a/main.go +++ b/main.go @@ -1,15 +1,16 @@ package main import ( - "code.google.com/p/go.net/html" - "code.google.com/p/go.net/html/charset" "fmt" - "github.com/ericchiang/pup/funcs" - "github.com/ericchiang/pup/selector" "io" "os" "strconv" "strings" + + "code.google.com/p/go.net/html" + "code.google.com/p/go.net/html/charset" + "github.com/ericchiang/pup/funcs" + "github.com/ericchiang/pup/selector" ) const VERSION string = "0.2.2" @@ -113,20 +114,8 @@ func ProcessFlags(cmds []string) []string { return nonFlagCmds[:n] } -// pup -func main() { - cmds := ProcessFlags(os.Args[1:]) - cr, err := charset.NewReader(inputStream, "") - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(2) - } - root, err := html.Parse(cr) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(2) - } - inputStream.Close() +func ApplySelectors(cmds []string, root *html.Node) { + var err error if len(cmds) == 0 { PrintNode(root, 0) os.Exit(0) @@ -163,3 +152,20 @@ func main() { } } } + +// pup +func main() { + cmds := ProcessFlags(os.Args[1:]) + cr, err := charset.NewReader(inputStream, "") + if err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(2) + } + root, err := html.Parse(cr) + if err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(2) + } + inputStream.Close() + ApplySelectors(cmds, root) +}