eric: comparison Network/IRC/IrcNetworkManager.py

-:266800cbe7cc
+:e30d5f978919
 @return identity name (string)
 """
 return self.__name
+def getIdent(self):
+"""
+Public method to get the real identity name.
+Note: This methdo takes care of converting the default
+identity name to the user's user name.
+@return real identity name (string)
+"""
+if self.__name == IrcIdentity.DefaultIdentityName:
+return Utilities.getUserName()
+else:
+return self.__name
 def setRealName(self, name):
 """
 Public method to set the real name of the identity.
 @param name real name (string)
 Public method to get the password.
 @return password (string)
 """
 return pwConvert(self.__password, encode=False)
+@classmethod
+def createDefaultIdentity(cls):
+"""
+Class method to create the default identity.
+@return default identity (IrcIdentity)
+"""
+userName = Utilities.getUserName()
+identity = IrcIdentity(IrcIdentity.DefaultIdentityName)
+identity.setNickNames([userName, userName + "_", userName + "__"])
+identity.setRealName(userName)
+return identity
 class IrcServer(object):
 """
 Class implementing the IRC identity object.
 """
 self.__port = int(settings.value("Port", IrcServer.DefaultPort))
 self.__ssl = Preferences.toBool(settings.value("SSL", False))
 self.__password = settings.value("Password", "")
-def getServer(self):
+def getName(self):
 """
 Public method to get the server name.
 @return server name (string)
 """
 """
 super().__init__()
 self.__name = name
 self.__identity = ""
-self.__server = ""
+self.__servers = {}
 self.__channels = {}
 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.beginGroup("Servers")
+for key in self.__servers:
+settings.beginGroup(key)
+self.__servers[key].save(settings)
+settings.endGroup()
+settings.endGroup()
 settings.beginGroup("Channels")
 for key in self.__channels:
 settings.beginGroup(key)
 self.__channels[key].save(settings)
 settings.endGroup()
 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", "")
+settings.beginGroup("Servers")
+for key in settings.childKeys():
+self.__servers[key] = IrcServer(key)
+settings.beginGroup(key)
+self.__servers[key].load(settings)
+settings.endGroup()
+settings.endGroup()
 settings.beginGroup("Channels")
 for key in self.__channels:
 self.__channels[key] = IrcChannel(key)
 settings.beginGroup(key)
 self.__channels[key].load(settings)
 @return identity name (string)
 """
 return self.__identity
-def setServerName(self, name):
+def setServers(self, servers):
 """
-Public method to set the server name.
+Public method to set the list of servers.
-@param name server name (string)
+@param servers list of servers for the network (list of IrcServer)
 """
-self.__server = name
+self.__servers = {}
+for server in servers:
-def getServerName(self):
+self.__servers[server.getName()] = server
-"""
-Public method to get the server name.
+def getServers(self):
+"""
-@return server name (string)
+Public method to get the servers.
-"""
-return self.__server
+@return list of servers for the network (list of IrcServer)
+"""
+return list(self.__servers.values())
+def getServerNames(self):
+"""
+Public method to get a list of all known server names.
+@return list of server names (list of string)
+"""
+return list(sorted(self.__servers.keys()))
+def getServer(self, name):
+"""
+Public method to get a server object.
+@param name name of the server to get (string)
+@return reference to the server (IrcServer)
+"""
+if name in self.__servers:
+return self.__servers[name]
+else:
+return None
+def setServer(self, server):
+"""
+Public method to set a server.
+@param server server object to set (IrcServer)
+"""
+serverName = server.getName()
+if serverName in self.__servers:
+self.__servers[serverName] = server
+def addServer(self, server):
+"""
+Public method to add a server.
+@param server server object to add (IrcServer)
+"""
+serverName = server.getName()
+if serverName not in self.__servers:
+self.__servers[serverName] = server
 def setChannels(self, channels):
 """
 Public method to set the list of channels.
 @param channel channel object to add (IrcChannel)
 """
 channelName = channel.getName()
 if channelName not in self.__channels:
 self.__channels[channelName] = channel
+def deleteChannel(self, channelName):
+"""
+Public method to delete the given channel.
+@param channelName name of the channel to be deleted (string)
+"""
+if channelName in self.__channels:
+del self.__channels[channelName]
+@classmethod
+def createDefaultNetwork(cls):
+"""
+Class method to create the default network.
+@return default network object (IrcNetwork)
+"""
+# network
+networkName = "Freenode"
+network = IrcNetwork(networkName)
+network.setIdentityName(IrcIdentity.DefaultIdentityName)
+# server
+serverName = "chat.freenode.net"
+server = IrcServer(serverName)
+server.setPort(8001)
+network.addServer(server)
+# channel
+channel = IrcChannel("#eric-ide")
+channel.setAutoJoin(False)
+network.addChannel(channel)
+return network
 class IrcNetworkManager(QObject):
 """
 Class implementing the IRC identity object.
 self.__settings = Preferences.Prefs.settings
 self.__networks = {}
 self.__identities = {}
