This commit is contained in:
Manuel Simon Hirsig
2016-07-25 11:24:11 +02:00
parent 675b7f06be
commit 73c0816d76
2 changed files with 14 additions and 8 deletions
+12 -6
View File
@@ -115,6 +115,7 @@ end
function private.wait_for_callback(...)
local ok = true
local ret
local f = tremove(arg, 1)
local k = tremove(arg)
@@ -122,7 +123,7 @@ function private.wait_for_callback(...)
if f then
tinsert(arg, {
suspend = function() ok = false end,
resume = function() ok = true end,
resume = function(...) ok = true ret = arg end,
})
f(unpack(arg))
end
@@ -130,7 +131,7 @@ function private.wait_for_callback(...)
if ok then
return k()
else
return Aux.control.wait_until(function() return ok end, k)
return Aux.control.wait_until(function() return ok end, function() return k(unpack(ret)) end)
end
end
@@ -199,10 +200,15 @@ function private.scan_auctions_helper(i, k)
Aux.history.process_auction(auction_info)
if m.current_thread().params.auto_buy_validator and m.current_thread().params.auto_buy_validator(auction_info) then
Aux.place_bid(auction_info.query_type, auction_info.index, auction_info.buyout_price)
end
if not m.current_query().validator or m.current_query().validator(auction_info) then
return m.wait_for_callback(m.current_thread().params.on_auction, auction_info, recurse)
return Aux.place_bid(auction_info.query_type, auction_info.index, auction_info.buyout_price, function() return private.scan_auctions_helper(i, k) end)
elseif not m.current_query().validator or m.current_query().validator(auction_info) then
return m.wait_for_callback(m.current_thread().params.on_auction, auction_info, function(removed)
if removed then
return m.scan_auctions_helper(i, k)
else
return recurse()
end
end)
end
end
+2 -2
View File
@@ -296,7 +296,7 @@ function private.start_real_time_scan(query, search, continuation)
if not ignore_page then
if m.auto_buy_checkbox:GetChecked() then
ctrl.suspend()
Aux.place_bid('list', auction_record.index, auction_record.buyout_price, ctrl.resume)
Aux.place_bid('list', auction_record.index, auction_record.buyout_price, function() ctrl.resume(true) end)
else
tinsert(new_records, auction_record)
end
@@ -388,7 +388,7 @@ function private.start_search(queries, continuation)
on_auction = function(auction_record, ctrl)
if m.auto_buy_checkbox:GetChecked() then
ctrl.suspend()
Aux.place_bid('list', auction_record.index, auction_record.buyout_price, ctrl.resume)
Aux.place_bid('list', auction_record.index, auction_record.buyout_price, function() ctrl.resume(true) end)
elseif getn(search.records) < 1000 then
tinsert(search.records, auction_record)
if getn(search.records) == 1000 then