auto buy refactoring

tabs/search/core.lua

@@ -12,16 +12,16 @@ StaticPopupDialogs.AUX_SEARCH_TABLE_FULL = {
     timeout = 0,
     hideOnEscape = 1,
 }
-StaticPopupDialogs.AUX_SEARCH_AUTO_BUY = {
-    text = 'Are you sure you want to activate automatic buyout?',
-    button1 = 'Yes',
-    button2 = 'No',
-    OnAccept = function()
-        auto_buy_button:SetChecked(true)
-    end,
-    timeout = 0,
-    hideOnEscape = 1,
-}
+--StaticPopupDialogs.AUX_SEARCH_AUTO_BUY = {
+--    text = 'Are you sure you want to activate automatic buyout?',
+--    button1 = 'Yes',
+--    button2 = 'No',
+--    OnAccept = function()
+--        auto_buy_button:SetChecked(true)
+--    end,
+--    timeout = 0,
+--    hideOnEscape = 1,
+--}
 
 private.RESULTS = 1
 private.SAVED = 2
@@ -38,7 +38,6 @@ function OPEN()
 end
 
 function CLOSE()
-	close_settings()
     current_search.table:SetSelectedRecord()
     frame:Hide()
 end

tabs/search/frame.lua

@@ -24,104 +24,23 @@ frame.saved = CreateFrame('Frame', nil, frame)
 frame.saved:SetAllPoints(AuxFrame.content)
 
 frame.saved.favorite = gui.panel(frame.saved)
-frame.saved.favorite:SetWidth(378.5)
-frame.saved.favorite:SetPoint('TOPLEFT', 0, 0)
-frame.saved.favorite:SetPoint('BOTTOMLEFT', 0, 0)
+frame.saved.favorite:SetWidth(252)
+frame.saved.favorite:SetPoint('TOP', 0, 0)
+frame.saved.favorite:SetPoint('BOTTOM', 0, 0)
+
+frame.saved.autobuy = gui.panel(frame.saved)
+frame.saved.autobuy:SetPoint('TOPRIGHT', frame.saved.favorite, 'TOPLEFT', -2.5, 0)
+frame.saved.autobuy:SetPoint('BOTTOMLEFT', 0, 0)
 
 frame.saved.recent = gui.panel(frame.saved)
-frame.saved.recent:SetWidth(378.5)
-frame.saved.recent:SetPoint('TOPRIGHT', 0, 0)
+frame.saved.recent:SetPoint('TOPLEFT', frame.saved.favorite, 'TOPRIGHT', 2.5, 0)
 frame.saved.recent:SetPoint('BOTTOMRIGHT', 0, 0)
 do
-    local btn = gui.button(frame)
-    btn:SetPoint('TOPLEFT', 0, 0)
-    btn:SetWidth(42)
-    btn:SetHeight(42)
-    btn:SetScript('OnClick', function()
-        if this.open then
-            settings:Hide()
-            controls:Show()
-        else
-            settings:Show()
-            controls:Hide()
-        end
-        this.open = not this.open
-    end)
-
-    for _, offset in temp-A(14, 10, 6) do
-        local fake_icon_part = btn:CreateFontString()
-        fake_icon_part:SetFont([[Fonts\FRIZQT__.TTF]], 23)
-        fake_icon_part:SetPoint('CENTER', 0, offset)
-        fake_icon_part:SetText('_')
-    end
-
-    private.settings_button = btn
-end
-do
-    local panel = CreateFrame('Frame', nil, frame)
-    panel:SetBackdrop{bgFile=[[Interface\Buttons\WHITE8X8]]}
-    panel:SetBackdropColor(color.content.background())
-    panel:SetPoint('LEFT', settings_button, 'RIGHT', 0, 0)
-    panel:SetPoint('RIGHT', 0, 0)
-    panel:SetHeight(42)
-    panel:Hide()
-    private.settings = panel
-end
-do
-    local panel = CreateFrame('Frame', nil, frame)
-    panel:SetPoint('LEFT', settings_button, 'RIGHT', 0, 0)
-    panel:SetPoint('RIGHT', 0, 1)
-    panel:SetHeight(40)
-    private.controls = panel
-end
-do
-	local function change()
-		local page = tonumber(this:GetText())
-		local valid_input = page and tostring(max(1, page)) or ''
-		if this:GetText() ~= valid_input then
-			this:SetText(valid_input)
-		end
-		if blizzard_page_index(this:GetText()) and not real_time_button:GetChecked() then
-			this:SetBackdropColor(color.state.enabled())
-		else
-			this:SetBackdropColor(color.state.disabled())
-		end
-	end
-	do
-	    local editbox = gui.editbox(settings)
-	    editbox:SetPoint('LEFT', 75, 0)
-	    editbox:SetWidth(50)
-	    editbox:SetNumeric(true)
-	    editbox:SetScript('OnTabPressed', function() last_page_input:SetFocus() end)
-	    editbox.enter = execute
-	    editbox.change = change
-	    local label = gui.label(editbox, 16)
-	    label:SetPoint('RIGHT', editbox, 'LEFT', -6, 0)
-	    label:SetText'Pages'
-	    label:SetTextColor(color.text.enabled())
-	    private.first_page_input = editbox
-    end
-	do
-	    local editbox = gui.editbox(settings)
-	    editbox:SetPoint('LEFT', first_page_input, 'RIGHT', 10, 0)
-	    editbox:SetWidth(50)
-	    editbox:SetNumeric(true)
-	    editbox:SetScript('OnTabPressed', function() first_page_input:SetFocus() end)
-	    editbox.enter = execute
-	    editbox.change = change
-	    local label = gui.label(editbox, gui.font_size.medium)
-	    label:SetPoint('RIGHT', editbox, 'LEFT', -3.5, 0)
-	    label:SetText'-'
-	    label:SetTextColor(color.text.enabled())
-	    private.last_page_input = editbox
-	end
-end
-do
-    local btn = gui.checkbutton(settings)
-    btn:SetPoint('LEFT', 230, 0)
-    btn:SetWidth(140)
+    local btn = gui.checkbutton(frame)
+    btn:SetPoint('TOPLEFT', 5, -10)
+    btn:SetWidth(100)
     btn:SetHeight(25)
