mirror of
https://github.com/jlu5/PyLink.git
synced 2025-01-23 18:54:05 +01:00
Store channels case-insensitively in a new classes.ChannelState
Closes #372.
This commit is contained in:
parent
3c675bb163
commit
32249ace3e
37
classes.py
37
classes.py
@ -17,6 +17,7 @@ import inspect
|
|||||||
import ipaddress
|
import ipaddress
|
||||||
import queue
|
import queue
|
||||||
import functools
|
import functools
|
||||||
|
import collections
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import ircmatch
|
import ircmatch
|
||||||
@ -35,6 +36,40 @@ class ProtocolError(RuntimeError):
|
|||||||
|
|
||||||
### Internal classes (users, servers, channels)
|
### Internal classes (users, servers, channels)
|
||||||
|
|
||||||
|
class ChannelState(collections.abc.MutableMapping):
|
||||||
|
"""
|
||||||
|
A dictionary storing channels case insensitively. Channel objects are initialized on access.
|
||||||
|
"""
|
||||||
|
def __init__(self, irc):
|
||||||
|
self._data = {}
|
||||||
|
self._irc = irc
|
||||||
|
|
||||||
|
def _keymangle(self, key):
|
||||||
|
"""Converts the given key to lowercase."""
|
||||||
|
return self._irc.to_lower(key)
|
||||||
|
|
||||||
|
def __getitem__(self, key):
|
||||||
|
key = self._keymangle(key)
|
||||||
|
|
||||||
|
if key not in self._data:
|
||||||
|
log.debug('(%s) ChannelState: creating new channel %s in memory', self._irc.name, key)
|
||||||
|
self._data[key] = newchan = Channel(key)
|
||||||
|
return newchan
|
||||||
|
|
||||||
|
return self._data[key]
|
||||||
|
|
||||||
|
def __setitem__(self, key, value):
|
||||||
|
self._data[self._keymangle(key)] = value
|
||||||
|
|
||||||
|
def __delitem__(self, key):
|
||||||
|
del self._data[self._keymangle(key)]
|
||||||
|
|
||||||
|
def __iter__(self):
|
||||||
|
return iter(self._data)
|
||||||
|
|
||||||
|
def __len__(self):
|
||||||
|
return len(self._data)
|
||||||
|
|
||||||
class PyLinkNetworkCore(utils.DeprecatedAttributesObject, utils.CamelCaseToSnakeCase):
|
class PyLinkNetworkCore(utils.DeprecatedAttributesObject, utils.CamelCaseToSnakeCase):
|
||||||
"""Base IRC object for PyLink."""
|
"""Base IRC object for PyLink."""
|
||||||
|
|
||||||
@ -123,7 +158,7 @@ class PyLinkNetworkCore(utils.DeprecatedAttributesObject, utils.CamelCaseToSnake
|
|||||||
# now.
|
# now.
|
||||||
self.servers = {}
|
self.servers = {}
|
||||||
self.users = {}
|
self.users = {}
|
||||||
self.channels = structures.KeyedDefaultdict(Channel)
|
self.channels = ChannelState(self)
|
||||||
|
|
||||||
# This sets the list of supported channel and user modes: the default
|
# This sets the list of supported channel and user modes: the default
|
||||||
# RFC1459 modes are implied. Named modes are used here to make
|
# RFC1459 modes are implied. Named modes are used here to make
|
||||||
|
Loading…
Reference in New Issue
Block a user