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

small filter improvement

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-06-30 12:17:46 +02:00
parent deb07335d8
commit c7d927943a
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core.lua
+1 -1
View File
@@ -1,5 +1,5 @@
Aux = { Aux = {
version = '2.14.2', version = '2.14.3',
blizzard_ui_shown = false, blizzard_ui_shown = false,
orig = {}, orig = {},
} }
scan_util.lua
+6
View File
@@ -492,6 +492,9 @@ function m.filter_from_string(filter_term)
elseif strfind(str, '^%d*:%d*$') then elseif strfind(str, '^%d*:%d*$') then
if not blizzard_filter.first_page and not blizzard_filter.last_page then if not blizzard_filter.first_page and not blizzard_filter.last_page then
local _, _, first_page, last_page = strfind(str, '^(%d*):(%d*)$') local _, _, first_page, last_page = strfind(str, '^(%d*):(%d*)$')
if tonumber(first_page) and tonumber(first_page) < 1 or tonumber(last_page) and tonumber(last_page) < 1 then
return false, {}, 'Erroneous page range modifier'
end
blizzard_filter.first_page = tonumber(first_page) blizzard_filter.first_page = tonumber(first_page)
blizzard_filter.last_page = tonumber(last_page) blizzard_filter.last_page = tonumber(last_page)
prettified:append(Aux.gui.inline_color({216, 225, 211, 1})..str..'|r') prettified:append(Aux.gui.inline_color({216, 225, 211, 1})..str..'|r')
@@ -499,6 +502,9 @@ function m.filter_from_string(filter_term)
return false, {}, 'Erroneous page range modifier' return false, {}, 'Erroneous page range modifier'
end end
elseif tonumber(str) then elseif tonumber(str) then
if tonumber(str) < 1 or tonumber(str) > 60 then
return false, {}, 'Erroneous level range modifier'
end
if not blizzard_filter.min_level then if not blizzard_filter.min_level then
blizzard_filter.min_level = tonumber(str) blizzard_filter.min_level = tonumber(str)
prettified:append(Aux.gui.inline_color({216, 225, 211, 1})..str..'|r') prettified:append(Aux.gui.inline_color({216, 225, 211, 1})..str..'|r')
search_frame.lua
+7 -4
View File
@@ -153,11 +153,11 @@ function private.get_form_filter()
end end
if tonumber(AuxSearchFrameFilterMinLevel:GetText()) then if tonumber(AuxSearchFrameFilterMinLevel:GetText()) then
add(tonumber(AuxSearchFrameFilterMinLevel:GetText())) add(max(1, min(60, tonumber(AuxSearchFrameFilterMinLevel:GetText()))))
end end
if tonumber(AuxSearchFrameFilterMaxLevel:GetText()) then if tonumber(AuxSearchFrameFilterMaxLevel:GetText()) then
add(tonumber(AuxSearchFrameFilterMaxLevel:GetText())) add(max(1, min(60, tonumber(AuxSearchFrameFilterMaxLevel:GetText()))))
end end
if AuxSearchFrameFilterUsableCheckButton:GetChecked() then if AuxSearchFrameFilterUsableCheckButton:GetChecked() then
@@ -184,8 +184,11 @@ function private.get_form_filter()
add(strlower(getglobal('ITEM_QUALITY'..quality..'_DESC'))) add(strlower(getglobal('ITEM_QUALITY'..quality..'_DESC')))
end end
if tonumber(private.first_page_editbox:GetText()) or tonumber(private.last_page_editbox:GetText()) then local first_page, last_page = tonumber(private.first_page_editbox:GetText()), tonumber(private.last_page_editbox:GetText())
add((tonumber(private.first_page_editbox:GetText()) or '') .. ':' .. (tonumber(private.last_page_editbox:GetText()) or '')) first_page = first_page and max(1, first_page)
last_page = last_page and max(1, last_page)
if first_page or last_page then
add((first_page or '') .. ':' .. (last_page or ''))
end end
return filter_term return filter_term