eric: comparison Network/IRC/IrcNetworkManager.py

-:26b34180a943
+:1e33501a0d33
 @return password (string)
 """
 return pwConvert(self.__password, encode=False)
+class IrcChannel(QObject):
+"""
+Class implementing the IRC channel object.
+"""
+def __init__(self, name, parent=None):
+"""
+Constructor
+@param name name of the network (string)
+@param parent reference to the parent object (QObject)
+"""
+super().__init__(parent)
+self.__name = name
+self.__key = ""
+self.__autoJoin = False
+def save(self, settings):
+"""
+Public method to save the channel data.
+@param settings reference to the settings object (QSettings)
+"""
+# no need to save the channel name because that is the group key
+settings.setValue("Key", self.__key)
+settings.setValue("AutoJoin", self.__autoJoin)
+def load(self, settings):
+"""
+Public method to load the network data.
+@param settings reference to the settings object (QSettings)
+"""
+self.__key = settings.value("Key", "")
+self.__autoJoin = Preferences.toBool(settings.value("AutoJoin"), False)
+def getName(self):
+"""
+Public method to get the channel name.
+@return channel name (string)
+"""
+return self.__name
+def setKey(self, key):
+"""
+Public method to set a new channel key.
+@param key channel key to set (string)
+"""
+self.__key = pwConvert(key, encode=True)
+def getKey(self):
+"""
+Public method to get the channel key.
+@return channel key (string)
+"""
+return pwConvert(self.__key, encode=False)
+def autoJoin(self):
+"""
+Public method to check the auto join status.
+@return flag indicating if the channel should be
+joined automatically (boolean)
+"""
+return self.__autoJoin
+def setAutoJoin(self, enable):
+"""
+Public method to set the auto join status of the channel.
+@param enable flag indicating if the channel should be
+joined automatically (boolean)
+"""
+self.__autoJoin = enable
 class IrcNetwork(QObject):
 """
-Class implementing the IRC identity object.
+Class implementing the IRC network object.
 """
 def __init__(self, name, parent=None):
 """
 Constructor
 super().__init__(parent)
 self.__name = name
 self.__identity = ""
 self.__server = ""
-self.__channels = []
+self.__channels = {}
-self.__autoJoinChannels = False
 def save(self, settings):
 """
 Public method to save the network data.
 @param settings reference to the settings object (QSettings)
 """
 # no need to save the network name because that is the group key
 settings.setValue("Identity", self.__identity)
 settings.setValue("Server", self.__server)
-settings.setValue("Channels", self.__channels)
+settings.beginGroup("Channels")
-settings.setValue("AutoJoinChannels", self.__autoJoinChannels)
+for key in self.__channels:
+settings.beginGroup(key)
+self.__channels[key].save(settings)
+settings.endGroup()
+settings.endGroup()
 def load(self, settings):
 """
 Public method to load the network data.
 @param settings reference to the settings object (QSettings)
 """
 self.__identity = settings.value("Identity", "")
 self.__server = settings.value("Server", "")
-self.__channels = Preferences.toList(settings.value("Channels", []))
+settings.beginGroup("Channels")
-self.__autoJoinChannels = Preferences.toBool(
+for key in self.__channels:
-settings.value("AutoJoinChannels", False))
+self.__channels[key] = IrcChannel(key, self)
+settings.beginGroup(key)
+self.__channels[key].load(settings)
+settings.endGroup()
+settings.endGroup()
 def getName(self):
 """
 Public method to get the network name.
 def setChannels(self, channels):
 """
 Public method to set the list of channels.
-@param channels list of channels (list of string)
+@param channels list of channels for the network (list of IrcChannel)
 """
-self.__channels = channels[:]
+self.__channels = {}
+for channel in channels:
+self.__channels[channel.getName()] = channel
 def getChannels(self):
 """
+Public method to get the channels.
+@return list of channels for the network (list of IrcChannel)
+"""
+return list(self.__channels.values())
+def getChannelNames(self):
+"""
 Public method to get the list of channels.
-@return list of channels (list of string)
+@return list of channel names (list of string)
 """
-return self.__channels[:]
+return list(sorted(self.__channels.keys()))
-def setAutoJoinChannels(self, on):
+def getChannel(self, channelName):
 """
-Public method to enable channel auto joining.
+Public method to get a channel.
-@param on flag indicating to join the channels after connecting
+@param channelName name of the channel to retrieve (string)
-to the server (boolean)
+@return reference to the channel (IrcChannel)
 """
-self.__autoJoinChannels = on
+if channelName in self.__channels:
+return self.__channels[channelName]
-def autoJoinChannels(self):
+else:
-"""
+return None
-Public method to check, if channel auto joining is enabled.
+def setChannel(self, channel):
-@return flag indicating to join the channels after connecting
+"""
-to the server (boolean)
+Public method to set a channel.
-"""
-return self.__autoJoinChannels
+@param channel channel object to set (IrcChannel)
+"""
+channelName = channel.getName()
+if channelName in self.__channels:
+channel.setParent(self)
+self.__channels[channelName] = channel
+def addChannel(self, channel):
+"""
+Public method to add a channel.
+@param channel channel object to add (IrcChannel)
+"""
+channelName = channel.getName()
+if channelName not in self.__channels:
+channel.setParent(self)
+self.__channels[channelName] = channel
 class IrcNetworkManager(QObject):
 """
 Class implementing the IRC identity object.
 # network
 networkName = "Freenode"
 network = IrcNetwork(networkName, self)
 network.setIdentityName(IrcIdentity.DefaultIdentityName)
 network.setServerName(serverName)
-network.setChannels(["#eric-ide"])
+channel = IrcChannel("#eric-ide", network)
+channel.setAutoJoin(False)
+network.addChannel(channel)
 self.__networks[networkName] = network
 self.dataChanged.emit()
 def getIdentity(self, name, create=False):
 """
 Public method to indicate a change of a server object.
 """
 self.dataChanged.emit()
+def getServerNames(self):
+"""
+Public method to get a list of all known server names.
+@return list of server names (list of string)
+"""
+if not self.__loaded:
+self.__load()
+return list(sorted(self.__servers.keys()))
 def getNetwork(self, name):
 """
 Public method to get a network object.
 @param name name of the network (string)
 if name in self.__networks:
 return self.__networks[name]
 else:
 return None
-def createNetwork(self, name, identity, server, channels=None,
+def createNetwork(self, name, identity, server, channels=None):
-autoJoinChannels=False):
 """
 Public method to create a new network object.
 @param name name of the network (string)
 @param identity reference to an identity object to associate with
 this network (IrcIdentity)
 @param server reference to a server object to associate with this
 network (IrcServer)
-@param channels list of channels for the network (list of string)
+@param channels list of channels for the network (list of IrcChannel)
-@param autoJoinChannels flag indicating to join the channels
-automatically (boolean)
 @return reference to the created network object (IrcNetwork)
 """
 if not self.__loaded:
 self.__load()
 return None
 network = IrcNetwork(name)
 network.setIdentityName(identity.getName())
 network.setServerName(server.getServer())
+# TODO: change this
 network.setChannels(channels[:])
-network.setAutoJoinChannels(autoJoinChannels)
+##        network.setAutoJoinChannels(autoJoinChannels)
 self.__networks[name] = network
 self.networkChanged()
 return network
 @return list of network names (list of string)
 """
 if not self.__loaded:
 self.__load()
-return sorted(self.__networks.keys())
+return list(sorted(self.__networks.keys()))

Mercurial Repositories > eric / file comparison

comparison: Network/IRC/IrcNetworkManager.py

Network/IRC/IrcNetworkManager.py