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 02:30:27 +02:00
parent 2792ff9358
commit e9fda02615
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/scan.lua
+7 -7
View File
@@ -5,14 +5,14 @@ local PAGE_SIZE = 50
local state
local threads = {}
function private.total_pages(total_count)
return math.ceil(total_count / PAGE_SIZE)
function private.total_pages(total_auctions)
return math.ceil(total_auctions / PAGE_SIZE)
end
function private.last_page(total_count)
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
function private.last_page(total_auctions)
local last_page = max(m.total_pages(total_auctions) - 1, 0)
local last_page_limit = Aux.util.safe_index(m.current_query().blizzard_query, 'last_page') or last_page
return min(last_page_limit, last_page)
end
function private.current_query()
@@ -236,7 +236,7 @@ function private.submit_query(k)
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),
m.total_pages(m.current_thread().total_auctions) - 1,
k
)
end)
panels/search/core.lua
+17 -10
View File
@@ -222,7 +222,11 @@ function public.execute(mode, filter_string)
Aux.log('Invalid filter: The sniping mode does not support page range filters')
end
private.new_search(filter_string, Aux.util.join(Aux.util.map(queries, function(filter) return filter.prettified end), ';'))
if filter_string ~= private.current_search().filter_string then
private.new_search(filter_string, Aux.util.join(Aux.util.map(queries, function(filter) return filter.prettified end), ';'))
else
private.results_listing:SetSelectedRecord()
end
private.sniping_helper(private.current_search(), queries[1])
end
@@ -240,6 +244,7 @@ function private.sniping_helper(search, query)
private.update_tab(private.RESULTS)
local next_page
search_scan_id = Aux.scan.start{
type = 'list',
queries = {query},
@@ -248,9 +253,8 @@ function private.sniping_helper(search, query)
private.status_bar:set_text('Sniping ...')
end,
on_page_loaded = function(_, _, last_page)
query.blizzard_query.first_page = last_page - 1
query.blizzard_query.last_page = last_page - 1
if last_page == 1 then
next_page = last_page
if last_page == 0 then
ignore_page = false
end
end,
@@ -270,6 +274,8 @@ function private.sniping_helper(search, query)
private.results_listing:SetDatabase(search.records)
end
query.blizzard_query.first_page = next_page
query.blizzard_query.last_page = next_page
private.sniping_helper(search, query)
end,
on_abort = function()
@@ -342,13 +348,13 @@ function public.snipe(mode, filter_string)
private.status_bar:set_text('Resuming scan...')
end
end,
on_page_loaded = function(_, total_pages)
on_page_loaded = function(_, total_scan_pages)
current_page = current_page + 1
total_pages = total_pages + (start_page - 1)
total_pages = max(total_pages, 1)
current_page = min(current_page, total_pages)
private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 100 * (current_page - 1) / total_pages)
private.status_bar:set_text(format('Scanning %d / %d (Page %d / %d)', current_query, total_queries, current_page, total_pages))
total_scan_pages = total_scan_pages + (start_page - 1)
total_scan_pages = max(total_scan_pages, 1)
current_page = min(current_page, total_scan_pages)
private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 100 * (current_page - 1) / total_scan_pages)
private.status_bar:set_text(format('Scanning %d / %d (Page %d / %d)', current_query, total_queries, current_page, total_scan_pages))
end,
on_page_scanned = function()
private.results_listing:SetDatabase()
@@ -545,6 +551,7 @@ do
tinsert(searches, search_index + 1, {
filter_string = filter_string,
records = {},
-- sniping = private.snipe_button:GetChecked() TODO
})
while getn(searches) > search_index + 1 do
tremove(searches)