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

refactorings

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-05-17 00:22:16 +02:00
parent 212d19993a
commit 461ead2f2e
1 changed files with 54 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scan.lua
+54 -58
View File
@@ -102,7 +102,7 @@ function private.owner_data_complete()
if private.current_thread().params.ignore_owner or aux_ignore_owner then if private.current_thread().params.ignore_owner or aux_ignore_owner then
return true return true
end end
local count, _ = GetNumAuctionItems(private.current_thread().params.type) local count = GetNumAuctionItems(private.current_thread().params.type)
for i=1,count do for i=1,count do
local auction_info = Aux.info.auction(i, private.current_thread().params.type) local auction_info = Aux.info.auction(i, private.current_thread().params.type)
if auction_info and not auction_info.owner then if auction_info and not auction_info.owner then
@@ -136,10 +136,7 @@ end
function private.scan() function private.scan()
private.current_thread().query_index = private.current_thread().query_index and private.current_thread().query_index + 1 or 1 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() then
private.wait_for_callback(private.current_thread().params.on_start_query, private.current_thread().query_index, function() private.wait_for_callback(private.current_thread().params.on_start_query, private.current_thread().query_index, private.process_query)
private.current_thread().page = Aux.util.safe_index(private.current_query().blizzard_query, 'first_page') or 0
return private.process_query()
end)
else else
local on_complete = private.current_thread().params.on_complete local on_complete = private.current_thread().params.on_complete
threads[private.current_thread().params.type] = nil threads[private.current_thread().params.type] = nil
@@ -150,37 +147,40 @@ function private.scan()
end end
function private.process_query() function private.process_query()
if private.current_query().blizzard_query then
private.current_thread().page = private.current_thread().page or private.current_query().blizzard_query.first_page or 0
return private.submit_query(private.scan_page)
else
return private.scan_page()
end
end
private.submit_query(function() function private.scan_page()
private.scan_auctions(function()
local count, total_count = GetNumAuctionItems(private.current_thread().params.type) private.wait_for_callback(private.current_thread().params.on_page_scanned, function()
private.scan_auctions(count, 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()
else
return private.scan()
end
private.wait_for_callback(private.current_thread().params.on_page_scanned, function()
if private.current_query().blizzard_query and private.current_thread().page < private.last_page(total_count) then
private.current_thread().page = private.current_thread().page + 1
return private.process_query()
else
return private.scan()
end
end)
end) end)
end) end)
end end
function private.scan_auctions(count, k) function private.scan_auctions(k)
return private.scan_auctions_helper(1, count, k) return private.scan_auctions_helper(1, k)
end end
function private.scan_auctions_helper(i, n, k) function private.scan_auctions_helper(i, k)
local recurse = function() local recurse = function()
if i >= n then if i >= (private.current_thread().page_auctions or GetNumAuctionItems(private.current_thread().params.type)) then
return k() return k()
else else
return private.scan_auctions_helper(i + 1, n, k) return private.scan_auctions_helper(i + 1, k)
end end
end end
@@ -202,40 +202,36 @@ function private.scan_auctions_helper(i, n, k)
end end
function private.submit_query(k) function private.submit_query(k)
if private.current_query().blizzard_query then Aux.control.wait_until(function() return private.current_thread().params.type ~= 'list' or CanSendAuctionQuery() end, function()
Aux.control.wait_until(function() return private.current_thread().params.type ~= 'list' or CanSendAuctionQuery() end, function()
if private.current_thread().params.on_submit_query then if private.current_thread().params.on_submit_query then
private.current_thread().params.on_submit_query() private.current_thread().params.on_submit_query()
end end
if private.current_thread().params.type == 'bidder' then if private.current_thread().params.type == 'bidder' then
GetBidderAuctionItems(private.current_thread().page) GetBidderAuctionItems(private.current_thread().page)
elseif private.current_thread().params.type == 'owner' then elseif private.current_thread().params.type == 'owner' then
GetOwnerAuctionItems(private.current_thread().page) GetOwnerAuctionItems(private.current_thread().page)
else else
QueryAuctionItems( QueryAuctionItems(
Aux.util.safe_index(private.current_query().blizzard_query, 'name'), 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, 'min_level'),
Aux.util.safe_index(private.current_query().blizzard_query, 'max_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, 'slot'),
Aux.util.safe_index(private.current_query().blizzard_query, 'class'), Aux.util.safe_index(private.current_query().blizzard_query, 'class'),
Aux.util.safe_index(private.current_query().blizzard_query, 'subclass'), Aux.util.safe_index(private.current_query().blizzard_query, 'subclass'),
private.current_thread().page, private.current_thread().page,
Aux.util.safe_index(private.current_query().blizzard_query, 'usable'), Aux.util.safe_index(private.current_query().blizzard_query, 'usable'),
Aux.util.safe_index(private.current_query().blizzard_query, 'quality') Aux.util.safe_index(private.current_query().blizzard_query, 'quality')
) )
end end
private.wait_for_results(function() private.wait_for_results(function()
local _, total_count = GetNumAuctionItems(private.current_thread().params.type) private.current_thread().page_auctions, private.current_thread().total_auctions = GetNumAuctionItems(private.current_thread().params.type)
private.wait_for_callback( private.wait_for_callback(
private.current_thread().params.on_page_loaded, private.current_thread().params.on_page_loaded,
private.current_thread().page - (private.current_query().blizzard_query.first_page or 0) + 1, private.current_thread().page - (private.current_query().blizzard_query.first_page or 0) + 1,
private.last_page(total_count) - (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,
k k
) )
end) end)
end) end)
else
return k()
end
end end