Added cpref switch. (#98)

Author: mrogaski

Config.lua

@@ -81,15 +81,15 @@ function GwConfig:initialize_state()
     }
     self.comember_cache = GwHoldDownCache:new(GW_CACHE_COMEMBER_HOLD,
             GW_CACHE_COMEMBER_SOFT_MAX, GW_CACHE_COMEMBER_HARD_MAX)
-            
+
     return self
 end
 
 
 --- Dump configuration attributes.
 function GwConfig:dump(keep)
     local function dump_tier(t, level)
-        level = level == nil and 0 or level 
+        level = level == nil and 0 or level
         local indent = strrep('  ', level)
         local index = {}
         for i in pairs(t) do
@@ -110,10 +110,10 @@ function GwConfig:dump(keep)
                 else
                     gw.Write("%s%s = %s", indent, k, tostring(t[k]))
                 end
-            end 
+            end
         end
     end
-    
+
     gw.Write('[Options]')
     dump_tier(GreenWall, 0)
     gw.Write('[Configuration]')
@@ -140,12 +140,12 @@ function GwConfig:load()
         end
         return estr
     end
-    
+
     local function get_gm_officer_note()
         if not gw.IsOfficer() then
             return
         end
-        
+
         local n = GetNumGuildMembers();
         local name, rank, note
         for i = 1, n do
@@ -157,7 +157,7 @@ function GwConfig:load()
         end
         return
     end
-    
+
     local xlat = {}                     -- Translation table for string substitution.
 
     -- Abort if current configuration is valid
@@ -174,60 +174,64 @@ function GwConfig:load()
         gw.Debug(GW_LOG_WARNING, 'not in a guild.')
         return false
     end
-    
+
     -- Abort if configuration is not yet available
     local info = GetGuildInfoText()     -- Guild information text.
     if info == '' then
         gw.Debug(GW_LOG_WARNING, 'guild configuration not available.')
         return false
     end
-    
+
     gw.Debug(GW_LOG_INFO, 'parsing guild configuration.')
-    
+
 
 
     -- Soft reset of configuration
     self:initialize_param()
     for k, channel in pairs(self.channel) do
         channel:age()
     end
-    
+
     -- Update the channel hold-down
     self.timer.channel:set(GreenWall.joindelay)
-    
+
     --
     -- Check configuration version
     --
-    if strmatch(info, 'GWc=".*"') then
-        gw.Error('Guild configuration uses a format not supported by this version.')
-    end
-    if strmatch(info, 'GW:?c:') then
-        self.cversion = 1
+    if self.cpref == 0 then
+        if strmatch(info, 'GWc=".*"') then
+            gw.Error('Guild configuration uses a format not supported by this version.')
+        end
+        if strmatch(info, 'GW:?c:') then
+            self.cversion = 1
+        end
+    else
+        self.cversion = cpref
     end
-    
+
     if self.cversion == 1 then
         --
         -- Parse version 1 configuration
         --
         for buffer in gmatch(info, 'GW:?(%l:[^\n]*)') do
-        
+
             if buffer ~= nil then
-            
+
                 self.cversion = 1
                 buffer = strtrim(buffer)
                 local field = { strsplit(':', buffer) }
-            
+
                 if field[1] == 'c' then
                     -- Guild channel configuration
                     if field[2] and field[2] ~= '' then
                         self.channel.guild:configure(1, field[2], field[3])
                     else
                         gw.Error('invalid common channel name specified')
                     end
-    
+
                 elseif field[1] == 'p' then
                     -- Peer guild
-                    local peer_name = gw.GlobalName(substitute(field[2], xlat))                
+                    local peer_name = gw.GlobalName(substitute(field[2], xlat))
                     local peer_id = substitute(field[3], xlat)
                     if gw.iCmp(guild_name, peer_name) then
                         self.guild_id = peer_id
@@ -271,7 +275,7 @@ function GwConfig:load()
 
         self.valid = true
     end
-    
+
     -- Officer note
     if GreenWall.ochat then
         local note = get_gm_officer_note()
@@ -288,7 +292,7 @@ function GwConfig:load()
     else
         self.channel.officer:clear()
     end
-    
+
     --
     -- Version check
     --
@@ -299,7 +303,7 @@ function GwConfig:load()
             gw.Error('Guild configuration specifies a minimum version of %s (%s currently installed).', tostring(min), tostring(cur))
         end
     end
-    
+
     --
     -- Clean up.
     --
@@ -311,9 +315,9 @@ function GwConfig:load()
     if self.valid then
         self.timer.config:start()
     end
-    
+
     return true;
-    
+
 end
 
 

Globals.lua

@@ -69,18 +69,21 @@ gw.option = {
     redact          = { default=true,
                         desc="obfuscate sensitive data in debug output" },
     joindelay       = { default=30, min=0, max=120, step=1,
-                        desc="channel join delay" }
+                        desc="channel join delay" },
+    -- Development switch to force preferred configuration version.
+    cpref           = { default=0, min=0, max=2,
+                        desc="force the configuration version" }
 }
 
 gw.usage = [[
- 
+
   Usage:
-  
+
   /greenwall <command>  or  /gw <command>
-  
+
   Commands:
-  
-  help 
+
+  help
         -- Print this message.
   version
         -- Print the add-on version.
@@ -114,6 +117,6 @@ gw.usage = [[
         -- Specify the maximum number of log entries to keep.
   admin reload
         -- (officer only) Force a reload of the configuration by all online guild members.
- 
+
 ]]
 

GreenWall.toc

@@ -1,8 +1,8 @@
 ## Interface: 60200
 ## Title: GreenWall
-## Notes: Common communication channel as a replacement for guild chat in guild confederations. 
+## Notes: Common communication channel as a replacement for guild chat in guild confederations.
 ## Author: Mark Rogaski <[email protected]>
-## Version: 1.7.0
+## Version: 2.0.0-dev
 ## URL: https://github.com/AIE-Guild/GreenWall
 ## URL: http://wow.curse.com/downloads/wow-addons/details/greenwall.aspx
 ## DefaultState: enabled