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

refactoring

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-08-23 18:25:04 +02:00
parent c005b9fea4
commit c9cf64dd8d
5 changed files with 41 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/history.lua
+8 -4
View File
@@ -57,13 +57,16 @@ function public.process_auction(auction_record)
local unit_bid_price = ceil(auction_record.bid_price / auction_record.aux_quantity)
local unit_buyout_price = ceil(auction_record.buyout_price / auction_record.aux_quantity)
local max_unit_price = max(unit_buyout_price, unit_bid_price)
local changed
if unit_buyout_price > 0 and unit_buyout_price < (item_record.daily_min_buyout or huge) then
item_record.daily_min_buyout = unit_buyout_price
elseif max_unit_price > item_record.daily_max_price or 0 then
item_record.daily_max_price = max_unit_price
else
return
changed = true
end
if max_unit_price > (item_record.daily_max_price or 0) then
item_record.daily_max_price = max_unit_price
changed = true
end
if not changed then return end
write_record(auction_record.item_key, item_record)
end
@@ -92,6 +95,7 @@ function public.value(item_key)
end
value_cache[item_key] = -object :value(value) :next_push(item_record.next_push)
end
log (value_cache[item_key].value)
return value_cache[item_key].value
end
core/slash.lua
+6 -4
View File
@@ -1,12 +1,14 @@
SLASH_AUX1 = '/aux'
function SlashCmdList.AUX(command)
module 'slash' import 'persistence'
_g.SLASH_AUX1 = '/aux'
function _g.SlashCmdList.AUX(command)
if not command then return end
local arguments = tokenize(command)
if arguments[1] == 'clear' and arguments[2] == 'history' then
persistence.load_dataset().history = nil
persistence.dataset = nil
log 'History cleared.'
elseif arguments[1] == 'clear' and arguments[2] == 'post' then
persistence.load_dataset().post = nil
persistence.dataset.post = nil
log 'Post settings cleared.'
elseif arguments[1] == 'clear' and arguments[2] == 'datasets' then
_g.aux_datasets = {}
tabs/post/core.lua
+2 -2
View File
@@ -212,15 +212,15 @@ function post_auctions()
unit_buyout_price,
stack_count,
function(posted)
local new_auction_record
for i=1,posted do
new_auction_record = record_auction(key, stack_size, unit_start_price, unit_buyout_price, duration_code, UnitName('player'))
record_auction(key, stack_size, unit_start_price, unit_buyout_price, duration_code, UnitName('player'))
end
update_inventory_records()
selected_item = nil
for _, record in inventory_records do
if record.key == key then
set_item(record)
break
end
end
refresh = true
tabs/search/filter.lua
+24 -75
View File
@@ -122,7 +122,7 @@ function get_filter_builder_query()
for class in present(blizzard_query.class) do
local classes = temp-{GetAuctionItemClasses()}
add(strlower(classes[class]))
for _, subclass in present(blizzard_query.subclass) do
for subclass in present(blizzard_query.subclass) do
local subclasses = temp-{GetAuctionItemSubClasses(class)}
add(strlower(subclasses[subclass]))
add(blizzard_query.slot and strlower(_g[blizzard_query.slot]))
@@ -172,10 +172,8 @@ end
function import_query_string()
local components, error = filter_util.parse_query_string(select(3, strfind(search_box:GetText(), '^([^;]*)')))
if components then
if components or log(error) then
set_form(components)
else
log(error)
end
end
@@ -267,13 +265,11 @@ function add_post_filter()
str = str..'/'..filter_parameter_input:GetText()
end
end
local components, error, suggestions = filter_util.parse_query_string(str)
if components and getn(components.blizzard) == 0 and getn(components.post) == 1 then
add_component(components.post[1])
update_filter_display()
filter_parameter_input:SetText('')
filter_parameter_input:SetText ''
filter_input:HighlightText()
filter_input:SetFocus()
elseif error then
@@ -284,14 +280,12 @@ end
do
local text = ''
function update_filter_display()
text = formatted_post_filter(post_filter)
filter_display:SetWidth(filter_display_size())
set_filter_display_offset()
filter_display:SetText(text)
end
function filter_display_size()
local font, font_size = filter_display:GetFont()
filter_display.measure:SetFont(font, font_size)
@@ -320,21 +314,17 @@ end
function initialize_filter_dropdown()
for _, filter in temp-list 'and' 'or' 'not' 'min-unit-bid' 'min-unit-buy' 'max-unit-bid' 'max-unit-buy' 'bid-profit' 'buy-profit' 'bid-vend-profit' 'buy-vend-profit' 'bid-dis-profit' 'buy-dis-profit' 'bid-pct' 'buy-pct' 'item' 'tooltip' 'min-lvl' 'max-lvl' 'rarity' 'left' 'utilizable' 'discard' do
UIDropDownMenu_AddButton{
text = filter,
value = filter,
func = function()
filter_input:SetText(this.value)
if index(filter_util.filters[this.value], 'input_type') == '' or this.value == 'not' then
add_post_filter()
elseif filter_util.filters[this.value] then
filter_parameter_input:Show()
filter_parameter_input:SetFocus()
else
filter_input:SetFocus()
end
end,
}
UIDropDownMenu_AddButton(-object :text(filter) :value(filter) :func(function()
filter_input:SetText(this.value)
if index(filter_util.filters[this.value], 'input_type') == '' or this.value == 'not' then
add_post_filter()
elseif filter_util.filters[this.value] then
filter_parameter_input:Show()
filter_parameter_input:SetFocus()
else
filter_input:SetFocus()
end
end))
end
end
@@ -349,19 +339,9 @@ function initialize_class_dropdown()
update_form()
end
end
UIDropDownMenu_AddButton{
text = ALL,
value = 0,
func = on_click,
}
for i, class in { GetAuctionItemClasses() } do
UIDropDownMenu_AddButton{
text = class,
value = i,
func = on_click,
}
UIDropDownMenu_AddButton(-object :text(ALL) :value(0) :func(on_click))
for i, class in temp-{GetAuctionItemClasses()} do
UIDropDownMenu_AddButton(-object :text(class) :value(i) :func(on_click))
end
end
@@ -374,22 +354,11 @@ function initialize_subclass_dropdown()
update_form()
end
end
local class_index = UIDropDownMenu_GetSelectedValue(class_dropdown)
if class_index and GetAuctionItemSubClasses(class_index) then
UIDropDownMenu_AddButton{
text = ALL,
value = 0,
func = on_click,
}
for i, subclass in {GetAuctionItemSubClasses(class_index)} do
UIDropDownMenu_AddButton{
text = subclass,
value = i,
func = on_click,
}
UIDropDownMenu_AddButton(-object :text(ALL) :value(0) :func(on_click))
for i, subclass in temp-{GetAuctionItemSubClasses(class_index)} do
UIDropDownMenu_AddButton(-object :text(subclass) :value(i) :func(on_click))
end
end
end
@@ -399,23 +368,12 @@ function initialize_slot_dropdown()
UIDropDownMenu_SetSelectedValue(slot_dropdown, this.value)
update_form()
end
local class_index = UIDropDownMenu_GetSelectedValue(class_dropdown)
local subclass_index = UIDropDownMenu_GetSelectedValue(subclass_dropdown)
if subclass_index and GetAuctionInvTypes(class_index, subclass_index) then
UIDropDownMenu_AddButton{
text = ALL,
value = '',
func = on_click,
}
UIDropDownMenu_AddButton(-object :text(ALL) :value '' :func(on_click))
for _, slot in {GetAuctionInvTypes(class_index, subclass_index)} do
UIDropDownMenu_AddButton{
text = _g[slot],
value = slot,
func = on_click,
}
UIDropDownMenu_AddButton(-object :text(_g[slot]) :value(slot) :func(on_click))
end
end
end
@@ -425,17 +383,8 @@ function initialize_quality_dropdown()
UIDropDownMenu_SetSelectedValue(quality_dropdown, this.value)
update_form()
end
UIDropDownMenu_AddButton{
text = ALL,
value = -1,
func = on_click,
}
UIDropDownMenu_AddButton(-object :text(ALL) :value(-1) :func(on_click))
for i=0,4 do
UIDropDownMenu_AddButton{
text = _g['ITEM_QUALITY'..i..'_DESC'],
value = i,
func = on_click,
}
UIDropDownMenu_AddButton(-object :text(_g['ITEM_QUALITY'..i..'_DESC']) :value(i) :func(on_click))
end
end
util/completion.lua
+1 -1
View File
@@ -7,7 +7,7 @@ function public:complete_filter()
local filter_string = this:GetText()
local completed_filter_string = ({strfind(filter_string, '([^;]*)/[^/;]*$')})[3]
local completed_filter_string = select(3, strfind(filter_string, '([^;]*)/[^/;]*$'))
local _, suggestions = filter_util.query(completed_filter_string or '')
local start_index, _, current_modifier = strfind(filter_string, '([^/;]*)$')