fetcher: input any

fetcher/fetch.go

@@ -21,27 +21,27 @@ import (
 	"github.com/goplus/hdq"
 )
 
-// func(url string, doc hdq.NodeSet) <any-object>
+// func(input any, doc hdq.NodeSet) <any-object>
 type Conv = any
 
 // -----------------------------------------------------------------------------
 
 // Convert converts a html source to an object.
-func Convert(conv reflect.Value, url string, source any) any {
+func Convert(conv reflect.Value, input, source any) any {
 	doc := reflect.ValueOf(hdq.Source(source))
-	out := conv.Call([]reflect.Value{reflect.ValueOf(url), doc})
+	out := conv.Call([]reflect.Value{reflect.ValueOf(input), doc})
 	return out[0].Interface()
 }
 
 // -----------------------------------------------------------------------------
 
 // New creates a new object from a html source by a registered converter.
-func New(pageType string, url string, source any) any {
+func New(pageType string, input, source any) any {
 	page, ok := convs[pageType]
 	if !ok {
 		panic("fetcher: unknown pageType - " + pageType)
 	}
-	return Convert(page.Conv, url, source)
+	return Convert(page.Conv, input, source)
 }
 
 // FromInput creates a new object from the html source with the specified input.
@@ -51,21 +51,21 @@ func FromInput(pageType string, input any) any {
 		panic("fetcher: unknown pageType - " + pageType)
 	}
 	url := page.URL(input)
-	return Convert(page.Conv, url, url)
+	return Convert(page.Conv, input, url)
 }
 
 // sitePageType represents a site page type.
 type sitePageType struct {
 	Conv reflect.Value
-	URL  func(any) string
+	URL  func(input any) string
 }
 
 var (
 	convs = map[string]sitePageType{}
 )
 
 // Register registers a convType with a convert function.
-func Register(pageType string, conv Conv, urlOf func(any) string) {
+func Register(pageType string, conv Conv, urlOf func(input any) string) {
 	vConv := reflect.ValueOf(conv)
 	convs[pageType] = sitePageType{vConv, urlOf}
 }

fetcher/torch/_testdata/eye/out.json

@@ -1,5 +1,5 @@
 {
-	"name": "eye",
+	"name": "",
 	"doc": "",
 	"sig": "(n, m=None, *, out=None, dtype=None, layout=torch.strided, device=None, requires_grad=False) → Tensor"
 }

fetcher/torch/pysig_torch.gop

@@ -30,24 +30,29 @@ const (
 
 type Result struct {
 	Name string `json:"name"`
+	Type string `json:"type"`
 	Doc  string `json:"doc"`
 	Sig  string `json:"sig"`
 	URL  string `json:"url,omitempty"`
 }
 
 // New creates a new Result from a html document.
-func New(url string, doc hdq.NodeSet) Result {
+func New(input any, doc hdq.NodeSet) Result {
+	name := input.(string)
+	url := name
+	if name != "" {
+		url = URL(input)
+	}
 	if doc.ok {
 		fn := doc.any.dl.class("py function")
 		decl := fn.firstElementChild.dt.text!
 		pos := strings.indexByte(decl, '(')
 		if pos > 0 {
-			name := strings.trimPrefix(decl[:pos], "torch.")
 			sig := decl[pos:]
-			return {strings.trimSpace(name), "", strings.trimRight(sig, spaces), url}
+			return {name, "function", "", strings.trimRight(sig, spaces), url}
 		}
 	}
-	return {"", "", "<NULL>", url}
+	return {name, "", "", "<NULL>", url}
 }
 
 // URL returns the input URL for the given name.

tutorial/02-GithubRepos/repos.gop

@@ -42,7 +42,7 @@ type Result struct {
 }
 
 // New creates a new Result from a html document.
-func New(url string, doc hdq.NodeSet) Result {
+func New(_ any, doc hdq.NodeSet) Result {
 	divRepos := doc.any.div.id("user-repositories-list").one
 	repoList := divRepos.child.ul.one
 	repos := [newRepo(x) for x <- repoList.child.li]