wow/devian: Devian.lua comparison

comparison Devian.lua @ 89:b3ed963f482d v.2.1.92

- /dvc command needed a pre-defined enclosure to properly work through SlashCmdList - /dvn <profile name> and /dvn save <profile name> should resolve to and update the correct profile. - set some globals indicating the name and index of the workspace in use - DEVIAN_WORKSPACE (bool) - DEVIAN_PNAME (string) - DEVIAN_PID (number)

author	Nenue
date	Wed, 10 Aug 2016 06:58:27 -0400
parents	e80723841888
children	bb403e03d82d

comparison

equal deleted inserted replaced

-:7ff0579e5a6e
+:b3ed963f482d
 local currentProfile
 local playerName = UnitName("player")
 local playerRealm = playerName .. '-' .. GetRealmName()
 local num_dock_tabs = 0
 DEVIAN_WORKSPACE = false
+DEVIAN_PNAME = 'Dvn'
+DEVIAN_PID = 0
 DevianLoadMessage = setmetatable({}, {
 __call = function(t, msg)
 rawset(t, #t+1, msg)
 currentProfile.char[playerRealm] = currentProfile.char[playerRealm] or {}
 if currentProfile.workspace then
 DEVIAN_WORKSPACE = true
+DEVIAN_PNAME = name
+DEVIAN_PID = id
 setprinthandler(D.Message)
 else
 DEVIAN_WORKSPACE = false
+DEVIAN_PNAME = ''
 print = function() end
 end
+DEVIAN_PID =id
 D.unlisted = currentProfile.unlisted
 D.channels = currentProfile.channels
 D.tags = currentProfile.tags
 D.channelinfo = currentProfile.channels
 return D.Tag(self, tag, dest)
 elseif mode == 'new' then
 return D.New(self, tag)
 elseif mode == 'remove' then
 return D.Remove(self, tag)
-elseif tonumber(mode) ~= nil or mode == 'save' then
+elseif mode ~= nil then
--- either a number of the save command
+-- profile selector or save command
 if mode == 'save' then
 list_id = tonumber(tag)
-if list_id == nil then
+else
-D:Print(L('Invalid ID from arg', tag))
+list_id = tonumber(mode)
 end
+if not list_id then
+if db.profilesName[tostring(list_id)] then
+list_id = db.profilesName[tostring(list_id)]
+else
+D:Print(L('Unable to resolve profile ID/name', list_id, dest))
+return
+end
+end
+if mode == 'save' then
 D.Profile(list_id, dest)
 scan_func = D.Save
-D:Print("Profile |cFFFFFF00".. list_id .."|r saved.")
-else
+local name = currentProfile.name
-D.LoadMessage "Switched profiles."
+if dest then
+dest = dest:gsub("$%s+", ''):gsub("%s+^", '')
-list_id = tonumber(mode)
+if dest then
-if list_id ~= db.main_profile then
+if name then
-db.last_profile = list_id
+db.profilesName[name] = nil
 end
-db.current_profile = list_id
+db.profiles[list_id].name = dest
-scan_func = D.Load
+db.profilesName[dest] = list_id
+end
+end
+D:Print("Profile |cFFFFFF00".. list_id .."|r:|cFF00FFFF".. name .."|r saved.")
+else
+if db.profiles[list_id] then
+D.LoadMessage ("Switched profiles.")
+if list_id ~= db.main_profile then
+db.last_profile = list_id
+end
+db.current_profile = list_id
+scan_func = D.Load
+else
+return D:PrintHelp()
+end
 end
 elseif mode == nil then
 list_id = (db.current_profile ~= db.main_profile) and db.main_profile or db.last_profile
 D.LoadMessage ("Switched between main and recent profile ("..db.current_profile..' and '..list_id..')')
 db.current_profile = list_id
 scan_func = D.Load
 else
 return D:PrintHelp()
 end
 if not db.profiles[list_id] then
 db.profiles[list_id] = {global = {}, char = {} }
 D.UnsetColors = function()
 db.tagcolor = {}
 D:Print('Tag color cache cleared.')
 end
-function D:OnEnable()
+function D.ConsoleCommand (cmd)
+D:Console_Toggle(cmd)
+end
+function D:OnInitialize()
+L = D.L
+-- pull defaults
+if not _G.DevianDB then
+_G.DevianDB = defaults
+end
+db = _G.DevianDB
+self.db = db
+---
+if #_G.DevianLoadMessage >= 1 then
+for i, msg in ipairs(_G.DevianLoadMessage) do
+D:Print(msg)
+end
+table.wipe(_G.DevianLoadMessage)
+end
 -- commands
 local cmdlist = {
-['dfs'] = 'FrameHelper_Update',
 ['dvn'] = "Command",
 ['devian'] = "Command",
-['dvc'] = function() D:Console_Toggle() end,
+['dvc'] = "ConsoleCommand",
 ['dvncolors'] = "UnsetColors",
 ['cleandvn'] = "SetDefaultsAll",
 ['resetdvn'] = "SetDefaults",
 }
 for cmd, func in pairs(cmdlist) do
 local CMD = cmd:upper()
-_G['SLASH_' .. CMD:upper() .. '1'] = "/"..cmd
+_G['SLASH_' .. CMD .. '1'] = "/"..cmd
 if type(func == 'string') then
+print('SLASH_' .. CMD .. '1','/'.. cmd, func)
 SlashCmdList[CMD] = D[func]
 else
+print('SLASH_' .. CMD .. '1','/'.. cmd, func)
 SlashCmdList[CMD] = func
 end
+end
-end
-end
-function D:OnInitialize()
-L = D.L
--- pull defaults
-if not _G.DevianDB then
-_G.DevianDB = defaults
-end
-db = _G.DevianDB
-self.db = db
----
-if #_G.DevianLoadMessage >= 1 then
-for i, msg in ipairs(_G.DevianLoadMessage) do
-D:Print(msg)
-end
-table.wipe(_G.DevianLoadMessage)
-end
 --- initialize the current profile
 local id, name = D.Profile(db.current_profile or 1)
 D:Print('Using profile |cFFFFFF00'.. id ..'|r: |cFF00FF00'..currentProfile.name..'|r')
 if  currentProfile.workspace then
 end
 _G.DevianDock:Show()
 D:UpdateDock()
 end
 end

Mercurial > wow > devian

comparison Devian.lua @ 89:b3ed963f482d v.2.1.92