Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-04 18:38:39 +02:00
Code Issues Projects Releases Wiki Activity

Alias: refactor some of the registry access

Browse Source
This commit is contained in:
jacksonmj 2015-08-22 12:48:59 +00:00
parent d9b21dc5be
commit 92acea7785
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
plugins/Alias/plugin.py
View File

@ -298,6 +298,31 @@ class Alias(callbacks.Plugin):
except AttributeError: except AttributeError:
return self.aliases[command[0]][2] return self.aliases[command[0]][2]
def aliasRegistryGroup(self, name):
if needsEscaping(name):
return self.registryValue('escapedaliases', value=False)
else:
return self.registryValue('aliases', value=False)
def aliasRegistryNode(self, name):
group = self.aliasRegistryGroup(name)
if needsEscaping(name):
return group.get(escapeAlias(name))
else:
return group.get(name)
def aliasRegistryRemove(self, name):
group = self.aliasRegistryGroup(name)
if needsEscaping(name):
group.unregister(escapeAlias(name))
else:
group.unregister(name)
def setLocked(name, value):
self.aliases[name][1] = value
self.aliasRegistryNode(name).locked.setValue(value)
@internationalizeDocstring @internationalizeDocstring
def lock(self, irc, msg, args, name): def lock(self, irc, msg, args, name):
"""<alias> """<alias>
@ -305,13 +330,7 @@ class Alias(callbacks.Plugin):
Locks an alias so that no one else can change it. Locks an alias so that no one else can change it.
""" """
if name in self.aliases and self.isCommandMethod(name): if name in self.aliases and self.isCommandMethod(name):
self.aliases[name][1] = True self.setLocked(name, True)
if (needsEscaping(name)):
group = conf.supybot.plugins.Alias.escapedaliases
name = escapeAlias(name)
else:
group = conf.supybot.plugins.Alias.aliases
group.get(name).locked.setValue(True)
irc.replySuccess() irc.replySuccess()
else: else:
irc.error(_('There is no such alias.')) irc.error(_('There is no such alias.'))
@ -324,13 +343,7 @@ class Alias(callbacks.Plugin):
Unlocks an alias so that people can define new aliases over it. Unlocks an alias so that people can define new aliases over it.
""" """
if name in self.aliases and self.isCommandMethod(name): if name in self.aliases and self.isCommandMethod(name):
self.aliases[name][1] = False self.setLocked(name, False)
if (needsEscaping(name)):
group = conf.supybot.plugins.Alias.escapedaliases
name = escapeAlias(name)
else:
group = conf.supybot.plugins.Alias.aliases
group.get(name).locked.setValue(False)
irc.replySuccess() irc.replySuccess()
else: else:
irc.error(_('There is no such alias.')) irc.error(_('There is no such alias.'))
@ -354,15 +367,14 @@ class Alias(callbacks.Plugin):
raise AliasError(format('Alias %q is locked.', name)) raise AliasError(format('Alias %q is locked.', name))
f = makeNewAlias(name, alias) f = makeNewAlias(name, alias)
f = types.MethodType(f, self) f = types.MethodType(f, self)
if needsEscaping(name):
aliasGroup = self.registryValue('escapedaliases', value=False)
confname = escapeAlias(name)
else:
aliasGroup = self.registryValue('aliases', value=False)
confname = name
if name in self.aliases: if name in self.aliases:
# We gotta remove it so its value gets updated. # We gotta remove it so its value gets updated.
aliasGroup.unregister(confname) self.aliasRegistryRemove(name)
aliasGroup = self.aliasRegistryGroup(name)
if needsEscaping(name):
confname = escapeAlias(name)
else:
confname = name
conf.registerGlobalValue(aliasGroup, confname, conf.registerGlobalValue(aliasGroup, confname,
registry.String(alias, '')) registry.String(alias, ''))
conf.registerGlobalValue(aliasGroup.get(confname), 'locked', conf.registerGlobalValue(aliasGroup.get(confname), 'locked',
@ -374,11 +386,7 @@ class Alias(callbacks.Plugin):
if name in self.aliases and self.isCommandMethod(name): if name in self.aliases and self.isCommandMethod(name):
if evenIfLocked or not self.aliases[name][1]: if evenIfLocked or not self.aliases[name][1]:
del self.aliases[name] del self.aliases[name]
if needsEscaping(name): self.aliasRegistryRemove(name)
conf.supybot.plugins.Alias.escapedaliases.unregister(
escapeAlias(name))
else:
conf.supybot.plugins.Alias.aliases.unregister(name)
else: else:
raise AliasError('That alias is locked.') raise AliasError('That alias is locked.')
else: else: