mirror of
https://github.com/jlu5/PyLink.git
synced 2024-11-01 01:09:22 +01:00
core: Add irc argument to User and Server classes
Also, add a __deepcopy__ override to channel because we cannot clone IRCNetwork objects (locks cannot be pickled).
This commit is contained in:
parent
96a202acce
commit
8c0f19422f
31
classes.py
31
classes.py
@ -12,7 +12,7 @@ import time
|
|||||||
import socket
|
import socket
|
||||||
import ssl
|
import ssl
|
||||||
import hashlib
|
import hashlib
|
||||||
from copy import deepcopy
|
from copy import copy, deepcopy
|
||||||
import inspect
|
import inspect
|
||||||
import ipaddress
|
import ipaddress
|
||||||
import queue
|
import queue
|
||||||
@ -41,7 +41,7 @@ class ChannelState(structures.IRCCaseInsensitiveDict):
|
|||||||
|
|
||||||
if key not in self._data:
|
if key not in self._data:
|
||||||
log.debug('(%s) ChannelState: creating new channel %s in memory', self._irc.name, key)
|
log.debug('(%s) ChannelState: creating new channel %s in memory', self._irc.name, key)
|
||||||
self._data[key] = newchan = Channel(key)
|
self._data[key] = newchan = Channel(self._irc, key)
|
||||||
return newchan
|
return newchan
|
||||||
|
|
||||||
return self._data[key]
|
return self._data[key]
|
||||||
@ -1336,7 +1336,7 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
|
|||||||
log.info('(%s) Enumerating our own SID %s', self.name, self.sid)
|
log.info('(%s) Enumerating our own SID %s', self.name, self.sid)
|
||||||
host = self.hostname()
|
host = self.hostname()
|
||||||
|
|
||||||
self.servers[self.sid] = Server(None, host, internal=True,
|
self.servers[self.sid] = Server(self, None, host, internal=True,
|
||||||
desc=self.serverdata.get('serverdesc')
|
desc=self.serverdata.get('serverdesc')
|
||||||
or conf.conf['pylink']['serverdesc'])
|
or conf.conf['pylink']['serverdesc'])
|
||||||
|
|
||||||
@ -1515,7 +1515,7 @@ class User():
|
|||||||
self.realname = realname
|
self.realname = realname
|
||||||
self.modes = set() # Tracks user modes
|
self.modes = set() # Tracks user modes
|
||||||
self.server = server
|
self.server = server
|
||||||
self.irc = irc
|
self._irc = irc
|
||||||
|
|
||||||
# Tracks PyLink identification status
|
# Tracks PyLink identification status
|
||||||
self.account = ''
|
self.account = ''
|
||||||
@ -1527,7 +1527,7 @@ class User():
|
|||||||
self.services_account = ''
|
self.services_account = ''
|
||||||
|
|
||||||
# Tracks channels the user is in
|
# Tracks channels the user is in
|
||||||
self.channels = structures.IRCCaseInsensitiveSet(self.irc)
|
self.channels = structures.IRCCaseInsensitiveSet(self._irc)
|
||||||
|
|
||||||
# Tracks away message status
|
# Tracks away message status
|
||||||
self.away = ''
|
self.away = ''
|
||||||
@ -1554,21 +1554,23 @@ class Server():
|
|||||||
internal: Whether the server is an internal PyLink server.
|
internal: Whether the server is an internal PyLink server.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, uplink, name, internal=False, desc="(None given)"):
|
def __init__(self, irc, uplink, name, internal=False, desc="(None given)"):
|
||||||
self.uplink = uplink
|
self.uplink = uplink
|
||||||
self.users = set()
|
self.users = set()
|
||||||
self.internal = internal
|
self.internal = internal
|
||||||
self.name = name.lower()
|
self.name = name.lower()
|
||||||
self.desc = desc
|
self.desc = desc
|
||||||
|
self._irc = irc
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return 'Server(%s)' % self.name
|
return 'Server(%s)' % self.name
|
||||||
|
|
||||||
IrcServer = Server
|
IrcServer = Server
|
||||||
|
|
||||||
class Channel(utils.DeprecatedAttributesObject, utils.CamelCaseToSnakeCase):
|
class Channel(utils.DeprecatedAttributesObject, utils.CamelCaseToSnakeCase):
|
||||||
"""PyLink IRC channel class."""
|
"""PyLink IRC channel class."""
|
||||||
|
|
||||||
def __init__(self, name=None):
|
def __init__(self, irc, name=None):
|
||||||
# Initialize variables, such as the topic, user list, TS, who's opped, etc.
|
# Initialize variables, such as the topic, user list, TS, who's opped, etc.
|
||||||
self.users = set()
|
self.users = set()
|
||||||
self.modes = set()
|
self.modes = set()
|
||||||
@ -1576,6 +1578,7 @@ class Channel(utils.DeprecatedAttributesObject, utils.CamelCaseToSnakeCase):
|
|||||||
self.ts = int(time.time())
|
self.ts = int(time.time())
|
||||||
self.prefixmodes = {'op': set(), 'halfop': set(), 'voice': set(),
|
self.prefixmodes = {'op': set(), 'halfop': set(), 'voice': set(),
|
||||||
'owner': set(), 'admin': set()}
|
'owner': set(), 'admin': set()}
|
||||||
|
self._irc = irc
|
||||||
|
|
||||||
# Determines whether a topic has been set here or not. Protocol modules
|
# Determines whether a topic has been set here or not. Protocol modules
|
||||||
# should set this.
|
# should set this.
|
||||||
@ -1596,8 +1599,20 @@ class Channel(utils.DeprecatedAttributesObject, utils.CamelCaseToSnakeCase):
|
|||||||
self.users.discard(target)
|
self.users.discard(target)
|
||||||
removeuser = remove_user
|
removeuser = remove_user
|
||||||
|
|
||||||
def deepcopy(self):
|
def __deepcopy__(self, memo):
|
||||||
"""Returns a deep copy of the channel object."""
|
"""Returns a deep copy of the channel object."""
|
||||||
|
# XXX: we can't pickle IRCNetwork, so just return a reference of it.
|
||||||
|
channel_copy = copy(self)
|
||||||
|
# For everything else, create a copy.
|
||||||
|
for attr, val in self.__dict__.items():
|
||||||
|
if not isinstance(val, PyLinkNetworkCore):
|
||||||
|
setattr(channel_copy, attr, deepcopy(val))
|
||||||
|
|
||||||
|
memo[id(self)] = channel_copy
|
||||||
|
|
||||||
|
return channel_copy
|
||||||
|
|
||||||
|
def deepcopy(self):
|
||||||
return deepcopy(self)
|
return deepcopy(self)
|
||||||
|
|
||||||
def is_voice(self, uid):
|
def is_voice(self, uid):
|
||||||
|
@ -141,7 +141,7 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
|
|||||||
# For others servers, just use the server name as the SID.
|
# For others servers, just use the server name as the SID.
|
||||||
sid = name
|
sid = name
|
||||||
|
|
||||||
self.servers[sid] = Server(uplink, name, internal=internal)
|
self.servers[sid] = Server(self, uplink, name, internal=internal)
|
||||||
return sid
|
return sid
|
||||||
|
|
||||||
def away(self, source, text):
|
def away(self, source, text):
|
||||||
|
@ -356,7 +356,7 @@ class InspIRCdProtocol(TS6BaseProtocol):
|
|||||||
if not utils.isServerName(name):
|
if not utils.isServerName(name):
|
||||||
raise ValueError('Invalid server name %r' % name)
|
raise ValueError('Invalid server name %r' % name)
|
||||||
self._send_with_prefix(uplink, 'SERVER %s * 1 %s :%s' % (name, sid, desc))
|
self._send_with_prefix(uplink, 'SERVER %s * 1 %s :%s' % (name, sid, desc))
|
||||||
self.servers[sid] = Server(uplink, name, internal=True, desc=desc)
|
self.servers[sid] = Server(self, uplink, name, internal=True, desc=desc)
|
||||||
|
|
||||||
def endburstf():
|
def endburstf():
|
||||||
# Delay ENDBURST by X seconds if requested.
|
# Delay ENDBURST by X seconds if requested.
|
||||||
@ -611,7 +611,7 @@ class InspIRCdProtocol(TS6BaseProtocol):
|
|||||||
raise ProtocolError('recvpass from uplink server %s does not match configuration!' % servername)
|
raise ProtocolError('recvpass from uplink server %s does not match configuration!' % servername)
|
||||||
|
|
||||||
sdesc = args[-1]
|
sdesc = args[-1]
|
||||||
self.servers[numeric] = Server(None, servername, desc=sdesc)
|
self.servers[numeric] = Server(self, None, servername, desc=sdesc)
|
||||||
self.uplink = numeric
|
self.uplink = numeric
|
||||||
return
|
return
|
||||||
|
|
||||||
@ -620,7 +620,7 @@ class InspIRCdProtocol(TS6BaseProtocol):
|
|||||||
servername = args[0].lower()
|
servername = args[0].lower()
|
||||||
sid = args[3]
|
sid = args[3]
|
||||||
sdesc = args[-1]
|
sdesc = args[-1]
|
||||||
self.servers[sid] = Server(numeric, servername, desc=sdesc)
|
self.servers[sid] = Server(self, numeric, servername, desc=sdesc)
|
||||||
|
|
||||||
return {'name': servername, 'sid': args[3], 'text': sdesc}
|
return {'name': servername, 'sid': args[3], 'text': sdesc}
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ class NgIRCdProtocol(IRCS2SProtocol):
|
|||||||
# a number, we can simply use the counter in our PSID generator for this.
|
# a number, we can simply use the counter in our PSID generator for this.
|
||||||
server_token = sid.rsplit('@')[-1]
|
server_token = sid.rsplit('@')[-1]
|
||||||
self._send_with_prefix(uplink, 'SERVER %s 1 %s :%s' % (name, server_token, desc))
|
self._send_with_prefix(uplink, 'SERVER %s 1 %s :%s' % (name, server_token, desc))
|
||||||
self.servers[sid] = Server(uplink, name, internal=True, desc=desc)
|
self.servers[sid] = Server(self, uplink, name, internal=True, desc=desc)
|
||||||
return sid
|
return sid
|
||||||
|
|
||||||
def away(self, source, text):
|
def away(self, source, text):
|
||||||
@ -524,7 +524,7 @@ class NgIRCdProtocol(IRCS2SProtocol):
|
|||||||
serverdesc = args[-1]
|
serverdesc = args[-1]
|
||||||
|
|
||||||
# The uplink should be set to None for the uplink; otherwise, set it equal to the sender server.
|
# The uplink should be set to None for the uplink; otherwise, set it equal to the sender server.
|
||||||
self.servers[servername] = Server(source if source != servername else None, servername, desc=serverdesc)
|
self.servers[servername] = Server(self, source if source != servername else None, servername, desc=serverdesc)
|
||||||
|
|
||||||
if self.uplink is None:
|
if self.uplink is None:
|
||||||
self.uplink = servername
|
self.uplink = servername
|
||||||
|
@ -674,7 +674,7 @@ class P10Protocol(IRCS2SProtocol):
|
|||||||
self._send_with_prefix(uplink, 'SERVER %s 1 %s %s P10 %s]]] +h6 :%s' % \
|
self._send_with_prefix(uplink, 'SERVER %s 1 %s %s P10 %s]]] +h6 :%s' % \
|
||||||
(name, self.start_ts, int(time.time()), sid, desc))
|
(name, self.start_ts, int(time.time()), sid, desc))
|
||||||
|
|
||||||
self.servers[sid] = Server(uplink, name, internal=True, desc=desc)
|
self.servers[sid] = Server(self, uplink, name, internal=True, desc=desc)
|
||||||
return sid
|
return sid
|
||||||
|
|
||||||
def squit(self, source, target, text='No reason given'):
|
def squit(self, source, target, text='No reason given'):
|
||||||
@ -832,7 +832,7 @@ class P10Protocol(IRCS2SProtocol):
|
|||||||
servername = args[0].lower()
|
servername = args[0].lower()
|
||||||
sid = args[5][:2]
|
sid = args[5][:2]
|
||||||
sdesc = args[-1]
|
sdesc = args[-1]
|
||||||
self.servers[sid] = Server(source, servername, desc=sdesc)
|
self.servers[sid] = Server(self, source, servername, desc=sdesc)
|
||||||
|
|
||||||
if self.uplink is None:
|
if self.uplink is None:
|
||||||
# If we haven't already found our uplink, this is probably it.
|
# If we haven't already found our uplink, this is probably it.
|
||||||
|
@ -400,7 +400,7 @@ class TS6Protocol(TS6BaseProtocol):
|
|||||||
|
|
||||||
# Server name and SID are sent in different messages, so we fill this
|
# Server name and SID are sent in different messages, so we fill this
|
||||||
# with dummy information until we get the actual sid.
|
# with dummy information until we get the actual sid.
|
||||||
self.servers[numeric] = Server(None, '')
|
self.servers[numeric] = Server(self, None, '')
|
||||||
self.uplink = numeric
|
self.uplink = numeric
|
||||||
|
|
||||||
def handle_capab(self, numeric, command, args):
|
def handle_capab(self, numeric, command, args):
|
||||||
|
@ -182,7 +182,7 @@ class TS6BaseProtocol(IRCS2SProtocol):
|
|||||||
if not utils.isServerName(name):
|
if not utils.isServerName(name):
|
||||||
raise ValueError('Invalid server name %r' % name)
|
raise ValueError('Invalid server name %r' % name)
|
||||||
self._send_with_prefix(uplink, 'SID %s 1 %s :%s' % (name, sid, desc))
|
self._send_with_prefix(uplink, 'SID %s 1 %s :%s' % (name, sid, desc))
|
||||||
self.servers[sid] = Server(uplink, name, internal=True, desc=desc)
|
self.servers[sid] = Server(self, uplink, name, internal=True, desc=desc)
|
||||||
return sid
|
return sid
|
||||||
|
|
||||||
def away(self, source, text):
|
def away(self, source, text):
|
||||||
@ -232,7 +232,7 @@ class TS6BaseProtocol(IRCS2SProtocol):
|
|||||||
# <- :services.int SERVER a.bc 2 :(H) [GL] test jupe
|
# <- :services.int SERVER a.bc 2 :(H) [GL] test jupe
|
||||||
servername = args[0].lower()
|
servername = args[0].lower()
|
||||||
sdesc = args[-1]
|
sdesc = args[-1]
|
||||||
self.servers[servername] = Server(numeric, servername, desc=sdesc)
|
self.servers[servername] = Server(self, numeric, servername, desc=sdesc)
|
||||||
return {'name': servername, 'sid': None, 'text': sdesc}
|
return {'name': servername, 'sid': None, 'text': sdesc}
|
||||||
|
|
||||||
def handle_sid(self, numeric, command, args):
|
def handle_sid(self, numeric, command, args):
|
||||||
@ -242,7 +242,7 @@ class TS6BaseProtocol(IRCS2SProtocol):
|
|||||||
sname = args[0].lower()
|
sname = args[0].lower()
|
||||||
sid = args[2]
|
sid = args[2]
|
||||||
sdesc = args[-1]
|
sdesc = args[-1]
|
||||||
self.servers[sid] = Server(numeric, sname, desc=sdesc)
|
self.servers[sid] = Server(self, numeric, sname, desc=sdesc)
|
||||||
return {'name': sname, 'sid': sid, 'text': sdesc}
|
return {'name': sname, 'sid': sid, 'text': sdesc}
|
||||||
|
|
||||||
def handle_svsnick(self, source, command, args):
|
def handle_svsnick(self, source, command, args):
|
||||||
|
@ -480,7 +480,7 @@ class UnrealProtocol(TS6BaseProtocol):
|
|||||||
if protover < self.min_proto_ver:
|
if protover < self.min_proto_ver:
|
||||||
raise ProtocolError("Protocol version too old! (needs at least %s "
|
raise ProtocolError("Protocol version too old! (needs at least %s "
|
||||||
"(Unreal 4.x), got %s)" % (self.min_proto_ver, protover))
|
"(Unreal 4.x), got %s)" % (self.min_proto_ver, protover))
|
||||||
self.servers[numeric] = Server(None, sname, desc=sdesc)
|
self.servers[numeric] = Server(self, None, sname, desc=sdesc)
|
||||||
|
|
||||||
# Set irc.connected to True, meaning that protocol negotiation passed.
|
# Set irc.connected to True, meaning that protocol negotiation passed.
|
||||||
log.debug('(%s) self.connected set!', self.name)
|
log.debug('(%s) self.connected set!', self.name)
|
||||||
|
Loading…
Reference in New Issue
Block a user