X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=99b647a22602d6687685b8c43a972907dce0f341;hp=da1be33aa2aab15d5d96395a351d7e99eb571077;hb=dd2b40bf10da0309a72a9b2e8f49af752646fd92;hpb=6623fd2d46dadd0168e4e28d1db6944c26c2a773

diff --git a/src/common/network.cpp b/src/common/network.cpp
index da1be33a..99b647a2 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -28,6 +28,10 @@
 
 #include "util.h"
 
+QTextCodec *Network::_defaultCodecForServer = 0;
+QTextCodec *Network::_defaultCodecForEncoding = 0;
+QTextCodec *Network::_defaultCodecForDecoding = 0;
+
 // ====================
 //  Public:
 // ====================
@@ -42,6 +46,13 @@ Network::Network(const NetworkId &networkid, QObject *parent) : SyncableObject(p
     _prefixes(QString()),
     _prefixModes(QString()),
     _proxy(0),
+    _useRandomServer(false),
+    _useAutoIdentify(false),
+    _useAutoReconnect(false),
+    _autoReconnectInterval(60),
+    _autoReconnectRetries(10),
+    _unlimitedReconnectRetries(false),
+    _codecForServer(0),
     _codecForEncoding(0),
     _codecForDecoding(0)
 {
@@ -51,6 +62,7 @@ Network::Network(const NetworkId &networkid, QObject *parent) : SyncableObject(p
 // I think this is unnecessary since IrcUsers have us as their daddy :)
 
 Network::~Network() {
+  emit aboutToBeDestroyed();
 //  QHashIterator<QString, IrcUser *> ircuser(_ircUsers);
 //  while (ircuser.hasNext()) {
 //    ircuser.next();
@@ -95,7 +107,8 @@ bool Network::isConnected() const {
   return _connected;
 }
 
-Network::ConnectionState Network::connectionState() const {
+//Network::ConnectionState Network::connectionState() const {
+int Network::connectionState() const {
   return _connectionState;
 }
 
@@ -107,6 +120,15 @@ NetworkInfo Network::networkInfo() const {
   info.codecForEncoding = codecForEncoding();
   info.codecForDecoding = codecForDecoding();
   info.serverList = serverList();
+  info.useRandomServer = useRandomServer();
+  info.perform = perform();
+  info.useAutoIdentify = useAutoIdentify();
+  info.autoIdentifyService = autoIdentifyService();
+  info.autoIdentifyPassword = autoIdentifyPassword();
+  info.useAutoReconnect = useAutoReconnect();
+  info.autoReconnectInterval = autoReconnectInterval();
+  info.autoReconnectRetries = autoReconnectRetries();
+  info.rejoinChannels = rejoinChannels();
   return info;
 }
 
@@ -114,11 +136,20 @@ void Network::setNetworkInfo(const NetworkInfo &info) {
   // we don't set our ID!
   if(!info.networkName.isEmpty() && info.networkName != networkName()) setNetworkName(info.networkName);
   if(info.identity > 0 && info.identity != identity()) setIdentity(info.identity);
-  if(!info.codecForEncoding.isEmpty() && info.codecForEncoding != codecForEncoding())
-    setCodecForEncoding(QTextCodec::codecForName(info.codecForEncoding));
-  if(!info.codecForDecoding.isEmpty() && info.codecForDecoding != codecForDecoding())
-    setCodecForDecoding(QTextCodec::codecForName(info.codecForDecoding));
+  if(info.codecForServer != codecForServer()) setCodecForServer(QTextCodec::codecForName(info.codecForServer));
+  if(info.codecForEncoding != codecForEncoding()) setCodecForEncoding(QTextCodec::codecForName(info.codecForEncoding));
+  if(info.codecForDecoding != codecForDecoding()) setCodecForDecoding(QTextCodec::codecForName(info.codecForDecoding));
   if(info.serverList.count()) setServerList(info.serverList); // FIXME compare components
+  if(info.useRandomServer != useRandomServer()) setUseRandomServer(info.useRandomServer);
+  if(info.perform != perform()) setPerform(info.perform);
+  if(info.useAutoIdentify != useAutoIdentify()) setUseAutoIdentify(info.useAutoIdentify);
+  if(info.autoIdentifyService != autoIdentifyService()) setAutoIdentifyService(info.autoIdentifyService);
+  if(info.autoIdentifyPassword != autoIdentifyPassword()) setAutoIdentifyPassword(info.autoIdentifyPassword);
+  if(info.useAutoReconnect != useAutoReconnect()) setUseAutoReconnect(info.useAutoReconnect);
+  if(info.autoReconnectInterval != autoReconnectInterval()) setAutoReconnectInterval(info.autoReconnectInterval);
+  if(info.autoReconnectRetries != autoReconnectRetries()) setAutoReconnectRetries(info.autoReconnectRetries);
+  if(info.unlimitedReconnectRetries != unlimitedReconnectRetries()) setUnlimitedReconnectRetries(info.unlimitedReconnectRetries);
+  if(info.rejoinChannels != rejoinChannels()) setRejoinChannels(info.rejoinChannels);
 }
 
 QString Network::prefixToMode(const QString &prefix) {
@@ -177,6 +208,46 @@ QVariantList Network::serverList() const {
   return _serverList;
 }
 
+bool Network::useRandomServer() const {
+  return _useRandomServer;
+}
+
+QStringList Network::perform() const {
+  return _perform;
+}
+
+bool Network::useAutoIdentify() const {
+  return _useAutoIdentify;
+}
+
+QString Network::autoIdentifyService() const {
+  return _autoIdentifyService;
+}
+
+QString Network::autoIdentifyPassword() const {
+  return _autoIdentifyPassword;
+}
+
+bool Network::useAutoReconnect() const {
+  return _useAutoReconnect;
+}
+
+quint32 Network::autoReconnectInterval() const {
+  return _autoReconnectInterval;
+}
+
+quint16 Network::autoReconnectRetries() const {
+  return _autoReconnectRetries;
+}
+
+bool Network::unlimitedReconnectRetries() const {
+  return _unlimitedReconnectRetries;
+}
+
+bool Network::rejoinChannels() const {
+  return _rejoinChannels;
+}
+
 QString Network::prefixes() {
   if(_prefixes.isNull())
     determinePrefixes();
@@ -217,7 +288,6 @@ IrcUser *Network::newIrcUser(const QString &hostmask) {
     
     connect(ircuser, SIGNAL(nickSet(QString)), this, SLOT(ircUserNickChanged(QString)));
     connect(ircuser, SIGNAL(initDone()), this, SLOT(ircUserInitDone()));
-    connect(ircuser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
     _ircUsers[nick] = ircuser;
     emit ircUserAdded(hostmask);
     emit ircUserAdded(ircuser);
@@ -235,12 +305,24 @@ void Network::removeIrcUser(IrcUser *ircuser) {
     return;
 
   _ircUsers.remove(nick);
+  disconnect(ircuser, 0, this, 0);
   emit ircUserRemoved(nick);
   emit ircUserRemoved(ircuser);
   ircuser->deleteLater();
 }
 
-void Network::removeIrcUser(QString nick) {
+void Network::removeChansAndUsers() {
+  QList<IrcUser *> users = ircUsers();
+  foreach(IrcUser *user, users) {
+    removeIrcUser(user);
+  }
+  QList<IrcChannel *> channels = ircChannels();
+  foreach(IrcChannel *channel, channels) {
+    removeIrcChannel(channel);
+  }
+}
+
+void Network::removeIrcUser(const QString &nick) {
   IrcUser *ircuser;
   if((ircuser = ircUser(nick)) != 0)
     removeIrcUser(ircuser);
@@ -312,6 +394,47 @@ quint32 Network::ircChannelCount() const {
   return _ircChannels.count();
 }
 
+QByteArray Network::defaultCodecForServer() {
+  if(_defaultCodecForServer) return _defaultCodecForServer->name();
+  return QByteArray();
+}
+
+void Network::setDefaultCodecForServer(const QByteArray &name) {
+  _defaultCodecForServer = QTextCodec::codecForName(name);
+}
+
+QByteArray Network::defaultCodecForEncoding() {
+  if(_defaultCodecForEncoding) return _defaultCodecForEncoding->name();
+  return QByteArray();
+}
+
+void Network::setDefaultCodecForEncoding(const QByteArray &name) {
+  _defaultCodecForEncoding = QTextCodec::codecForName(name);
+}
+
+QByteArray Network::defaultCodecForDecoding() {
+  if(_defaultCodecForDecoding) return _defaultCodecForDecoding->name();
+  return QByteArray();
+}
+
+void Network::setDefaultCodecForDecoding(const QByteArray &name) {
+  _defaultCodecForDecoding = QTextCodec::codecForName(name);
+}
+
+QByteArray Network::codecForServer() const {
+  if(_codecForServer) return _codecForServer->name();
+  return QByteArray();
+}
+
+void Network::setCodecForServer(const QByteArray &name) {
+  setCodecForServer(QTextCodec::codecForName(name));
+}
+
+void Network::setCodecForServer(QTextCodec *codec) {
+  _codecForServer = codec;
+  emit codecForServerSet(codecForServer());
+}
+
 QByteArray Network::codecForEncoding() const {
   if(_codecForEncoding) return _codecForEncoding->name();
   return QByteArray();
@@ -340,14 +463,19 @@ void Network::setCodecForDecoding(QTextCodec *codec) {
   emit codecForDecodingSet(codecForDecoding());
 }
 
+// FIXME use server encoding if appropriate
 QString Network::decodeString(const QByteArray &text) const {
-  return ::decodeString(text, _codecForDecoding);
+  if(_codecForDecoding) return ::decodeString(text, _codecForDecoding);
+  else return ::decodeString(text, _defaultCodecForDecoding);
 }
 
 QByteArray Network::encodeString(const QString string) const {
   if(_codecForEncoding) {
     return _codecForEncoding->fromUnicode(string);
   }
+  if(_defaultCodecForEncoding) {
+    return _defaultCodecForEncoding->fromUnicode(string);
+  }
   return string.toAscii();
 }
 
@@ -366,11 +494,18 @@ void Network::setCurrentServer(const QString &currentServer) {
 
 void Network::setConnected(bool connected) {
   _connected = connected;
+  if(!connected) {
+    removeChansAndUsers();
+    setCurrentServer(QString());
+  }
   emit connectedSet(connected);
 }
 
-void Network::setConnectionState(ConnectionState state) {
+//void Network::setConnectionState(ConnectionState state) {
+void Network::setConnectionState(int state) {
   _connectionState = (ConnectionState)state;
+  //qDebug() << "netstate" << networkId() << networkName() << state;
+  emit connectionStateSet(state);
   emit connectionStateSet(_connectionState);
 }
 
@@ -389,6 +524,56 @@ void Network::setServerList(const QVariantList &serverList) {
   emit serverListSet(serverList);
 }
 
+void Network::setUseRandomServer(bool use) {
+  _useRandomServer = use;
+  emit useRandomServerSet(use);
+}
+
+void Network::setPerform(const QStringList &perform) {
+  _perform = perform;
+  emit performSet(perform);
+}
+
+void Network::setUseAutoIdentify(bool use) {
+  _useAutoIdentify = use;
+  emit useAutoIdentifySet(use);
+}
+
+void Network::setAutoIdentifyService(const QString &service) {
+  _autoIdentifyService = service;
+  emit autoIdentifyServiceSet(service);
+}
+
+void Network::setAutoIdentifyPassword(const QString &password) {
+  _autoIdentifyPassword = password;
+  emit autoIdentifyPasswordSet(password);
+}
+
+void Network::setUseAutoReconnect(bool use) {
+  _useAutoReconnect = use;
+  emit useAutoReconnectSet(use);
+}
+
+void Network::setAutoReconnectInterval(quint32 interval) {
+  _autoReconnectInterval = interval;
+  emit autoReconnectIntervalSet(interval);
+}
+
+void Network::setAutoReconnectRetries(quint16 retries) {
+  _autoReconnectRetries = retries;
+  emit autoReconnectRetriesSet(retries);
+}
+
+void Network::setUnlimitedReconnectRetries(bool unlimited) {
+  _unlimitedReconnectRetries = unlimited;
+  emit unlimitedReconnectRetriesSet(unlimited);
+}
+
+void Network::setRejoinChannels(bool rejoin) {
+  _rejoinChannels = rejoin;
+  emit rejoinChannelsSet(rejoin);
+}
+
 void Network::addSupport(const QString &param, const QString &value) {
   if(!_supports.contains(param)) {
     _supports[param] = value;
@@ -493,17 +678,29 @@ void Network::ircChannelInitDone() {
   emit ircChannelInitDone(ircchannel);
 }
 
-void Network::ircUserDestroyed() {
-  IrcUser *ircuser = static_cast<IrcUser *>(sender());
-  Q_ASSERT(ircuser);
-  removeIrcUser(ircuser);
+void Network::removeIrcChannel(IrcChannel *channel) {
+  QString chanName = _ircChannels.key(channel);
+  if(chanName.isNull())
+    return;
+  
+  _ircChannels.remove(chanName);
+  disconnect(channel, 0, this, 0);
+  emit ircChannelRemoved(chanName);
+  emit ircChannelRemoved(channel);
+  channel->deleteLater();
+}
+
+void Network::removeIrcChannel(const QString &channel) {
+  IrcChannel *chan;
+  if((chan = ircChannel(channel)) != 0)
+    removeIrcChannel(chan);
 }
 
 void Network::channelDestroyed() {
   IrcChannel *channel = static_cast<IrcChannel *>(sender());
   Q_ASSERT(channel);
-  emit ircChannelRemoved(sender());
   _ircChannels.remove(_ircChannels.key(channel));
+  emit ircChannelRemoved(channel);
 }
 
 void Network::requestConnect() const {
@@ -579,9 +776,20 @@ bool NetworkInfo::operator==(const NetworkInfo &other) const {
   if(networkId != other.networkId) return false;
   if(networkName != other.networkName) return false;
   if(identity != other.identity) return false;
+  if(codecForServer != other.codecForServer) return false;
   if(codecForEncoding != other.codecForEncoding) return false;
   if(codecForDecoding != other.codecForDecoding) return false;
   if(serverList != other.serverList) return false;
+  if(useRandomServer != other.useRandomServer) return false;
+  if(perform != other.perform) return false;
+  if(useAutoIdentify != other.useAutoIdentify) return false;
+  if(autoIdentifyService != other.autoIdentifyService) return false;
+  if(autoIdentifyPassword != other.autoIdentifyPassword) return false;
+  if(useAutoReconnect != other.useAutoReconnect) return false;
+  if(autoReconnectInterval != other.autoReconnectInterval) return false;
+  if(autoReconnectRetries != other.autoReconnectRetries) return false;
+  if(unlimitedReconnectRetries != other.unlimitedReconnectRetries) return false;
+  if(rejoinChannels != other.rejoinChannels) return false;
   return true;
 }
 
@@ -594,9 +802,20 @@ QDataStream &operator<<(QDataStream &out, const NetworkInfo &info) {
   i["NetworkId"] = QVariant::fromValue<NetworkId>(info.networkId);
   i["NetworkName"] = info.networkName;
   i["Identity"] = QVariant::fromValue<IdentityId>(info.identity);
+  i["CodecForServer"] = info.codecForServer;
   i["CodecForEncoding"] = info.codecForEncoding;
   i["CodecForDecoding"] = info.codecForDecoding;
   i["ServerList"] = info.serverList;
+  i["UseRandomServer"] = info.useRandomServer;
+  i["Perform"] = info.perform;
+  i["UseAutoIdentify"] = info.useAutoIdentify;
+  i["AutoIdentifyService"] = info.autoIdentifyService;
+  i["AutoIdentifyPassword"] = info.autoIdentifyPassword;
+  i["UseAutoReconnect"] = info.useAutoReconnect;
+  i["AutoReconnectInterval"] = info.autoReconnectInterval;
+  i["AutoReconnectRetries"] = info.autoReconnectRetries;
+  i["UnlimitedReconnectRetries"] = info.unlimitedReconnectRetries;
+  i["RejoinChannels"] = info.rejoinChannels;
   out << i;
   return out;
 }
@@ -607,8 +826,29 @@ QDataStream &operator>>(QDataStream &in, NetworkInfo &info) {
   info.networkId = i["NetworkId"].value<NetworkId>();
   info.networkName = i["NetworkName"].toString();
   info.identity = i["Identity"].value<IdentityId>();
+  info.codecForServer = i["CodecForServer"].toByteArray();
   info.codecForEncoding = i["CodecForEncoding"].toByteArray();
   info.codecForDecoding = i["CodecForDecoding"].toByteArray();
   info.serverList = i["ServerList"].toList();
+  info.useRandomServer = i["UseRandomServer"].toBool();
+  info.perform = i["Perform"].toStringList();
+  info.useAutoIdentify = i["UseAutoIdentify"].toBool();
+  info.autoIdentifyService = i["AutoIdentifyService"].toString();
+  info.autoIdentifyPassword = i["AutoIdentifyPassword"].toString();
+  info.useAutoReconnect = i["UseAutoReconnect"].toBool();
+  info.autoReconnectInterval = i["AutoReconnectInterval"].toUInt();
+  info.autoReconnectRetries = i["AutoReconnectRetries"].toInt();
+  info.unlimitedReconnectRetries = i["UnlimitedReconnectRetries"].toBool();
+  info.rejoinChannels = i["RejoinChannels"].toBool();
   return in;
 }
+
+
+
+
+
+
+
+
+
+