-    btn:SetText'Real Time Mode'
+    btn:SetText'Real Time'
     btn:SetScript('OnClick', function()
         this:SetChecked(not this:GetChecked())
         this = first_page_input
@@ -132,51 +51,46 @@ do
     private.real_time_button = btn
 end
 do
-    local btn = gui.checkbutton(settings)
-    btn:SetPoint('LEFT', real_time_button, 'RIGHT', 15, 0)
-    btn:SetWidth(140)
-    btn:SetHeight(25)
-    btn:SetText'Auto Buyout Mode'
-    btn:SetScript('OnClick', function()
-        if this:GetChecked() then
-            this:SetChecked(false)
-        else
-            StaticPopup_Show'AUX_SEARCH_AUTO_BUY'
-        end
-    end)
-    private.auto_buy_button = btn
+	local function change()
+		local page = tonumber(this:GetText())
+		local valid_input = page and tostring(max(1, page)) or ''
+		if this:GetText() ~= valid_input then
+			this:SetText(valid_input)
+		end
+	end
+	do
+		local editbox = gui.editbox(frame)
+		editbox:SetPoint('LEFT', real_time_button, 'RIGHT', 5, 0)
+		editbox:SetWidth(50)
+		editbox:SetHeight(25)
+		editbox:SetNumeric(true)
+		editbox:SetScript('OnTabPressed', function() last_page_input:SetFocus() end)
+		editbox.enter = execute
+		editbox.change = change
+		local label = gui.label(editbox, 16)
+		label:SetPoint('RIGHT', editbox, 'LEFT', -6, 0)
+		label:SetTextColor(color.text.enabled())
+		private.first_page_input = editbox
+	end
+	do
+		local editbox = gui.editbox(frame)
+		editbox:SetPoint('LEFT', first_page_input, 'RIGHT', 10, 0)
+		editbox:SetWidth(50)
+		editbox:SetHeight(25)
+		editbox:SetNumeric(true)
+		editbox:SetScript('OnTabPressed', function() first_page_input:SetFocus() end)
+		editbox.enter = execute
+		editbox.change = change
+		local label = gui.label(editbox, gui.font_size.medium)
+		label:SetPoint('RIGHT', editbox, 'LEFT', -3.5, 0)
+		label:SetText'-'
+		label:SetTextColor(color.text.enabled())
+		private.last_page_input = editbox
+	end
 end
 do
-    local btn = gui.checkbutton(settings)
-    btn:SetPoint('LEFT', auto_buy_button, 'RIGHT', 15, 0)
-    btn:SetWidth(140)
-    btn:SetHeight(25)
-    btn:SetText'Auto Buyout Filter'
-    btn:SetScript('OnClick', function()
-        if this:GetChecked() then
-            this:SetChecked(false)
-            aux_auto_buy_filter = nil
-            this.prettified = nil
-            auto_buy_validator = nil
-        else
-            StaticPopup_Show'AUX_SEARCH_AUTO_BUY_FILTER'
-        end
-    end)
-    btn:SetScript('OnEnter', function()
-        if this.prettified then
-            GameTooltip_SetDefaultAnchor(GameTooltip, UIParent)
-            GameTooltip:AddLine(gsub(this.prettified, ';', '\n\n'), 255/255, 254/255, 250/255, true)
-            GameTooltip:Show()
-        end
-    end)
-    btn:SetScript('OnLeave', function()
-        GameTooltip:Hide()
-    end)
-    private.auto_buy_filter_button = btn
-end
-do
-    local btn = gui.button(controls, 25)
-    btn:SetPoint('LEFT', 5, 0)
+    local btn = gui.button(frame, 25)
+    btn:SetPoint('LEFT', last_page_input, 'RIGHT', 5, 0)
     btn:SetWidth(30)
     btn:SetHeight(25)
     btn:SetText'<'
@@ -184,7 +98,7 @@ do
     private.previous_button = btn
 end
 do
-    local btn = gui.button(controls, 25)
+    local btn = gui.button(frame, 25)
     btn:SetPoint('LEFT', previous_button, 'RIGHT', 4, 0)
     btn:SetWidth(30)
     btn:SetHeight(25)
@@ -193,8 +107,8 @@ do
     private.next_button = btn
 end
 do
-    local btn = gui.button(controls, gui.font_size.huge)
-    btn:SetPoint('RIGHT', -5, 0)
+    local btn = gui.button(frame, gui.font_size.huge)
+    btn:SetPoint('TOPRIGHT', -5, -10)
     btn:SetWidth(70)
     btn:SetHeight(25)
     btn:SetText'Start'
@@ -208,8 +122,8 @@ do
     private.start_button = btn
 end
 do
-    local btn = gui.button(controls, gui.font_size.huge)
-    btn:SetPoint('RIGHT', -5, 0)
+    local btn = gui.button(frame, gui.font_size.huge)
+    btn:SetPoint('TOPRIGHT', -5, -10)
     btn:SetWidth(70)
     btn:SetHeight(25)
     btn:SetText'Stop'
@@ -219,7 +133,7 @@ do
     private.stop_button = btn
 end
 do
-    local btn = gui.button(controls, gui.font_size.huge)
+    local btn = gui.button(frame, gui.font_size.huge)
     btn:SetPoint('RIGHT', start_button, 'LEFT', -4, 0)
     btn:SetWidth(70)
     btn:SetHeight(25)
@@ -230,7 +144,7 @@ do
     private.resume_button = btn
 end
 do
-    local editbox = gui.editbox(controls)
+    local editbox = gui.editbox(frame)
     editbox:EnableMouse(1)
     editbox.formatter = function(str)
 	    local queries = filter_util.queries(str)
@@ -615,53 +529,16 @@ for _ = 1, 5  do
     tinsert(tables, table)
 end
 
-local handlers = {
-    OnClick = function(st, data, _, button)
-        if not data then return end
-        if button == 'LeftButton' and IsShiftKeyDown() then
-            search_box:SetText(data.search.filter_string)
-        elseif button == 'RightButton' and IsShiftKeyDown() then
-            add_filter(data.search.filter_string)
-        elseif button == 'LeftButton' and IsControlKeyDown() then
-            if st == favorite_searches_listing and data.index > 1 then
-                local temp = aux_favorite_searches[data.index - 1]
-                aux_favorite_searches[data.index - 1] = data.search
-                aux_favorite_searches[data.index] = temp
-                update_search_listings()
-            end
-        elseif button == 'RightButton' and IsControlKeyDown() then
-            if st == favorite_searches_listing and data.index < getn(aux_favorite_searches) then
-                local temp = aux_favorite_searches[data.index + 1]
-                aux_favorite_searches[data.index + 1] = data.search
-                aux_favorite_searches[data.index] = temp
-                update_search_listings()
-            end
-        elseif button == 'LeftButton' then
-            search_box:SetText(data.search.filter_string)
-            execute()
-        elseif button == 'RightButton' then
-            if st == recent_searches_listing then
-                tinsert(aux_favorite_searches, 1, data.search)
-            elseif st == favorite_searches_listing then
-                tremove(aux_favorite_searches, data.index)
-            end
-            update_search_listings()
-        end
-    end,
-    OnEnter = function(st, data, self)
-        if not data then return end
-        GameTooltip_SetDefaultAnchor(GameTooltip, UIParent)
-        GameTooltip:AddLine(gsub(data.search.prettified, ';', '\n\n'), 255/255, 254/255, 250/255, true)
-        GameTooltip:Show()
-    end,
-    OnLeave = function()
-        GameTooltip:ClearLines()
-        GameTooltip:Hide()
-    end
-}
+private.autobuy_listing = listing.CreateScrollingTable(frame.saved.autobuy)
+autobuy_listing:SetColInfo{{name='Autobuy Filters', width=1}}
+autobuy_listing:EnableSorting(false)
+autobuy_listing:DisableSelection(true)
+autobuy_listing:SetHandler('OnClick', handlers.OnClick)
+autobuy_listing:SetHandler('OnEnter', handlers.OnEnter)
+autobuy_listing:SetHandler('OnLeave', handlers.OnLeave)
 
 private.recent_searches_listing = listing.CreateScrollingTable(frame.saved.recent)
-recent_searches_listing:SetColInfo{{ name='Recent Searches', width=1 }}
+recent_searches_listing:SetColInfo{{name='Recent Searches', width=1}}
 recent_searches_listing:EnableSorting(false)
 recent_searches_listing:DisableSelection(true)
 recent_searches_listing:SetHandler('OnClick', handlers.OnClick)
@@ -669,7 +546,7 @@ recent_searches_listing:SetHandler('OnEnter', handlers.OnEnter)
 recent_searches_listing:SetHandler('OnLeave', handlers.OnLeave)
 
 private.favorite_searches_listing = listing.CreateScrollingTable(frame.saved.favorite)
-favorite_searches_listing:SetColInfo{{ name='Favorite Searches', width=1 }}
+favorite_searches_listing:SetColInfo{{name='Favorite Searches', width=1}}
 favorite_searches_listing:EnableSorting(false)
 favorite_searches_listing:DisableSelection(true)
 favorite_searches_listing:SetHandler('OnClick', handlers.OnClick)

tabs/search/results.lua

@@ -8,39 +8,6 @@ local scan = require 'aux.core.scan'
 function LOAD()
 	new_search''
 	current_search.dummy = true
-	update_auto_buy_filter()
-end
-
-aux_auto_buy_filter = ''
-
-do
-	local function action()
-		aux_auto_buy_filter = _G[this:GetParent():GetName() .. 'EditBox']:GetText()
-		update_auto_buy_filter()
-	end
-
-	StaticPopupDialogs.AUX_SEARCH_AUTO_BUY_FILTER = {
-		text = 'Enter a filter for automatic buyout.',
-		button1 = 'Accept',
-		button2 = 'Cancel',
-		hasEditBox = 1,
-		OnShow = function()
-			local edit_box = _G[this:GetName() .. 'EditBox']
-			edit_box:SetMaxLetters(nil)
-			edit_box:SetFocus()
-			edit_box:HighlightText()
-		end,
-		OnAccept = action,
-		EditBoxOnEnterPressed = function()
-			action()
-			this:GetParent():Hide()
-		end,
-		EditBoxOnEscapePressed = function()
-			this:GetParent():Hide()
-		end,
-		timeout = 0,
-		hideOnEscape = 1,
-	}
 end
 
 do
@@ -127,12 +94,6 @@ do
 	end
 end
 
-function private.close_settings()
-	if settings_button.open then
-		settings_button:Click()
-	end
-end
-
 function private.update_continuation()
 	if current_search.continuation then
 		resume_button:Show()
@@ -149,7 +110,7 @@ function private.discard_continuation()
 	update_continuation()
 end
 
-function update_start_stop()
+function private.update_start_stop()
 	if current_search.active then
 		stop_button:Show()
 		start_button:Hide()
@@ -169,8 +130,6 @@ function private.update_auto_buy_filter()
 				print 'Error: The automatic buyout filter does not support Blizzard filters'
 			else
 				auto_buy_validator = queries[1].validator
-				auto_buy_filter_button.prettified = queries[1].prettified
-				auto_buy_filter_button:SetChecked(true)
 				return
 			end
 		else
@@ -206,15 +165,9 @@ function private.start_real_time_scan(query, search, continuation)
 				ignore_page = false
 			end
 		end,
-		on_auction = function(auction_record, ctrl)
+		on_auction = function(auction_record)
 			if not ignore_page then
-				if search.auto_buy then
-					ctrl.suspend()
-					place_bid('list', auction_record.index, auction_record.buyout_price, papply(ctrl.resume, true))
-					thread(when, later(GetTime(), 10), ctrl.resume, false)
-				else
-					tinsert(new_records, auction_record)
-				end
+				tinsert(new_records, auction_record)
 			end
 		end,
 		on_complete = function()
@@ -301,11 +254,7 @@ function private.start_search(queries, continuation)
 			current_page = current_page and 0 or start_page - 1
 		end,
 		on_auction = function(auction_record, ctrl)
-			if search.auto_buy then
-				ctrl.suspend()
-				place_bid('list', auction_record.index, auction_record.buyout_price, papply(ctrl.resume, true))
-				thread(when, later(GetTime(), 10), ctrl.resume, false)
-			elseif getn(search.records) < 2000 then
+			if getn(search.records) < 2000 then
 				tinsert(search.records, auction_record)
 				if getn(search.records) == 2000 then
 					StaticPopup_Show'AUX_SEARCH_TABLE_FULL'
@@ -390,7 +339,6 @@ function public.execute(resume, real_time)
 			end
 		end
 		current_search.real_time = real_time_button:GetChecked()
-		current_search.auto_buy = auto_buy_button:GetChecked()
 		current_search.auto_buy_validator = auto_buy_validator
 	end
 

tabs/search/saved.lua

@@ -1,9 +1,21 @@
 module 'aux.tabs.search'
 
+aux_autobuy_filters = t
 aux_favorite_searches = t
 aux_recent_searches = t
 
 function private.update_search_listings()
+	local autobuy_filter_rows = t
+	for i, autobuy_filter in aux_autobuy_filters do
+		local name = strsub(autobuy_filter.prettified, 1, 250)
+		tinsert(autobuy_filter_rows, {
+			cols = {{ value=name }},
+			search = autobuy_filter,
+			index = i,
+		})
+	end
+	autobuy_listing:SetData(autobuy_filter_rows)
+
 	local favorite_search_rows = t
 	for i, favorite_search in aux_favorite_searches do
 		local name = strsub(favorite_search.prettified, 1, 250)
@@ -36,4 +48,56 @@ function private.new_recent_search(filter_string, prettified)
 		tremove(aux_recent_searches)
 	end
 	update_search_listings()
-end
+end
+
+private.handlers = {
+	OnClick = function(st, data, _, button)
+		if not data then return end
+		if button == 'LeftButton' and IsShiftKeyDown() then
+			search_box:SetText(data.search.filter_string)
+		elseif button == 'RightButton' and IsShiftKeyDown() then
+			add_filter(data.search.filter_string)
+		elseif button == 'LeftButton' and IsControlKeyDown() then
+			if st == favorite_searches_listing and data.index > 1 then
+				local temp = aux_favorite_searches[data.index - 1]
+				aux_favorite_searches[data.index - 1] = data.search
+				aux_favorite_searches[data.index] = temp
+				update_search_listings()
+			end
+		elseif button == 'RightButton' and IsControlKeyDown() then
+			if st == favorite_searches_listing and data.index < getn(aux_favorite_searches) then
+				local temp = aux_favorite_searches[data.index + 1]
+				aux_favorite_searches[data.index + 1] = data.search
+				aux_favorite_searches[data.index] = temp
+				update_search_listings()
+			end
+		elseif button == 'RightButton' and IsAltKeyDown() then
+			if st ~= autobuy_listing then
+				tinsert(aux_autobuy_filters, 1, data.search)
+				update_search_listings()
+			end
+		elseif button == 'LeftButton' then
+			search_box:SetText(data.search.filter_string)
+			execute()
+		elseif button == 'RightButton' then
+			if st == autobuy_listing then
+				tremove(aux_autobuy_filters, data.index)
+			elseif st == recent_searches_listing then
+				tinsert(aux_favorite_searches, 1, data.search)
+			elseif st == favorite_searches_listing then
+				tremove(aux_favorite_searches, data.index)
+			end
+			update_search_listings()
+		end
+	end,
+	OnEnter = function(st, data, self)
+		if not data then return end
+		GameTooltip_SetDefaultAnchor(GameTooltip, UIParent)
+		GameTooltip:AddLine(gsub(data.search.prettified, ';', '\n\n'), 255/255, 254/255, 250/255, true)
+		GameTooltip:Show()
+	end,
+	OnLeave = function()
+		GameTooltip:ClearLines()
+		GameTooltip:Hide()
+	end
+}