go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-07-05 00:49:00 +02:00
Code Issues Releases Activity

Refactoring/externalized html (#234)

Browse Source 
* Externalized HTML drivers

* Fixed unit tests

* Updated logging

* Added support to set default driver

* Updated GetIn and SetIn helpers
This commit is contained in:
Tim Voronov
2019-02-19 18:10:18 -05:00
committed by GitHub
parent f8e061cc80
commit 34c8c02258
62 changed files with 1356 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
pkg/stdlib/html/document.go
View File

@ -5,13 +5,14 @@ import (
"time"
"github.com/MontFerret/ferret/pkg/drivers"
"github.com/MontFerret/ferret/pkg/drivers/cdp"
"github.com/MontFerret/ferret/pkg/runtime/core"
"github.com/MontFerret/ferret/pkg/runtime/values"
"github.com/MontFerret/ferret/pkg/runtime/values/types"
)
type DocumentLoadParams struct {
Dynamic values.Boolean
Driver string
Timeout time.Duration
}
@ -56,17 +57,7 @@ func Document(ctx context.Context, args ...core.Value) (core.Value, error) {
ctx, cancel := context.WithTimeout(ctx, params.Timeout)
defer cancel()
if params.Dynamic {
drv, err := drivers.DynamicFrom(ctx)
if err != nil {
return values.None, err
}
return drv.GetDocument(ctx, url)
}
drv, err := drivers.StaticFrom(ctx)
drv, err := drivers.FromContext(ctx, params.Driver)
if err != nil {
return values.None, err
@ -77,7 +68,6 @@ func Document(ctx context.Context, args ...core.Value) (core.Value, error) {
func newDefaultDocLoadParams() DocumentLoadParams {
return DocumentLoadParams{
Dynamic: false,
Timeout: time.Second * 30,
}
}
@ -85,36 +75,48 @@ func newDefaultDocLoadParams() DocumentLoadParams {
func newDocLoadParams(arg core.Value) (DocumentLoadParams, error) {
res := newDefaultDocLoadParams()
if err := core.ValidateType(arg, types.Boolean, types.Object); err != nil {
if err := core.ValidateType(arg, types.Boolean, types.String, types.Object); err != nil {
return res, err
}
if arg.Type() == types.Boolean {
res.Dynamic = arg.(values.Boolean)
switch arg.Type() {
case types.Object:
obj := arg.(*values.Object)
return res, nil
}
driver, exists := obj.Get(values.NewString("driver"))
obj := arg.(*values.Object)
if exists {
if err := core.ValidateType(driver, types.String); err != nil {
return res, err
}
isDynamic, exists := obj.Get(values.NewString("dynamic"))
if exists {
if err := core.ValidateType(isDynamic, types.Boolean); err != nil {
return res, err
res.Driver = driver.(values.String).String()
}
res.Dynamic = isDynamic.(values.Boolean)
}
timeout, exists := obj.Get(values.NewString("timeout"))
timeout, exists := obj.Get(values.NewString("timeout"))
if exists {
if err := core.ValidateType(timeout, types.Int); err != nil {
return res, err
}
if exists {
if err := core.ValidateType(timeout, types.Int); err != nil {
return res, err
res.Timeout = time.Duration(timeout.(values.Int)) + time.Millisecond
}
res.Timeout = time.Duration(timeout.(values.Int)) + time.Millisecond
break
case types.String:
res.Driver = arg.(values.String).String()
break
case types.Boolean:
b := arg.(values.Boolean)
// fallback
if b {
res.Driver = cdp.DriverName
}
break
}
return res, nil