From 3d14d895fa8edddb9e69f88b6f08c73941cc3b8c Mon Sep 17 00:00:00 2001
From: Manuel Simon Hirsig <simon.hirsig@gmail.com>
Date: Sun, 4 Sep 2016 04:18:21 +0200
Subject: [PATCH] bugfix and refactoring

---
 aux-addon.lua           |  9 +++++----
 control.lua             |  2 +-
 core/cache.lua          |  2 +-
 core/disenchant.lua     |  2 +-
 core/history.lua        |  2 +-
 core/post.lua           |  2 +-
 core/scan.lua           |  2 +-
 core/slash.lua          |  2 +-
 core/stack.lua          |  2 +-
 core/tooltip.lua        |  2 +-
 frame.lua               |  2 +-
 gui/auction_listing.lua |  2 +-
 gui/core.lua            |  2 +-
 gui/item_listing.lua    |  2 +-
 gui/listing.lua         |  2 +-
 tabs/auctions/core.lua  |  2 +-
 tabs/auctions/frame.lua |  2 +-
 tabs/bids/core.lua      |  2 +-
 tabs/bids/frame.lua     |  2 +-
 tabs/post/core.lua      | 27 ++++++++++++---------------
 tabs/post/frame.lua     |  8 ++------
 tabs/search/core.lua    |  2 +-
 tabs/search/filter.lua  |  2 +-
 tabs/search/frame.lua   |  2 +-
 tabs/search/results.lua |  2 +-
 tabs/search/saved.lua   |  2 +-
 util/color.lua          |  2 +-
 util/completion.lua     |  2 +-
 util/core.lua           |  2 +-
 util/filter.lua         |  2 +-
 util/info.lua           |  2 +-
 util/money.lua          |  2 +-
 util/persistence.lua    |  2 +-
 util/scan.lua           |  2 +-
 util/sort.lua           |  2 +-
 35 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/aux-addon.lua b/aux-addon.lua
index 3d41dca..78d914e 100644
--- a/aux-addon.lua
+++ b/aux-addon.lua
@@ -1,17 +1,18 @@
 --aux_account_settings = {} -- TODO clean up the mess of savedvariables
 --aux_character_settings = {}
 
-do
-	local modules = {}
+do  local modules = {}
+	local mt = {__metatable=false, __index=function(_, key) return modules[key].I end, __newindex=error}
 	aux = function(name)
 		if not modules[name] then
 			(function()
 				modules[name] = module and M
 				import (green_t)
-				private.aux = setmetatable({}, {__metatable=false, __index=function(_, key) return modules[key].I end, __newindex=error})
+				private.aux = setmetatable(t, mt)
 			end)()
 		end
 		modules[name].import (modules.core.I)
+		modules[name].private()
 		setfenv(2, modules[name])
 	end
 end
@@ -60,7 +61,7 @@ end
 --	end
 --end
 
-aux 'core' private()
+aux 'core'
 
 public.version = '5.0.0'
 
diff --git a/control.lua b/control.lua
index 4e62548..44119e9 100644
--- a/control.lua
+++ b/control.lua
@@ -1,4 +1,4 @@
-aux 'core' private()
+aux 'core'
 
 event_frame = CreateFrame('Frame')
 
diff --git a/core/cache.lua b/core/cache.lua
index dbf83bd..f30f1a5 100644
--- a/core/cache.lua
+++ b/core/cache.lua
@@ -1,4 +1,4 @@
-aux 'cache' private() local info, persistence = aux.info, aux.persistence
+aux 'cache' local info, persistence = aux.info, aux.persistence
 
 MIN_ITEM_ID = 1
 MAX_ITEM_ID = 30000
diff --git a/core/disenchant.lua b/core/disenchant.lua
index 8bfd13b..902903d 100644
--- a/core/disenchant.lua
+++ b/core/disenchant.lua
@@ -1,4 +1,4 @@
-aux 'disenchant' private()
+aux 'disenchant'
 
 UNCOMMON, RARE, EPIC = 2, 3, 4
 
diff --git a/core/history.lua b/core/history.lua
index e62ea63..5b3f09c 100644
--- a/core/history.lua
+++ b/core/history.lua
@@ -1,4 +1,4 @@
-aux 'history' private() local persistence = aux.persistence
+aux 'history' local persistence = aux.persistence
 
 local history_schema = {'record', '#', {next_push='number'}, {daily_min_buyout='number'}, {daily_max_price='number'}, {data_points={'list', ';', {'record', '@', {market_value='number'}, {time='number'}}}} }
 
