Skip to content

fix: speed up click, avoid conversion in loop #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alvarolaserna merged 2 commits into from
Feb 13, 2024
Merged

fix: speed up click, avoid conversion in loop #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82a3635
fix: speed up click/press/click_and_hold
TDL-EdgarsEglitis Feb 13, 2024
5020ab3
fix: do not repeat conversion in loop
TDL-EdgarsEglitis Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 15 additions & 29 deletions lib/core/device.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,16 +423,11 @@ def end_record(action)
# NoRaise
def click(action)
start = Time.now
return unless wait_for(action)

action["Condition"] = nil
start_error = Time.now

el = wait_for(action)
return unless el

now = Time.now
log_info("Time to find element: #{now - start - (now - start_error) / 2}s " +
"error #{(now - start_error)}") if action["CheckTime"]
log_info("Time to find element: #{now - start}s") if action["CheckTime"]
error = nil

wait_time = (action["CheckTime"] ? action["CheckTime"] : @timeout)
Expand Down Expand Up @@ -490,16 +485,11 @@ def tap_by_coord(action)
# NoRaise
def press(action)
start = Time.now
return unless wait_for(action)

action["Condition"] = nil
start_error = Time.now

el = wait_for(action)
return unless el

now = Time.now
log_info("Time to find element: #{now - start - (now - start_error) / 2}s " +
"error #{(now - start_error)}") if action["CheckTime"]
log_info("Time to find element: #{now - start}s") if action["CheckTime"]
error = nil

wait_time = (action["CheckTime"] ? action["CheckTime"] : @timeout)
Expand Down Expand Up @@ -528,16 +518,11 @@ def press(action)
# NoRaise
def click_and_hold(action)
start = Time.now
return unless wait_for(action)

action["Condition"] = nil
start_error = Time.now

el = wait_for(action)
return unless el

now = Time.now
log_info("Time to find element: #{now - start - (now - start_error) / 2}s " +
"error #{(now - start_error)}") if action["CheckTime"]
log_info("Time to find element: #{now - start}s") if action["CheckTime"]
error = nil

wait_time = (action["CheckTime"] ? action["CheckTime"] : @timeout)
Expand Down Expand Up @@ -933,16 +918,15 @@ def wait_for(action)
wait_time = (action["CheckTime"] ? action["CheckTime"] : wait_time)
index = action["Index"]

el = nil
exception = ""
start = Time.now
try = 0
while (Time.now - start) < wait_time
if id.is_a?(String)

if id.is_a?(String)
id = convert_value(id)
locator_strategy = convert_value(locator_strategy)
while (Time.now - start) < wait_time
begin
id = convert_value(id)
locator_strategy = convert_value(locator_strategy)
try += 1
el = nil
if index
els = @driver.find_elements(locator_strategy, id)
if index.is_a?(String) && index == "last"
Expand All @@ -959,7 +943,9 @@ def wait_for(action)
exception = e
sleep(0.2)
end
else
end
else
while (Time.now - start) < wait_time
i = 0
id.each do |locator|
locator = convert_value(locator)
Expand Down