GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-11 18:11:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add ocr tags to summary

Browse Source
This commit is contained in:
lilong.129
2023-05-04 01:21:00 +08:00
parent 8330e6ccf6
commit 70d0f666ea
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hrp/pkg/uixt/ext.go
View File

@@ -47,11 +47,16 @@ func WithThreshold(threshold float64) CVOption {
}
}
type OcrResult struct {
Texts OCRTexts `json:"texts"` // dumped OCRTexts
Tags []string `json:"tags"` // tags for image, e.g. ["feed", "ad", "live"]
}
type cacheStepData struct {
// cache step screenshot paths
ScreenShots []string
// cache step screenshot ocr results, key is image path, value is dumped OCRTexts
OcrResults map[string]string
// cache step screenshot ocr results, key is image path, value is OcrResult
OcrResults map[string]*OcrResult
// cache feed/live video stat
VideoStat *VideoStat
}
@@ -76,7 +81,7 @@ func NewDriverExt(device Device, driver WebDriver) (dExt *DriverExt, err error)
Driver: driver,
cacheStepData: cacheStepData{
ScreenShots: make([]string, 0),
OcrResults: make(map[string]string),
OcrResults: make(map[string]*OcrResult),
},
interruptSignal: make(chan os.Signal, 1),
}
@@ -188,7 +193,7 @@ func (dExt *DriverExt) GetStepCacheData() cacheStepData {
// clear cache
dExt.cacheStepData = cacheStepData{
ScreenShots: []string{},
OcrResults: make(map[string]string),
OcrResults: make(map[string]*OcrResult),
}
return copied
}

6
hrp/pkg/uixt/ocr_vedem.go
View File

@@ -294,8 +294,10 @@ func (dExt *DriverExt) GetScreenTextsByOCR() (imagePath string, ocrTexts OCRText
return
}
o, _ := json.Marshal(ocrTexts)
dExt.cacheStepData.OcrResults[imagePath] = string(o)
dExt.cacheStepData.OcrResults[imagePath] = &OcrResult{
Texts: ocrTexts,
}
return imagePath, ocrTexts, nil
}

25
hrp/pkg/uixt/video_crawler.go
View File

@@ -82,14 +82,15 @@ func (s *VideoStat) isTargetAchieved() bool {
}
// incrFeed increases feed count and feed stat
func (s *VideoStat) incrFeed(texts OCRTexts, driverExt *DriverExt) error {
func (s *VideoStat) incrFeed(ocrResult *OcrResult, driverExt *DriverExt) error {
// feed author
actionOptions := []ActionOption{
WithRegex(true),
driverExt.GenAbsScope(0, 0.5, 1, 1).Option(),
}
if ocrText, err := texts.FindText("^@", actionOptions...); err == nil {
if ocrText, err := ocrResult.Texts.FindText("^@", actionOptions...); err == nil {
log.Debug().Str("author", ocrText.Text).Msg("found feed author")
ocrResult.Tags = append(ocrResult.Tags, ocrText.Text)
}
for _, targetLabel := range s.configs.Feed.TargetLabels {
@@ -98,7 +99,7 @@ func (s *VideoStat) incrFeed(texts OCRTexts, driverExt *DriverExt) error {
WithRegex(targetLabel.Regex),
driverExt.GenAbsScope(scope[0], scope[1], scope[2], scope[3]).Option(),
}
if ocrText, err := texts.FindText(targetLabel.Text, actionOptions...); err == nil {
if ocrText, err := ocrResult.Texts.FindText(targetLabel.Text, actionOptions...); err == nil {
log.Info().Str("label", targetLabel.Text).
Str("text", ocrText.Text).Msg("found feed success")
@@ -107,6 +108,7 @@ func (s *VideoStat) incrFeed(texts OCRTexts, driverExt *DriverExt) error {
s.FeedStat[key] = 0
}
s.FeedStat[key]++
ocrResult.Tags = append(ocrResult.Tags, key)
}
}
@@ -163,7 +165,7 @@ type LiveCrawler struct {
func (l *LiveCrawler) checkLiveVideo(texts OCRTexts) (enterPoint PointF, yes bool) {
// 预览流入口
points, err := texts.FindTexts([]string{"点击进入直播间", "直播中"})
points, err := texts.FindTexts([]string{".?点击进入直播间", "直播中"}, WithRegex(true))
if err == nil {
return points[0].Center(), true
}
@@ -197,11 +199,12 @@ func (l *LiveCrawler) Run(driver *DriverExt, enterPoint PointF) error {
}
// take screenshot and get screen texts by OCR
_, _, err := l.driver.GetScreenTextsByOCR()
imagePath, _, err := l.driver.GetScreenTextsByOCR()
if err != nil {
log.Error().Err(err).Msg("OCR GetTexts failed")
continue
}
l.driver.cacheStepData.OcrResults[imagePath].Tags = []string{"live"}
// TODO: check live type
@@ -299,14 +302,16 @@ func (dExt *DriverExt) VideoCrawler(configs *VideoCrawlerConfigs) (err error) {
}
// take screenshot and get screen texts by OCR
_, texts, err := dExt.GetScreenTextsByOCR()
imagePath, texts, err := dExt.GetScreenTextsByOCR()
if err != nil {
log.Error().Err(err).Msg("OCR GetTexts failed")
continue
}
ocrResult := dExt.cacheStepData.OcrResults[imagePath]
ocrResult.Tags = []string{"feed"}
// automatic handling of pop-up windows
if err := dExt.autoPopupHandler(texts); err != nil {
if err := dExt.autoPopupHandler(ocrResult); err != nil {
log.Error().Err(err).Msg("auto handle popup failed")
return err
}
@@ -326,7 +331,7 @@ func (dExt *DriverExt) VideoCrawler(configs *VideoCrawlerConfigs) (err error) {
}
// check feed type and incr feed count
if err := currVideoStat.incrFeed(texts, dExt); err != nil {
if err := currVideoStat.incrFeed(ocrResult, dExt); err != nil {
log.Error().Err(err).Msg("incr feed failed")
}
@@ -386,13 +391,13 @@ var popups = [][]string{
{"确定", "取消"},
}
func (dExt *DriverExt) autoPopupHandler(texts OCRTexts) error {
func (dExt *DriverExt) autoPopupHandler(ocrResult *OcrResult) error {
for _, popup := range popups {
if len(popup) != 2 {
continue
}
points, err := texts.FindTexts([]string{"确定", "取消"})
points, err := ocrResult.Texts.FindTexts([]string{"确定", "取消"})
if err == nil {
log.Warn().Msg("text popup found")
point := points[1].Center()

2
hrp/pkg/uixt/video_crawler_test.go
View File

@@ -14,7 +14,7 @@ func TestVideoCrawler(t *testing.T) {
Feed: FeedConfig{
TargetCount: 5,
TargetLabels: []TargetLabel{
{Text: `^广告$`, Scope: Scope{0, 0.5, 1, 1}, Regex: true},
{Text: `^广告$`, Scope: Scope{0, 0.5, 1, 1}, Regex: true, Target: 2},
{Text: `^图文$`, Scope: Scope{0, 0.5, 1, 1}, Regex: true},
{Text: `^特效\|`, Scope: Scope{0, 0.5, 1, 1}, Regex: true},
{Text: `^模板\|`, Scope: Scope{0, 0.5, 1, 1}, Regex: true},