diff --git a/core/post.lua b/core/post.lua
index d2a1315..5d24c89 100644
--- a/core/post.lua
+++ b/core/post.lua
@@ -1,4 +1,4 @@
-aux 'post' private()
+aux 'post'
 
 local state = nil
 
diff --git a/core/scan.lua b/core/scan.lua
index 44f931b..ad2465d 100644
--- a/core/scan.lua
+++ b/core/scan.lua
@@ -1,4 +1,4 @@
-aux 'scan' private() local info, history = aux.info, aux.history
+aux 'scan' local info, history = aux.info, aux.history
 
 PAGE_SIZE = 50
 
diff --git a/core/slash.lua b/core/slash.lua
index 1565bca..472b833 100644
--- a/core/slash.lua
+++ b/core/slash.lua
@@ -1,4 +1,4 @@
-aux 'slash' private() local persistence = aux.persistence
+aux 'slash' local persistence = aux.persistence
 
 _G.SLASH_AUX1 = '/aux'
 function _G.SlashCmdList.AUX(command)
diff --git a/core/stack.lua b/core/stack.lua
index 3a8c819..6220ea1 100644
--- a/core/stack.lua
+++ b/core/stack.lua
@@ -1,4 +1,4 @@
-aux 'stack' private() local info = aux.info
+aux 'stack' local info = aux.info
 
 local state
 
diff --git a/core/tooltip.lua b/core/tooltip.lua
index 6c9c086..91e9b4f 100644
--- a/core/tooltip.lua
+++ b/core/tooltip.lua
@@ -1,4 +1,4 @@
-aux 'tooltip' private() local info, disenchant, cache, money, history = aux.info, aux.disenchant, aux.cache, aux.money, aux.history
+aux 'tooltip' local info, disenchant, cache, money, history = aux.info, aux.disenchant, aux.cache, aux.money, aux.history
 
 _G.aux_tooltip_value = true
 
diff --git a/frame.lua b/frame.lua
index 668f759..1a87b9b 100644
--- a/frame.lua
+++ b/frame.lua
@@ -1,4 +1,4 @@
-aux 'core' private() local gui = aux.gui
+aux 'core' local gui = aux.gui
 
 function LOAD()
 	for _, info in tab_info do tabs:create_tab(info.name) end
diff --git a/gui/auction_listing.lua b/gui/auction_listing.lua
index c032e77..504bf88 100644
--- a/gui/auction_listing.lua
+++ b/gui/auction_listing.lua
@@ -1,4 +1,4 @@
-aux 'auction_listing' private() local gui, sorting, money, info = aux.gui, aux.sorting, aux.money, aux.info
+aux 'auction_listing' local gui, sorting, money, info = aux.gui, aux.sorting, aux.money, aux.info
 
 _G.aux_price_per_unit = false
 
diff --git a/gui/core.lua b/gui/core.lua
index cdfb661..af252f7 100644
--- a/gui/core.lua
+++ b/gui/core.lua
@@ -1,4 +1,4 @@
-aux 'gui' private()
+aux 'gui'
 
 function LOAD()
 	do
diff --git a/gui/item_listing.lua b/gui/item_listing.lua
index 3e8c79c..2341fb3 100644
--- a/gui/item_listing.lua
+++ b/gui/item_listing.lua
@@ -1,4 +1,4 @@
-aux 'item_listing' private() local gui, info = aux.gui, aux.info
+aux 'item_listing' local gui, info = aux.gui, aux.info
 
 local ROW_HEIGHT = 39
 
diff --git a/gui/listing.lua b/gui/listing.lua
index a17815a..9b6b72b 100644
--- a/gui/listing.lua
+++ b/gui/listing.lua
@@ -1,4 +1,4 @@
-aux 'listing' private() local gui = aux.gui
+aux 'listing' local gui = aux.gui
 
 local ST_COUNT = 0
 
diff --git a/tabs/auctions/core.lua b/tabs/auctions/core.lua
index 2bf47b9..04d2fe7 100644
--- a/tabs/auctions/core.lua
+++ b/tabs/auctions/core.lua
@@ -1,4 +1,4 @@
-aux 'auctions_tab' private() local scan = aux.scan
+aux 'auctions_tab' local scan = aux.scan
 
 auction_records = t
 
diff --git a/tabs/auctions/frame.lua b/tabs/auctions/frame.lua
index ee7b47f..ca6a6d1 100644
--- a/tabs/auctions/frame.lua
+++ b/tabs/auctions/frame.lua
@@ -1,4 +1,4 @@
-aux 'auctions_tab' private() local gui, auction_listing = aux.gui, aux.auction_listing
+aux 'auctions_tab' local gui, auction_listing = aux.gui, aux.auction_listing
 
 function create_frames()
 	frame = CreateFrame('Frame', nil, aux_frame)
