From 04d645540b63ae6b3b462265479de3c56f50d9b7 Mon Sep 17 00:00:00 2001
From: Peter Eliasson <warackta@gmail.com>
Date: Sun, 7 Aug 2016 12:34:25 +0200
Subject: [PATCH] Moved logic for "tracked zones" to main module.

---
 src/highscore.lua |   13 -------------
 src/main.lua      |   43 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/highscore.lua b/src/highscore.lua
index 2ab4138..f2cf2b0 100644
--- a/src/highscore.lua
+++ b/src/highscore.lua
@@ -98,14 +98,6 @@ addon.dbDefaults.realm.modules["highscore"] = {
 	}
 }
 
--- Constants
-local TRACKED_ZONE_IDS = {
-	1228,	-- WoD: Highmaul
-	1205,	-- WoD: Blackrock Foundry
-	1448,	-- WoD: Hellfire Citadel
-	1088,	-- Legion: The Nighthold
-	1094	-- Legion: The Emerald Nightmare
-}
 
 -- Function that returns a list of keys in `parses` for the top
 -- `numParses` for each player and role combination in `parses`.
@@ -277,11 +269,6 @@ function highscore:AddEncounterParsesForPlayers(guildName, encounter, players)
 	local startTime = assert(encounter.startTime);
 	local duration = assert(encounter.duration);
 
-	if not tContains(TRACKED_ZONE_IDS, zoneId) then
-		self:Debug("AddEncounterParsesForPlayers: Current zone not in tracked zones");
-		return
-	end
-
 	-- Add zone, difficulty and encounter info
 	addZone(db, zoneId, zoneName);
 	addDifficulty(db, difficultyId, difficultyName);
diff --git a/src/main.lua b/src/main.lua
index cee09fb..ef76fdc 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -14,11 +14,13 @@ local addonName, addonTable = ...
 local tinsert = tinsert;
 local format = format;
 local time = time;
+local tContains = tContains;
 local IsInGuild = IsInGuild;
 local GetGuildInfo = GetGuildInfo;
 local GetInstanceInfo = GetInstanceInfo;
 local GetRealZoneText = GetRealZoneText;
 local UnitIsUnit = UnitIsUnit;
+local GetExpansionLevel = GetExpansionLevel;
 
 -- Non-cached globals (for mikk's FindGlobals script)
 -- GLOBALS: LibStub
@@ -61,6 +63,20 @@ local DEBUG_PRINT = false
 DEBUG_PRINT = true;
 --@end-debug@
 
+-- A list of raid zone ids, grouped by expansion id. This list
+-- is used to determine if parses for a zone should be added.
+local RAID_ZONE_IDS = {
+	[5] = { -- WoD
+		1228, -- Highmaul
+		1205, -- Blackrock Foundry
+		1448, -- Hellfire Citadel
+	},
+	[6] = { -- Legion
+		1088, -- The Nighthold
+		1094, -- The Emerald Nightmare
+	},
+}
+
 
 -- Takes a difficulty ID and attempts to return a string
 -- representation of that difficulty.
@@ -78,6 +94,13 @@ local function getDifficultyNameById(difficultyId)
 	return nil
 end
 
+-- Takes an expansionId and returns the raid zone ids for that
+-- expansion, or an empty table for unknown expansionIds
+local function getRaidZonesByExpansionId(expansionId)
+	return RAID_ZONE_IDS[expansionId] or {};
+end
+
+
 -- A wrapper around :Pring that only prints if the
 -- DEBUG_PRINT flag is set to true.
 function addon:Debug(...)
@@ -100,6 +123,11 @@ function addon:IsInMyGuild(playerName)
 	end
 end
 
+-- Tests if a zone is in the addon's tracked zones.
+function addon:IsTrackedZone(zoneId)
+	return tContains(self.trackedZones, zoneId);
+end
+
 -- Function that updates the guild name of the player
 -- by quering the GetGuildInfo method for the player.
 function addon:UpdateMyGuildName()
@@ -154,9 +182,16 @@ function addon:OnEncounterEndSuccess(encounterId, encounterName, difficultyId, r
 		return;
 	end
 
+	local zoneId = self.currentZone.id;
+	local zoneName = self.currentZone.name;
+	if not self:IsTrackedZone(zoneId) then
+		self:Debug("Not in a tracked zone");
+		return;
+	end
+
 	local encounter = {
-		zoneId = self.currentZone.id,
-		zoneName = self.currentZone.name,
+		zoneId = zoneId,
+		zoneName = zoneName,
 		id = encounterId,
 		name = encounterName,
 		difficultyId = difficultyId,
@@ -207,6 +242,7 @@ function addon:OnInitialize()
 end
 
 function addon:OnEnable()
+	self.trackedZones = getRaidZonesByExpansionId(GetExpansionLevel())
 	self.currentZone = {};
 	self.guildName = nil;
 
@@ -236,7 +272,8 @@ function addon:OnEnable()
 end
 
 function addon:OnDisable()
-	self.currentZone = {};
+	self.trackedZones = nil;
+	self.currentZone = nil;
 	self.guildName = nil;
 
 	self:UnregisterEvent("ENCOUNTER_END")
-- 
1.7.9.5