Dusk/aux-addon-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working on sniping mode

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-07-15 01:48:52 +02:00
parent 05ca03d559
commit 2792ff9358
5 changed files with 173 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/scan.lua
+70 -67
View File
@@ -1,20 +1,22 @@
local private , public = {}, {}
Aux.scan = public
local m, private , public = Aux:module('scan')
local PAGE_SIZE = 50
local state
local threads = {}
function private.total_pages(total_count)
return math.ceil(total_count / PAGE_SIZE)
end
function private.last_page(total_count)
local total_pages = math.ceil(total_count / PAGE_SIZE)
local last_page = max(total_pages - 1, 0)
local last_page_limit = Aux.util.safe_index(private.current_query().blizzard_query, 'last_page')
local last_page = max(m.total_pages(total_count) - 1, 0)
local last_page_limit = Aux.util.safe_index(m.current_query().blizzard_query, 'last_page')
return last_page_limit and min(last_page_limit, last_page) or last_page
end
function private.current_query()
return private.current_thread().params.queries[private.current_thread().query_index]
return m.current_thread().params.queries[m.current_thread().query_index]
end
function private.current_thread()
@@ -27,11 +29,11 @@ end
function public.start(params)
if threads[params.type] then
public.abort(threads[params.type].id)
m.abort(threads[params.type].id)
end
local thread_id = Aux.control.new_thread(function()
return private.wait_for_callback(private.current_thread().params.on_scan_start, private.scan)
return m.wait_for_callback(m.current_thread().params.on_scan_start, m.scan)
end)
threads[params.type] = {
id = thread_id,
@@ -58,18 +60,18 @@ function public.abort(scan_id)
end
function private.wait_for_results(k)
if private.current_thread().params.type == 'bidder' then
if m.current_thread().params.type == 'bidder' then
return Aux.control.wait_until(function() return Aux.bids_loaded end, k)
elseif private.current_thread().params.type == 'owner' then
return private.wait_for_owner_results(k)
elseif private.current_thread().params.type == 'list' then
return private.wait_for_list_results(k)
elseif m.current_thread().params.type == 'owner' then
return m.wait_for_owner_results(k)
elseif m.current_thread().params.type == 'list' then
return m.wait_for_list_results(k)
end
end
function private.wait_for_owner_results(k)
local updated
if private.current_thread().page == Aux.current_owner_page then
if m.current_thread().page == Aux.current_owner_page then
updated = true
else
Aux.control.on_next_event('AUCTION_OWNED_LIST_UPDATE', function()
@@ -89,7 +91,7 @@ function private.wait_for_list_results(k)
listener:start()
Aux.control.wait_until(function()
-- order important, owner_data_complete must be called after an update to request missing data
local ok = updated and private.owner_data_complete() or last_update and GetTime() - last_update > 5
local ok = updated and m.owner_data_complete() or last_update and GetTime() - last_update > 5
updated = false
return ok
end, function()
@@ -99,12 +101,12 @@ function private.wait_for_list_results(k)
end
function private.owner_data_complete()
if private.current_thread().params.ignore_owner or aux_ignore_owner then
if m.current_thread().params.ignore_owner or aux_ignore_owner then
return true
end
local count = GetNumAuctionItems(private.current_thread().params.type)
local count = GetNumAuctionItems(m.current_thread().params.type)
for i=1,count do
local auction_info = Aux.info.auction(i, private.current_thread().params.type)
local auction_info = Aux.info.auction(i, m.current_thread().params.type)
if auction_info and not auction_info.owner then
return false
end
@@ -134,17 +136,17 @@ function private.wait_for_callback(...)
end
function private.scan()
private.current_thread().query_index = private.current_thread().query_index and private.current_thread().query_index + 1 or 1
if private.current_query() then
if private.current_query().blizzard_query then
private.current_thread().page = private.current_query().blizzard_query.first_page or 0
m.current_thread().query_index = m.current_thread().query_index and m.current_thread().query_index + 1 or 1
if m.current_query() then
if m.current_query().blizzard_query then
m.current_thread().page = m.current_query().blizzard_query.first_page or 0
else
private.current_thread().page = nil
m.current_thread().page = nil
end
private.wait_for_callback(private.current_thread().params.on_start_query, private.current_thread().query_index, private.process_query)
m.wait_for_callback(m.current_thread().params.on_start_query, m.current_thread().query_index, m.process_query)
else
local on_complete = private.current_thread().params.on_complete
threads[private.current_thread().params.type] = nil
local on_complete = m.current_thread().params.on_complete
threads[m.current_thread().params.type] = nil
if on_complete then
return on_complete()
end
@@ -152,23 +154,23 @@ function private.scan()
end
function private.process_query()
if private.current_query().blizzard_query then
return private.submit_query(private.scan_page)
if m.current_query().blizzard_query then
return m.submit_query(m.scan_page)
else
return private.scan_page()
return m.scan_page()
end
end
function private.scan_page()
private.scan_auctions(function()
m.scan_auctions(function()
private.wait_for_callback(private.current_thread().params.on_page_scanned, function()
m.wait_for_callback(m.current_thread().params.on_page_scanned, function()
if private.current_query().blizzard_query and private.current_thread().page < private.last_page(private.current_thread().total_auctions) then
private.current_thread().page = private.current_thread().page + 1
return private.process_query()
if m.current_query().blizzard_query and m.current_thread().page < m.last_page(m.current_thread().total_auctions) then
m.current_thread().page = m.current_thread().page + 1
return m.process_query()
else
return private.scan()
return m.scan()
end
end)
@@ -176,29 +178,29 @@ function private.scan_page()
end
function private.scan_auctions(k)
return private.scan_auctions_helper(1, k)
return m.scan_auctions_helper(1, k)
end
function private.scan_auctions_helper(i, k)
local recurse = function()
if i >= (private.current_thread().page_auctions or GetNumAuctionItems(private.current_thread().params.type)) then
if i >= (m.current_thread().page_auctions or GetNumAuctionItems(m.current_thread().params.type)) then
return k()
else
return private.scan_auctions_helper(i + 1, k)
return m.scan_auctions_helper(i + 1, k)
end
end
local auction_info = Aux.info.auction(i, private.current_thread().params.type)
if auction_info and (auction_info.owner or private.current_thread().params.ignore_owner or aux_ignore_owner) then
local auction_info = Aux.info.auction(i, m.current_thread().params.type)
if auction_info and (auction_info.owner or m.current_thread().params.ignore_owner or aux_ignore_owner) then
auction_info.index = i
auction_info.page = private.current_thread().page
auction_info.blizzard_query = private.current_query().blizzard_query
auction_info.query_type = private.current_thread().params.type
auction_info.page = m.current_thread().page
auction_info.blizzard_query = m.current_query().blizzard_query
auction_info.query_type = m.current_thread().params.type
Aux.history.process_auction(auction_info)
if not private.current_query().validator or private.current_query().validator(auction_info) then
return private.wait_for_callback(private.current_thread().params.on_auction, auction_info, recurse)
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)
end
end
@@ -206,34 +208,35 @@ function private.scan_auctions_helper(i, k)
end
function private.submit_query(k)
Aux.control.wait_until(function() return private.current_thread().params.type ~= 'list' or CanSendAuctionQuery() end, function()
Aux.control.wait_until(function() return m.current_thread().params.type ~= 'list' or CanSendAuctionQuery() end, function()
if private.current_thread().params.on_submit_query then
private.current_thread().params.on_submit_query()
if m.current_thread().params.on_submit_query then
m.current_thread().params.on_submit_query()
end
if private.current_thread().params.type == 'bidder' then
GetBidderAuctionItems(private.current_thread().page)
elseif private.current_thread().params.type == 'owner' then
GetOwnerAuctionItems(private.current_thread().page)
if m.current_thread().params.type == 'bidder' then
GetBidderAuctionItems(m.current_thread().page)
elseif m.current_thread().params.type == 'owner' then
GetOwnerAuctionItems(m.current_thread().page)
else
QueryAuctionItems(
Aux.util.safe_index(private.current_query().blizzard_query, 'name'),
Aux.util.safe_index(private.current_query().blizzard_query, 'min_level'),
Aux.util.safe_index(private.current_query().blizzard_query, 'max_level'),
Aux.util.safe_index(private.current_query().blizzard_query, 'slot'),
Aux.util.safe_index(private.current_query().blizzard_query, 'class'),
Aux.util.safe_index(private.current_query().blizzard_query, 'subclass'),
private.current_thread().page,
Aux.util.safe_index(private.current_query().blizzard_query, 'usable'),
Aux.util.safe_index(private.current_query().blizzard_query, 'quality')
Aux.util.safe_index(m.current_query().blizzard_query, 'name'),
Aux.util.safe_index(m.current_query().blizzard_query, 'min_level'),
Aux.util.safe_index(m.current_query().blizzard_query, 'max_level'),
Aux.util.safe_index(m.current_query().blizzard_query, 'slot'),
Aux.util.safe_index(m.current_query().blizzard_query, 'class'),
Aux.util.safe_index(m.current_query().blizzard_query, 'subclass'),
m.current_thread().page,
Aux.util.safe_index(m.current_query().blizzard_query, 'usable'),
Aux.util.safe_index(m.current_query().blizzard_query, 'quality')
)
end
private.wait_for_results(function()
private.current_thread().page_auctions, private.current_thread().total_auctions = GetNumAuctionItems(private.current_thread().params.type)
private.wait_for_callback(
private.current_thread().params.on_page_loaded,
private.current_thread().page - (private.current_query().blizzard_query.first_page or 0) + 1,
private.last_page(private.current_thread().total_auctions) - (private.current_query().blizzard_query.first_page or 0) + 1,
m.wait_for_results(function()
m.current_thread().page_auctions, m.current_thread().total_auctions = GetNumAuctionItems(m.current_thread().params.type)
m.wait_for_callback(
m.current_thread().params.on_page_loaded,
m.current_thread().page - (m.current_query().blizzard_query.first_page or 0) + 1,
m.last_page(m.current_thread().total_auctions) - (m.current_query().blizzard_query.first_page or 0) + 1,
m.total_pages(m.current_thread().total_auctions),
k
)
end)