diff --git a/tabs/bids/core.lua b/tabs/bids/core.lua
index 652e280..521c9e1 100644
--- a/tabs/bids/core.lua
+++ b/tabs/bids/core.lua
@@ -1,4 +1,4 @@
-aux 'bids_tab' private() local scan = aux.scan
+aux 'bids_tab' local scan = aux.scan
 
 auction_records = t
 
diff --git a/tabs/bids/frame.lua b/tabs/bids/frame.lua
index 7f61609..79c26a0 100644
--- a/tabs/bids/frame.lua
+++ b/tabs/bids/frame.lua
@@ -1,4 +1,4 @@
-aux 'bids_tab' private() local gui, auction_listing = aux.gui, aux.auction_listing
+aux 'bids_tab' local gui, auction_listing = aux.gui, aux.auction_listing
 
 function create_frames()
 	frame = CreateFrame('Frame', nil, aux_frame)
diff --git a/tabs/post/core.lua b/tabs/post/core.lua
index eeb19a8..574fd87 100644
--- a/tabs/post/core.lua
+++ b/tabs/post/core.lua
@@ -1,4 +1,4 @@
-aux 'post_tab' private() local scan, scan_util, history, info, persistence, item_listing, al, sorting = aux.scan, aux.scan_util, aux.history, aux.info, aux.persistence, aux.item_listing, aux.auction_listing, aux.sorting
+aux 'post_tab' local scan, scan_util, history, info, persistence, item_listing, al, sorting = aux.scan, aux.scan_util, aux.history, aux.info, aux.persistence, aux.item_listing, aux.auction_listing, aux.sorting
 
 
 local DURATION_4, DURATION_8, DURATION_24 = 120, 480, 1440
@@ -32,21 +32,18 @@ end
 
 local scan_id, inventory_records, existing_auctions = 0, t, t
 
-do
-	local item
-	selected_item
-	{
-		get = function() return item end,
-		set = function(v) item = v end,
-	}
+function refresh_button_click()
+	aux.scan.abort(scan_id)
+	refresh_entries()
+	refresh = true
 end
-do
-	local c = 0
-	refresh
-	{
-		get = function() return c end,
-		set = function(v) c = v end,
-	}
+
+do local item
+	selected_item {get=function() return item end, set=function(v) item = v end}
+end
+
+do local c = 0
+	refresh {get=function() return c end, set=function(v) c = v end}
 end
 
 function LOAD()
diff --git a/tabs/post/frame.lua b/tabs/post/frame.lua
index 5e07e98..daa57c9 100644
--- a/tabs/post/frame.lua
+++ b/tabs/post/frame.lua
@@ -1,4 +1,4 @@
-aux 'post_tab' private() local gui, listing, item_listing, money, search_tab = aux.gui, aux.listing, aux.item_listing, aux.money, aux.search_tab
+aux 'post_tab' local gui, listing, item_listing, money, search_tab = aux.gui, aux.listing, aux.item_listing, aux.money, aux.search_tab
 
 function create_frames()
 	frame = CreateFrame('Frame', nil, aux_frame)
@@ -103,11 +103,7 @@ function create_frames()
 	    btn:SetWidth(80)
 	    btn:SetHeight(24)
 	    btn:SetText('Refresh')
-	    btn:SetScript('OnClick', function()
-	        aux.scan.abort(scan_id)
-	        refresh_entries()
-	        refresh = true
-	    end)
+	    btn:SetScript('OnClick', refresh_button_click)
 	    refresh_button = btn
 	end
 	do
