working on sniping mode, some notification bugfixes

This commit is contained in:
Manuel Simon Hirsig
2016-02-27 15:32:34 +01:00
parent 3c87544061
commit cea1000f8a
2 changed files with 9 additions and 15 deletions
+1 -1
View File
@@ -138,7 +138,7 @@ function private.scan()
private.wait_for_callback{private.current_thread().params.on_start_query or Aux.util.pass, private.current_thread().query_index, function() private.wait_for_callback{private.current_thread().params.on_start_query or Aux.util.pass, private.current_thread().query_index, function()
private.current_thread().page = private.current_query().start_page private.current_thread().page = private.current_query().start_page
return private.process_query() return private.process_query()
end } 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
+8 -14
View File
@@ -815,13 +815,13 @@ function public.start_search(filter_string)
local scanned_records = {} local scanned_records = {}
private.results_listing:SetDatabase(scanned_records) private.results_listing:SetDatabase(scanned_records)
local current_page, current_total_pages, current_query local current_query
Aux.scan.start{ Aux.scan.start{
type = 'list', type = 'list',
queries = queries, queries = queries,
on_page_loaded = function(page, total_pages) on_page_loaded = function(page, total_pages)
current_page = page + 1 local current_page = page + 1
current_total_pages = total_pages local current_total_pages = total_pages
private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 100 * (current_page - 1) / current_total_pages) -- TODO private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 100 * (current_page - 1) / current_total_pages) -- TODO
private.status_bar:set_text(format('Scanning %d / %d (Page %d / %d)', current_query, getn(queries), current_page, current_total_pages)) private.status_bar:set_text(format('Scanning %d / %d (Page %d / %d)', current_query, getn(queries), current_page, current_total_pages))
end, end,
@@ -830,15 +830,10 @@ function public.start_search(filter_string)
end, end,
on_start_query = function(query_index) on_start_query = function(query_index)
current_query = query_index current_query = query_index
if current_page then private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 0) -- TODO
private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 100 * (current_page - 1) / current_total_pages) -- TODO private.status_bar:set_text(format('Scanning %d / %d', current_query, getn(queries)))
private.status_bar:set_text(format('Scanning %d / %d (Page %d / %d)', current_query, getn(queries), current_page, current_total_pages))
else
private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 0) -- TODO
private.status_bar:set_text(format('Scanning %d / %d', current_query, getn(queries)))
end
end, end,
on_read_auction = function(auction_info) on_read_auction = function(auction_info, ctrl)
if getn(scanned_records) == 0 then if getn(scanned_records) == 0 then
SetCVar('MasterSoundEffects', 0) SetCVar('MasterSoundEffects', 0)
SetCVar('MasterSoundEffects', 1) SetCVar('MasterSoundEffects', 1)
@@ -846,9 +841,8 @@ function public.start_search(filter_string)
PlaySoundFile([[Interface\AddOns\Aux-AddOn\scourge_horn.ogg]], 'Master') PlaySoundFile([[Interface\AddOns\Aux-AddOn\scourge_horn.ogg]], 'Master')
tinsert(scanned_records, auction_info) tinsert(scanned_records, auction_info)
private.results_listing:SetDatabase() private.results_listing:SetDatabase()
Aux.control.on_next_update(function() ctrl.suspend()
Aux.scan.abort('list') Aux.scan.abort('list')
end)
end end
-- if getn(scanned_records) < 1000 then -- TODO static popup, remove discard -- if getn(scanned_records) < 1000 then -- TODO static popup, remove discard
-- tinsert(scanned_records, auction_info) -- tinsert(scanned_records, auction_info)