From 72127319714dc83638869f30094ae67600a8c9b3 Mon Sep 17 00:00:00 2001 From: "jason.wang" Date: Thu, 21 Nov 2024 20:57:37 +0800 Subject: [PATCH] video comment crawl --- .../Browsing/Models/PageActionArgs.cs | 3 --- .../PlaywrightDriver/PlaywrightWebDriver.GoToPage.cs | 12 ------------ .../PlaywrightWebDriver.ScrollPage.cs | 5 +++-- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/Infrastructure/BotSharp.Abstraction/Browsing/Models/PageActionArgs.cs b/src/Infrastructure/BotSharp.Abstraction/Browsing/Models/PageActionArgs.cs index 32486a09..fe575462 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Browsing/Models/PageActionArgs.cs +++ b/src/Infrastructure/BotSharp.Abstraction/Browsing/Models/PageActionArgs.cs @@ -47,7 +47,4 @@ public class PageActionArgs public int WaitTime { get; set; } public bool ReadInnerHTMLAsBody { get; set; } = false; - public bool IsScrollPage { get; set; } = false; - public int ScrollCount { get; set; } = 1; - public int ScrollWaitTime { get; set; } = 1; } diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.GoToPage.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.GoToPage.cs index 156e17f0..ccc2148e 100644 --- a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.GoToPage.cs +++ b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.GoToPage.cs @@ -77,18 +77,6 @@ public partial class PlaywrightWebDriver await Task.Delay(args.WaitTime * 1000); } - if (args.IsScrollPage) - { - var scrollCount = 0; - while (scrollCount < args.ScrollCount) - { - var previousHeight = await page.EvaluateAsync("document.body.scrollHeight"); - await page.EvaluateAsync("window.scrollTo(0, document.body.scrollHeight)"); - await page.WaitForTimeoutAsync(args.ScrollWaitTime * 1000); - scrollCount++; - }; - } - result.ResponseStatusCode = response.Status; if (response.Status == 200) { diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.ScrollPage.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.ScrollPage.cs index 48538ce8..3919629e 100644 --- a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.ScrollPage.cs +++ b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.ScrollPage.cs @@ -5,7 +5,8 @@ public partial class PlaywrightWebDriver public async Task ScrollPage(MessageInfo message, PageActionArgs args) { var result = new BrowserActionResult(); - await _instance.Wait(message.ContextId); + var waitTime = args.WaitTime > 0 ? args.WaitTime : 10; + await _instance.Wait(message.ContextId, waitTime, args.WaitForNetworkIdle); var page = _instance.GetPage(message.ContextId); @@ -31,7 +32,7 @@ public partial class PlaywrightWebDriver int scrollY = await page.EvaluateAsync("document.body.scrollHeight"); // Scroll to the bottom - await page.Mouse.WheelAsync(0, -scrollY); + await page.Mouse.WheelAsync(0, scrollY); } else if (args.Direction == "top") {