diff --git a/tabs/search/core.lua b/tabs/search/core.lua
index 2178624..35203cc 100644
--- a/tabs/search/core.lua
+++ b/tabs/search/core.lua
@@ -1,4 +1,4 @@
-aux 'search_tab' private() local scan, scan_util = aux.scan, aux.scan_util
+aux 'search_tab' local scan, scan_util = aux.scan, aux.scan_util
 
 StaticPopupDialogs['AUX_SEARCH_TABLE_FULL'] = {
     text = 'Table full!\nFurther results from this search will still be processed but no longer displayed in the table.',
diff --git a/tabs/search/filter.lua b/tabs/search/filter.lua
index 519852e..bd11849 100644
--- a/tabs/search/filter.lua
+++ b/tabs/search/filter.lua
@@ -1,4 +1,4 @@
-aux 'search_tab' private() local filter_util = aux.filter_util
+aux 'search_tab' local filter_util = aux.filter_util
 
 function valid_level(str)
 	local level = tonumber(str)
diff --git a/tabs/search/frame.lua b/tabs/search/frame.lua
index 4c24147..464fa4c 100644
--- a/tabs/search/frame.lua
+++ b/tabs/search/frame.lua
@@ -1,4 +1,4 @@
-aux 'search_tab' private() local gui, completion, listing, auction_listing, filter_util = aux.gui, aux.completion, aux.listing, aux.auction_listing, aux.filter_util
+aux 'search_tab' local gui, completion, listing, auction_listing, filter_util = aux.gui, aux.completion, aux.listing, aux.auction_listing, aux.filter_util
 
 FILTER_SPACING = 28.5
 
diff --git a/tabs/search/results.lua b/tabs/search/results.lua
index e343446..d289662 100644
--- a/tabs/search/results.lua
+++ b/tabs/search/results.lua
@@ -1,4 +1,4 @@
-aux 'search_tab' private() local info, scan = aux.info, aux.scan
+aux 'search_tab' local info, scan = aux.info, aux.scan
 
 _G.aux_auto_buy_filter = ''
 
diff --git a/tabs/search/saved.lua b/tabs/search/saved.lua
index f891db0..923256f 100644
--- a/tabs/search/saved.lua
+++ b/tabs/search/saved.lua
@@ -1,4 +1,4 @@
-aux 'search_tab' private()
+aux 'search_tab'
 
 _G.aux_favorite_searches = t
 _G.aux_recent_searches = t
diff --git a/util/color.lua b/util/color.lua
index ae8ce9a..c8c8a55 100644
--- a/util/color.lua
+++ b/util/color.lua
@@ -1,4 +1,4 @@
-aux 'core' private()
+aux 'core'
 
 COLORS = {
 	text = {enabled = {255, 254, 250, 1}, disabled = {147, 151, 139, 1}},
diff --git a/util/completion.lua b/util/completion.lua
index 942d2a0..7bef0e1 100644
--- a/util/completion.lua
+++ b/util/completion.lua
@@ -1,4 +1,4 @@
-aux 'completion' private() local filter_util = aux.filter_util
+aux 'completion' local filter_util = aux.filter_util
 
 function public:complete_filter()
 	if IsControlKeyDown() then -- TODO problem is ctrl-v, maybe find a better solution
diff --git a/util/core.lua b/util/core.lua
index 5ff60ef..3dacb6a 100644
--- a/util/core.lua
+++ b/util/core.lua
@@ -1,4 +1,4 @@
-aux 'core' private()
+aux 'core'
 
 public.join = _G.table.concat
 
diff --git a/util/filter.lua b/util/filter.lua
index fa78b72..cf7cb18 100644
--- a/util/filter.lua
+++ b/util/filter.lua
@@ -1,4 +1,4 @@
-aux 'filter_util' private() local info = aux.info
+aux 'filter_util' local info = aux.info
 
 function default_filter(str)
     return {
diff --git a/util/info.lua b/util/info.lua
index 6e21cdb..5abfc7b 100644
--- a/util/info.lua
+++ b/util/info.lua
@@ -1,4 +1,4 @@
-aux 'info' private()
+aux 'info'
 
 CreateFrame('GameTooltip', 'AuxTooltip', nil, 'GameTooltipTemplate')
 AuxTooltip:SetScript('OnTooltipAddMoney', function()
diff --git a/util/money.lua b/util/money.lua
index 0a9f050..ac65c1f 100644
--- a/util/money.lua
+++ b/util/money.lua
@@ -1,4 +1,4 @@
-aux 'money' private()
+aux 'money'
 
 public()
 GOLD_TEXT = '|cffffd70ag|r'
diff --git a/util/persistence.lua b/util/persistence.lua
index efd91ee..d2bdc9a 100644
--- a/util/persistence.lua
+++ b/util/persistence.lua
@@ -1,4 +1,4 @@
-aux 'persistence' private()
+aux 'persistence'
 
 _G.aux_datasets = t
 
diff --git a/util/scan.lua b/util/scan.lua
index 2a7a05f..a4941ef 100644
--- a/util/scan.lua
+++ b/util/scan.lua
@@ -1,4 +1,4 @@
-aux 'scan_util' private() local info , filter_util = aux.info, aux.filter_util
+aux 'scan_util' local info , filter_util = aux.info, aux.filter_util
 
 function public.find(auction_record, status_bar, on_abort, on_failure, on_success)
 
diff --git a/util/sort.lua b/util/sort.lua
index 12a4d6b..ce72404 100644
--- a/util/sort.lua
+++ b/util/sort.lua
@@ -1,4 +1,4 @@
-aux 'sorting' private()
+aux 'sorting'
 
 public()