Add ApplySelectors so we can reuse it.

pull/18/head
Chih-Wei (Bert) Chang 10 years ago
parent d39374885b
commit 7edf34aafe

@ -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)
}

Loading…
Cancel
Save