arno/pup
1
0
Fork 0
mirror of https://github.com/ericchiang/pup synced 2024-11-24 08:58:08 +00:00
Code Issues Releases Wiki Activity

comma separated selectors added

Browse Source
This commit is contained in:
ericchiang 2014-11-22 10:56:35 -05:00
parent f72d543143
commit 31aa392d1a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pup.go
View File

@ -53,12 +53,14 @@ func main() {
} }
} }
switch cmd { switch cmd {
case "*": case "*": // select all
continue continue
case "+": case "+":
funcGenerator = SelectFromChildren funcGenerator = SelectFromChildren
case ">": case ">":
funcGenerator = SelectNextSibling funcGenerator = SelectNextSibling
case ",": // nil will signify a comma
selectorFuncs = append(selectorFuncs, nil)
default: default:
selector, err := ParseSelector(cmd) selector, err := ParseSelector(cmd)
if err != nil { if err != nil {
@ -70,9 +72,16 @@ func main() {
} }
} }
selectedNodes := []*html.Node{}
currNodes := []*html.Node{root} currNodes := []*html.Node{root}
for _, selectorFunc := range selectorFuncs { for _, selectorFunc := range selectorFuncs {
currNodes = selectorFunc(currNodes) if selectorFunc == nil { // hit a comma
selectedNodes = append(selectedNodes, currNodes...)
currNodes = []*html.Node{root}
} else {
currNodes = selectorFunc(currNodes)
}
} }
pupDisplayer.Display(currNodes) selectedNodes = append(selectedNodes, currNodes...)
pupDisplayer.Display(selectedNodes)
} }