devit

slices.go

@@ -15,7 +15,7 @@
 type BaseModel struct{}
 
 var (
 	baseModelType = reflect.TypeOf((*BaseModel)(nil)).Elem()
 )
 
 // New parses a goquery doc into a slice of structs.
@@ -63,45 +63,45 @@
 //			fmt.Printf("pp %+v\n", pp)
 //		}
 //	}
 func New[T any](doc *goquery.Document) ([]T, error) {
 	dType := reflect.TypeOf((*T)(nil)).Elem()
 	if dType.Kind() != reflect.Struct && dType.Kind() != reflect.Ptr {
 		return nil, fmt.Errorf("expected struct, got %s", dType.Kind())
 	}
 	results := make([]T, 0)
 	var cfg *SelectorConfig
 	for i := 0; i < dType.NumField(); i++ {
 		cfg = NewSelectorConfig(dType.Field(i).Tag)
 		if cfg.DataSelector == "" {
 			return nil, ErrSelectorNotFound{
 				Typ:   dType,
 				Field: dType.Field(i),
 				Cfg:   cfg,
 			}
 		}
 		dataRows := doc.Find(cfg.DataSelector)
 		if dataRows.Length() <= 0 {
 			continue
 		}
 		if cfg.HeadSelector != "" && cfg.HeadSelector != "-" {
 			_ = dataRows.RemoveFiltered(cfg.HeadSelector)
 		}
 		if len(results) < dataRows.Length() {
 			results = make([]T, dataRows.Length())
 		}
 		for j := 0; j < dataRows.Length(); j++ {
 			err := SetStructField(
 				&results[j],
 				dType.Field(i), // name of the field to set
 				dataRows.Eq(j), // goquery selection for cell
 				&selector{
 					control: cfg.ControlTag,
 					query:   cfg.QuerySelector,
 				}, // selector for the inner cell
 			)
 			if err != nil {
 				return nil, fmt.Errorf(
 					"failed to set field %s: %s",
 					dType.Field(i).Name,
 					err,
 				)
@@ -358,45 +358,45 @@
 // The struct given as an argument must have a field with the
 // tag seltabl, a header selector with the tag hSel, and a data
 // selector with the tag key dSel.
 func NewCh[T any](doc *goquery.Document, ch chan T) error {
 	dType := reflect.TypeOf((*T)(nil)).Elem()
 	if dType.Kind() != reflect.Struct && dType.Kind() != reflect.Ptr {
 		return fmt.Errorf("expected struct, got %s", dType.Kind())
 	}
 	results := make([]T, 0)
 	var cfg *SelectorConfig
 	for i := 0; i < dType.NumField(); i++ {
 		cfg = NewSelectorConfig(dType.Field(i).Tag)
 		if cfg.DataSelector == "" {
 			return ErrSelectorNotFound{
 				Typ:   dType,
 				Field: dType.Field(i),
 				Cfg:   cfg,
 			}
 		}
 		dataRows := doc.Find(cfg.DataSelector)
 		if dataRows.Length() <= 0 {
 			continue
 		}
 		if cfg.HeadSelector != "" && cfg.HeadSelector != "-" {
 			_ = dataRows.RemoveFiltered(cfg.HeadSelector)
 		}
 		if len(results) < dataRows.Length() {
 			results = make([]T, dataRows.Length())
 		}
 		for j := 0; j < dataRows.Length(); j++ {
 			err := SetStructField(
 				&results[j],
 				dType.Field(i), // name of the field to set
 				dataRows.Eq(j), // goquery selection for cell
 				&selector{
 					control: cfg.ControlTag,
 					query:   cfg.QuerySelector,
 				}, // selector for the inner cell
 			)
 			if err != nil {
 				return fmt.Errorf(
 					"failed to set field %s: %s",
 					dType.Field(i).Name,
 					err,
 				)
@@ -517,18 +517,18 @@
 	doc *goquery.Document,
 	ch chan T,
 	fn F,
 ) error {
 	dType := reflect.TypeOf((*T)(nil)).Elem()
 	if dType.Kind() != reflect.Struct && dType.Kind() != reflect.Ptr {
 		return fmt.Errorf("expected struct, got %s", dType.Kind())
 	}
 	results := make([]T, 0)
 	var cfg *SelectorConfig
 	for i := 0; i < dType.NumField(); i++ {
 		cfg = NewSelectorConfig(dType.Field(i).Tag)
 		if cfg.DataSelector == "" {
 			continue
 		}
 		dataRows := doc.Find(cfg.DataSelector)
 		if dataRows.Length() <= 0 {
 			return ErrNoDataFound{
@@ -536,32 +536,32 @@
 				Field: dType.Field(i),
 				Cfg:   cfg,
 			}
 		}
 		if cfg.HeadSelector != "" && cfg.HeadSelector != "-" {
 			_ = dataRows.RemoveFiltered(cfg.HeadSelector)
 		}
 		if len(results) < dataRows.Length() {
 			results = make([]T, dataRows.Length())
 		}
 		for j := 0; j < dataRows.Length(); j++ {
 			err := SetStructField(
 				&results[j],
 				dType.Field(i), // name of the field to set
 				dataRows.Eq(j), // goquery selection for cell
 				&selector{
 					control: cfg.ControlTag,
 					query:   cfg.QuerySelector,
 				}, // selector for the inner cell
 			)
 			if err != nil {
 				return fmt.Errorf(
 					"failed to set field %s: %s",
 					dType.Field(i).Name,
 					err,
 				)
 			}
 			if fn(results[j]) {
 				ch <- results[j]
 			}
 		}
 	}
@@ -623,3 +623,86 @@
 	}
 	return NewChFn(doc, ch, fn)
 }
+
+// NewPl parses a reader into a slice of structs with parallel processing.
+func NewPl[T any](doc *goquery.Document) ([]T, error) {
+	dType := reflect.TypeOf((*T)(nil)).Elem()
+	if dType.Kind() != reflect.Struct && dType.Kind() != reflect.Ptr {
+		return nil, fmt.Errorf("expected struct, got %s", dType.Kind())
+	}
+	results := make([]T, 0)
+	var cfg *SelectorConfig
+	errCh := make(chan error)
+	for i := 0; i < dType.NumField(); i++ {
+		go func(i int) {
+			cfg = NewSelectorConfig(dType.Field(i).Tag)
+			if cfg.DataSelector == "" {
+				errCh <- ErrSelectorNotFound{
+					Typ:   dType,
+					Field: dType.Field(i),
+					Cfg:   cfg,
+				}
+			}
+			dataRows := doc.Find(cfg.DataSelector)
+			if dataRows.Length() <= 0 {
+				return
+			}
+			if cfg.HeadSelector != "" && cfg.HeadSelector != "-" {
+				_ = dataRows.RemoveFiltered(cfg.HeadSelector)
+			}
+			if len(results) < dataRows.Length() {
+				results = make([]T, dataRows.Length())
+			}
+			for j := 0; j < dataRows.Length(); j++ {
+				err := SetStructField(
+					&results[j],
+					dType.Field(i), // name of the field to set
+					dataRows.Eq(j), // goquery selection for cell
+					&selector{
+						control: cfg.ControlTag,
+						query:   cfg.QuerySelector,
+					}, // selector for the inner cell
+				)
+				if err != nil {
+					errCh <- fmt.Errorf(
+						"failed to set field %s: %s",
+						dType.Field(i).Name,
+						err,
+					)
+				}
+			}
+		}(i)
+	}
+	if len(results) < 1 {
+		return nil, fmt.Errorf("no data found")
+	}
+	return results, nil
+}
+
+// NewFromReaderPl parses a reader into a slice of structs with parallel processing.
+func NewFromReaderPl[T any](r io.Reader) ([]T, error) {
+	doc, err := goquery.NewDocumentFromReader(r)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse html: %w", err)
+	}
+	return NewPl[T](doc)
+}
+
+// NewFromStringPl parses a string into a slice of structs with parallel processing.
+func NewFromStringPl[T any](htmlInput string) ([]T, error) {
+	reader := strings.NewReader(htmlInput)
+	doc, err := goquery.NewDocumentFromReader(reader)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse html: %w", err)
+	}
+	return NewPl[T](doc)
+}
+
+// NewFromBytesPl parses a byte slice into a slice of structs with parallel processing.
+func NewFromBytesPl[T any](b []byte) ([]T, error) {
+	doc, err := goquery.NewDocumentFromReader(bytes.NewReader(b))
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse html: %w", err)
+	}
+	return NewPl[T](doc)
+}

tools/seltabls/README.md

@@ -70,4 +70,3 @@ Manually, one can run the tests with:
 ```sh
 go test ./...
 ```
-