-self.__servers = {}
 self.dataChanged.connect(self.__saveTimer.changeOccurred)
 def close(self):
 """
 # identities
 self.__settings.beginGroup("Identities")
 for key in self.__identities:
 self.__settings.beginGroup(key)
 self.__identities[key].save(self.__settings)
-self.__settings.endGroup()
-self.__settings.endGroup()
-# servers
-self.__settings.beginGroup("Servers")
-for key in self.__servers:
-self.__settings.beginGroup(key)
-self.__servers[key].save(self.__settings)
 self.__settings.endGroup()
 self.__settings.endGroup()
 # networks
 self.__settings.beginGroup("Networks")
 self.__settings.beginGroup(key)
 self.__identities[key].load(self.__settings)
 self.__settings.endGroup()
 self.__settings.endGroup()
-# servers
-self.__settings.beginGroup("Servers")
-for key in self.__settings.childKeys():
-self.__servers[key] = IrcServer(key)
-self.__settings.beginGroup(key)
-self.__servers[key].load(self.__settings)
-self.__settings.endGroup()
-self.__settings.endGroup()
 # networks
 self.__settings.beginGroup("Networks")
 for key in self.__settings.childKeys():
 self.__networks[key] = IrcNetwork(key)
 self.__settings.beginGroup(key)
 self.__networks = {}
 self.__identities = {}
 self.__servers = {}
 # identity
-userName = Utilities.getUserName()
+identity = IrcIdentity.createDefaultIdentity()
-identity = IrcIdentity(IrcIdentity.DefaultIdentityName)
+self.__identities[identity.getName()] = identity
-identity.setNickNames([userName, userName + "_", userName + "__"])
-self.__identities[IrcIdentity.DefaultIdentityName] = identity
 if not identityOnly:
-# server
+network = IrcNetwork.createDefaultNetwork()
-serverName = "chat.freenode.net"
+self.__networks[network.getName()] = network
-server = IrcServer(serverName)
-server.setPort(8001)
-self.__servers[serverName] = server
-# network
-networkName = "Freenode"
-network = IrcNetwork(networkName)
-network.setIdentityName(IrcIdentity.DefaultIdentityName)
-network.setServerName(serverName)
-channel = IrcChannel("#eric-ide")
-channel.setAutoJoin(False)
-network.addChannel(channel)
-self.__networks[networkName] = network
 self.dataChanged.emit()
+##################################################################
+## Identity related methods below
+##################################################################
 def getIdentity(self, name, create=False):
 """
 Public method to get an identity object.
 """
 Public method to indicate a change of an identity object.
 """
 self.dataChanged.emit()
-# TODO: move server to network because it belongs there
+##################################################################
-def getServer(self, name, create=False):
+## Network related methods below
-"""
+##################################################################
-Public method to get a server object.
-@param name name of the server to get (string)
-@param create flag indicating to create a new object,
-if none exists (boolean)
-@return reference to the server (IrcServer)
-"""
-if not name:
-return None
-if not self.__loaded:
-self.__load()
-if name in self.__servers:
-return self.__servers[name]
-elif create:
-server = IrcServer(name)
-self.__servers[name] = server
-self.dataChanged.emit()
-return server
-else:
-return None
-def serverChanged(self):
-"""
-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.
 if name in self.__networks:
 return self.__networks[name]
 else:
 return None
+def setNetwork(self, network):
+"""
+Public method to set a network.
+@param network network object to set (IrcNetwork)
+"""
+name = network.getName()
+if name in self.__networks:
+self.__networks[name] = network
+self.networkChanged()
 # TODO: check, if this method is needed
-def createNetwork(self, name, identity, server, channels=None):
+##    def createNetwork(self, name, identity, server, channels=None):
-"""
+##        """
-Public method to create a new network object.
+##        Public method to create a new network object.
+##
-@param name name of the network (string)
+##        @param name name of the network (string)
-@param identity reference to an identity object to associate with
+##        @param identity reference to an identity object to associate with
-this network (IrcIdentity)
+##            this network (IrcIdentity)
-@param server reference to a server object to associate with this
+##        @param server reference to a server object to associate with this
-network (IrcServer)
+##            network (IrcServer)
-@param channels list of channels for the network (list of IrcChannel)
+##        @param channels list of channels for the network (list of IrcChannel)
-@return reference to the created network object (IrcNetwork)
+##        @return reference to the created network object (IrcNetwork)
-"""
+##        """
-if not self.__loaded:
+##        if not self.__loaded:
-self.__load()
+##            self.__load()
+##
-if name in self.__networks:
+##        if name in self.__networks:
-return None
+##            return None
+##
-network = IrcNetwork(name)
+##        network = IrcNetwork(name)
-network.setIdentityName(identity.getName())
+##        network.setIdentityName(identity.getName())
-network.setServerName(server.getServer())
+####        network.setServerName(server.getServer())
-# TODO: change this
+####        network.setChannels(channels[:])
-network.setChannels(channels[:])
+####        network.setAutoJoinChannels(autoJoinChannels)
-##        network.setAutoJoinChannels(autoJoinChannels)
+##        self.__networks[name] = network
-self.__networks[name] = network
+##
+##        self.networkChanged()
-self.networkChanged()
+##
+##        return network
-return network
+##
 def deleteNetwork(self, name):
 """
 Public method to delete the given network.
 @param name name of the network to delete (string)

Mercurial Repositories > eric / file comparison

comparison: Network/IRC/IrcNetworkManager.py

Network/IRC/IrcNetworkManager.py