X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=c71b5c2c5b4a2233f9e00a197011f1dde00fb5e6;hp=b1a17a664f957b9e6424b9d6435ed352004269fb;hb=cd37744f0a2cd8ffe027892ddce5c7d6f4848ab0;hpb=da3aa4136fe01e142238f0f42fe1273481037b9d diff --git a/src/common/network.cpp b/src/common/network.cpp index b1a17a66..c71b5c2c 100644 --- a/src/common/network.cpp +++ b/src/common/network.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -17,29 +17,27 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "network.h" - -#include "signalproxy.h" -#include "ircuser.h" -#include "ircchannel.h" - -#include +#include #include -#include "util.h" +#include "network.h" +#include "quassel.h" QTextCodec *Network::_defaultCodecForServer = 0; QTextCodec *Network::_defaultCodecForEncoding = 0; QTextCodec *Network::_defaultCodecForDecoding = 0; +QString Network::_networksIniPath = QString(); // ==================== // Public: // ==================== -Network::Network(const NetworkId &networkid, QObject *parent) : SyncableObject(parent), +Network::Network(const NetworkId &networkid, QObject *parent) + : SyncableObject(parent), _proxy(0), _networkId(networkid), _identity(0), _myNick(QString()), + _latency(0), _networkName(QString("")), _currentServer(QString()), _connected(false), @@ -54,64 +52,26 @@ Network::Network(const NetworkId &networkid, QObject *parent) : SyncableObject(p _unlimitedReconnectRetries(false), _codecForServer(0), _codecForEncoding(0), - _codecForDecoding(0) + _codecForDecoding(0), + _autoAwayActive(false) { setObjectName(QString::number(networkid.toInt())); } -// I think this is unnecessary since IrcUsers have us as their daddy :) - Network::~Network() { emit aboutToBeDestroyed(); -// QHashIterator ircuser(_ircUsers); -// while (ircuser.hasNext()) { -// ircuser.next(); -// delete ircuser.value(); -// } -// qDebug() << "Destroying net" << networkName() << networkId(); -} - - -NetworkId Network::networkId() const { - return _networkId; -} - -SignalProxy *Network::proxy() const { - return _proxy; -} - -void Network::setProxy(SignalProxy *proxy) { - _proxy = proxy; - //proxy->synchronize(this); // we should to this explicitly from the outside! -} - -bool Network::isMyNick(const QString &nick) const { - return (myNick().toLower() == nick.toLower()); -} - -bool Network::isMe(IrcUser *ircuser) const { - return (ircuser->nick().toLower() == myNick().toLower()); } bool Network::isChannelName(const QString &channelname) const { if(channelname.isEmpty()) return false; - + if(supports("CHANTYPES")) return support("CHANTYPES").contains(channelname[0]); else return QString("#&!+").contains(channelname[0]); } -bool Network::isConnected() const { - return _connected; -} - -//Network::ConnectionState Network::connectionState() const { -int Network::connectionState() const { - return _connectionState; -} - NetworkInfo Network::networkInfo() const { NetworkInfo info; info.networkName = networkName(); @@ -141,7 +101,7 @@ void Network::setNetworkInfo(const NetworkInfo &info) { 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.serverList.count()) setServerList(toVariantList(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); @@ -161,10 +121,6 @@ QString Network::prefixToMode(const QString &prefix) { return QString(); } -QString Network::prefixToMode(const QCharRef &prefix) { - return prefixToMode(QString(prefix)); -} - QString Network::modeToPrefix(const QString &mode) { if(prefixModes().contains(mode)) return QString(prefixes()[prefixModes().indexOf(mode)]); @@ -172,26 +128,6 @@ QString Network::modeToPrefix(const QString &mode) { return QString(); } -QString Network::modeToPrefix(const QCharRef &mode) { - return modeToPrefix(QString(mode)); -} - -QString Network::networkName() const { - return _networkName; -} - -QString Network::currentServer() const { - return _currentServer; -} - -QString Network::myNick() const { - return _myNick; -} - -IdentityId Network::identity() const { - return _identity; -} - QStringList Network::nicks() const { // we don't use _ircUsers.keys() since the keys may be // not up to date after a nick change @@ -202,58 +138,10 @@ QStringList Network::nicks() const { return nicks; } -QStringList Network::channels() const { - return _ircChannels.keys(); -} - -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(); - + return _prefixes; } @@ -264,8 +152,27 @@ QString Network::prefixModes() { return _prefixModes; } -bool Network::supports(const QString ¶m) const { - return _supports.contains(param); +// example Unreal IRCD: CHANMODES=beI,kfL,lj,psmntirRcOAQKVCuzNSMTG +Network::ChannelModeType Network::channelModeType(const QString &mode) { + if(mode.isEmpty()) + return NOT_A_CHANMODE; + + QString chanmodes = support("CHANMODES"); + if(chanmodes.isEmpty()) + return NOT_A_CHANMODE; + + ChannelModeType modeType = A_CHANMODE; + for(int i = 0; i < chanmodes.count(); i++) { + if(chanmodes[i] == mode[0]) + break; + else if(chanmodes[i] == ',') + modeType = (ChannelModeType)(modeType << 1); + } + if(modeType > D_CHANMODE) { + qWarning() << "Network" << networkId() << "supplied invalid CHANMODES:" << chanmodes; + modeType = NOT_A_CHANMODE; + } + return modeType; } QString Network::support(const QString ¶m) const { @@ -276,29 +183,37 @@ QString Network::support(const QString ¶m) const { return QString(); } -IrcUser *Network::newIrcUser(const QString &hostmask) { +IrcUser *Network::newIrcUser(const QString &hostmask, const QVariantMap &initData) { QString nick(nickFromMask(hostmask).toLower()); if(!_ircUsers.contains(nick)) { IrcUser *ircuser = new IrcUser(hostmask, this); - // mark IrcUser as already initialized to keep the SignalProxy from requesting initData - //if(isInitialized()) - // ircuser->setInitialized(); + if(!initData.isEmpty()) { + ircuser->fromVariantMap(initData); + ircuser->setInitialized(); + } + if(proxy()) proxy()->synchronize(ircuser); else qWarning() << "unable to synchronize new IrcUser" << hostmask << "forgot to call Network::setProxy(SignalProxy *)?"; - + connect(ircuser, SIGNAL(nickSet(QString)), this, SLOT(ircUserNickChanged(QString))); - connect(ircuser, SIGNAL(initDone()), this, SLOT(ircUserInitDone())); + _ircUsers[nick] = ircuser; + emit ircUserAdded(hostmask); emit ircUserAdded(ircuser); } + return _ircUsers[nick]; } -IrcUser *Network::newIrcUser(const QByteArray &hostmask) { - return newIrcUser(decodeServerString(hostmask)); +IrcUser *Network::ircUser(QString nickname) const { + nickname = nickname.toLower(); + if(_ircUsers.contains(nickname)) + return _ircUsers[nickname]; + else + return 0; } void Network::removeIrcUser(IrcUser *ircuser) { @@ -308,73 +223,64 @@ void Network::removeIrcUser(IrcUser *ircuser) { _ircUsers.remove(nick); disconnect(ircuser, 0, this, 0); - emit ircUserRemoved(nick); - emit ircUserRemoved(ircuser); ircuser->deleteLater(); } +void Network::removeIrcChannel(IrcChannel *channel) { + QString chanName = _ircChannels.key(channel); + if(chanName.isNull()) + return; + + _ircChannels.remove(chanName); + disconnect(channel, 0, this, 0); + channel->deleteLater(); +} + void Network::removeChansAndUsers() { QList users = ircUsers(); - foreach(IrcUser *user, users) { - removeIrcUser(user); - } + _ircUsers.clear(); QList channels = ircChannels(); + _ircChannels.clear(); + foreach(IrcChannel *channel, channels) { - removeIrcChannel(channel); + proxy()->detachObject(channel); + disconnect(channel, 0, this, 0); + } + foreach(IrcUser *user, users) { + proxy()->detachObject(user); + disconnect(user, 0, this, 0); } -} - -void Network::removeIrcUser(const QString &nick) { - IrcUser *ircuser; - if((ircuser = ircUser(nick)) != 0) - removeIrcUser(ircuser); -} - -IrcUser *Network::ircUser(QString nickname) const { - nickname = nickname.toLower(); - if(_ircUsers.contains(nickname)) - return _ircUsers[nickname]; - else - return 0; -} - -IrcUser *Network::ircUser(const QByteArray &nickname) const { - return ircUser(decodeServerString(nickname)); -} -QList Network::ircUsers() const { - return _ircUsers.values(); -} + // the second loop is needed because quit can have sideffects + foreach(IrcUser *user, users) { + user->quit(); + } -quint32 Network::ircUserCount() const { - return _ircUsers.count(); + qDeleteAll(users); + qDeleteAll(channels); } -IrcChannel *Network::newIrcChannel(const QString &channelname) { +IrcChannel *Network::newIrcChannel(const QString &channelname, const QVariantMap &initData) { if(!_ircChannels.contains(channelname.toLower())) { - IrcChannel *channel = new IrcChannel(channelname, this); - // mark IrcUser as already initialized to keep the SignalProxy from requesting initData - //if(isInitialized()) - // channel->setInitialized(); + IrcChannel *channel = ircChannelFactory(channelname); + if(!initData.isEmpty()) { + channel->fromVariantMap(initData); + channel->setInitialized(); + } if(proxy()) proxy()->synchronize(channel); else qWarning() << "unable to synchronize new IrcChannel" << channelname << "forgot to call Network::setProxy(SignalProxy *)?"; - connect(channel, SIGNAL(initDone()), this, SLOT(ircChannelInitDone())); - connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed())); _ircChannels[channelname.toLower()] = channel; + emit ircChannelAdded(channelname); emit ircChannelAdded(channel); } return _ircChannels[channelname.toLower()]; } -IrcChannel *Network::newIrcChannel(const QByteArray &channelname) { - return newIrcChannel(decodeServerString(channelname)); -} - IrcChannel *Network::ircChannel(QString channelname) const { channelname = channelname.toLower(); if(_ircChannels.contains(channelname)) @@ -383,21 +289,9 @@ IrcChannel *Network::ircChannel(QString channelname) const { return 0; } -IrcChannel *Network::ircChannel(const QByteArray &channelname) const { - return ircChannel(decodeServerString(channelname)); -} - - -QList Network::ircChannels() const { - return _ircChannels.values(); -} - -quint32 Network::ircChannelCount() const { - return _ircChannels.count(); -} - QByteArray Network::defaultCodecForServer() { - if(_defaultCodecForServer) return _defaultCodecForServer->name(); + if(_defaultCodecForServer) + return _defaultCodecForServer->name(); return QByteArray(); } @@ -406,7 +300,8 @@ void Network::setDefaultCodecForServer(const QByteArray &name) { } QByteArray Network::defaultCodecForEncoding() { - if(_defaultCodecForEncoding) return _defaultCodecForEncoding->name(); + if(_defaultCodecForEncoding) + return _defaultCodecForEncoding->name(); return QByteArray(); } @@ -415,7 +310,8 @@ void Network::setDefaultCodecForEncoding(const QByteArray &name) { } QByteArray Network::defaultCodecForDecoding() { - if(_defaultCodecForDecoding) return _defaultCodecForDecoding->name(); + if(_defaultCodecForDecoding) + return _defaultCodecForDecoding->name(); return QByteArray(); } @@ -424,7 +320,8 @@ void Network::setDefaultCodecForDecoding(const QByteArray &name) { } QByteArray Network::codecForServer() const { - if(_codecForServer) return _codecForServer->name(); + if(_codecForServer) + return _codecForServer->name(); return QByteArray(); } @@ -438,7 +335,8 @@ void Network::setCodecForServer(QTextCodec *codec) { } QByteArray Network::codecForEncoding() const { - if(_codecForEncoding) return _codecForEncoding->name(); + if(_codecForEncoding) + return _codecForEncoding->name(); return QByteArray(); } @@ -452,7 +350,8 @@ void Network::setCodecForEncoding(QTextCodec *codec) { } QByteArray Network::codecForDecoding() const { - if(_codecForDecoding) return _codecForDecoding->name(); + if(_codecForDecoding) + return _codecForDecoding->name(); else return QByteArray(); } @@ -467,7 +366,8 @@ void Network::setCodecForDecoding(QTextCodec *codec) { // FIXME use server encoding if appropriate QString Network::decodeString(const QByteArray &text) const { - if(_codecForDecoding) return ::decodeString(text, _codecForDecoding); + if(_codecForDecoding) + return ::decodeString(text, _codecForDecoding); else return ::decodeString(text, _defaultCodecForDecoding); } @@ -482,8 +382,10 @@ QByteArray Network::encodeString(const QString &string) const { } QString Network::decodeServerString(const QByteArray &text) const { - if(_codecForServer) return ::decodeString(text, _codecForServer); - else return ::decodeString(text, _defaultCodecForServer); + if(_codecForServer) + return ::decodeString(text, _codecForServer); + else + return ::decodeString(text, _defaultCodecForServer); } QByteArray Network::encodeServerString(const QString &string) const { @@ -496,6 +398,68 @@ QByteArray Network::encodeServerString(const QString &string) const { return string.toAscii(); } +/*** Handle networks.ini ***/ + +QStringList Network::presetNetworks(bool onlyDefault) { + // lazily find the file, make sure to not call one of the other preset functions first (they'll fail else) + if(_networksIniPath.isNull()) { + _networksIniPath = Quassel::findDataFilePath("networks.ini"); + if(_networksIniPath.isNull()) { + _networksIniPath = ""; // now we won't check again, as it's not null anymore + return QStringList(); + } + } + if(!_networksIniPath.isEmpty()) { + QSettings s(_networksIniPath, QSettings::IniFormat); + QStringList networks = s.childGroups(); + if(!networks.isEmpty()) { + // we sort the list case-insensitive + QMap sorted; + foreach(QString net, networks) { + if(onlyDefault && !s.value(QString("%1/Default").arg(net)).toBool()) + continue; + sorted[net.toLower()] = net; + } + return sorted.values(); + } + } + return QStringList(); +} + +QStringList Network::presetDefaultChannels(const QString &networkName) { + if(_networksIniPath.isEmpty()) // be sure to have called presetNetworks() first, else this always fails + return QStringList(); + QSettings s(_networksIniPath, QSettings::IniFormat); + return s.value(QString("%1/DefaultChannels").arg(networkName)).toStringList(); +} + +NetworkInfo Network::networkInfoFromPreset(const QString &networkName) { + NetworkInfo info; + if(!_networksIniPath.isEmpty()) { + info.networkName = networkName; + QSettings s(_networksIniPath, QSettings::IniFormat); + s.beginGroup(info.networkName); + foreach(QString server, s.value("Servers").toStringList()) { + bool ssl = false; + QStringList splitserver = server.split(':', QString::SkipEmptyParts); + if(splitserver.count() != 2) { + qWarning() << "Invalid server entry in networks.conf:" << server; + continue; + } + if(splitserver[1].at(0) == '+') + ssl = true; + uint port = splitserver[1].toUInt(); + if(!port) { + qWarning() << "Invalid port entry in networks.conf:" << server; + continue; + } + info.serverList << Network::Server(splitserver[0].trimmed(), port, QString(), ssl); + } + } + return info; +} + + // ==================== // Public Slots: // ==================== @@ -510,10 +474,14 @@ void Network::setCurrentServer(const QString ¤tServer) { } void Network::setConnected(bool connected) { + if(_connected == connected) + return; + _connected = connected; if(!connected) { - removeChansAndUsers(); + setMyNick(QString()); setCurrentServer(QString()); + removeChansAndUsers(); } emit connectedSet(connected); } @@ -528,16 +496,26 @@ void Network::setConnectionState(int state) { void Network::setMyNick(const QString &nickname) { _myNick = nickname; + if(!_myNick.isEmpty() && !ircUser(myNick())) { + newIrcUser(myNick()); + } emit myNickSet(nickname); } +void Network::setLatency(int latency) { + if(_latency == latency) + return; + _latency = latency; + emit latencySet(latency); +} + void Network::setIdentity(IdentityId id) { _identity = id; emit identitySet(id); } void Network::setServerList(const QVariantList &serverList) { - _serverList = serverList; + _serverList = fromVariantList(serverList); emit serverListSet(serverList); } @@ -615,87 +593,66 @@ QVariantMap Network::initSupports() const { return supports; } -QVariantList Network::initServerList() const { - return serverList(); -} +QVariantMap Network::initIrcUsersAndChannels() const { + QVariantMap usersAndChannels; + QVariantMap users; + QVariantMap channels; -QStringList Network::initIrcUsers() const { - QStringList hostmasks; - foreach(IrcUser *ircuser, ircUsers()) { - hostmasks << ircuser->hostmask(); + QHash::const_iterator userIter = _ircUsers.constBegin(); + QHash::const_iterator userIterEnd = _ircUsers.constEnd(); + while(userIter != userIterEnd) { + users[userIter.value()->hostmask()] = userIter.value()->toVariantMap(); + userIter++; } - return hostmasks; -} + usersAndChannels["users"] = users; -QStringList Network::initIrcChannels() const { - return _ircChannels.keys(); -} - -QStringList Network::initPersistentChannels() const { - QStringList list; - foreach(QString chan, _persistentChannels.keys()) { - list << QString("%1/%2").arg(chan).arg(_persistentChannels.value(chan)); + QHash::const_iterator channelIter = _ircChannels.constBegin(); + QHash::const_iterator channelIterEnd = _ircChannels.constEnd(); + while(channelIter != channelIterEnd) { + channels[channelIter.value()->name()] = channelIter.value()->toVariantMap(); + channelIter++; } - return list; -} + usersAndChannels["channels"] = channels; -void Network::initSetSupports(const QVariantMap &supports) { - QMapIterator iter(supports); - while(iter.hasNext()) { - iter.next(); - addSupport(iter.key(), iter.value().toString()); - } -} - -void Network::initSetServerList(const QVariantList & serverList) { - setServerList(serverList); + return usersAndChannels; } -void Network::initSetIrcUsers(const QStringList &hostmasks) { - if(!_ircUsers.empty()) +void Network::initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels) { + Q_ASSERT(proxy()); + if(isInitialized()) { + qWarning() << "Network" << networkId() << "received init data for users and channels allthough there allready are known users or channels!"; return; - foreach(QString hostmask, hostmasks) { - newIrcUser(hostmask); } -} - -void Network::initSetIrcChannels(const QStringList &channels) { - // FIXME This does not work correctly, "received data for unknown User" triggers - // So we disable this for now - return; - if(!_ircChannels.empty()) - return; - foreach(QString channel, channels) - newIrcChannel(channel); -} - -void Network::initSetPersistentChannels(const QStringList &channels) { - foreach(QString chan, channels) { - QStringList l = chan.split("/"); - _persistentChannels[l[0]] = l[1]; + QVariantMap users = usersAndChannels.value("users").toMap(); + QVariantMap::const_iterator userIter = users.constBegin(); + QVariantMap::const_iterator userIterEnd = users.constEnd(); + while(userIter != userIterEnd) { + newIrcUser(userIter.key(), userIter.value().toMap()); + userIter++; } -} -void Network::addPersistentChannel(const QString &channel, const QString &key) { - _persistentChannels[channel.toLower()] = key; - emit persistentChannelAdded(channel, key); -} - -void Network::removePersistentChannel(const QString &channel) { - _persistentChannels.remove(channel.toLower()); - emit persistentChannelRemoved(channel); + QVariantMap channels = usersAndChannels.value("channels").toMap(); + QVariantMap::const_iterator channelIter = channels.constBegin(); + QVariantMap::const_iterator channelIterEnd = channels.constEnd(); + while(channelIter != channelIterEnd) { + newIrcChannel(channelIter.key(), channelIter.value().toMap()); + channelIter++; + } } -void Network::setPersistentChannelKey(const QString &channel, const QString &key) { - _persistentChannels[channel.toLower()] = key; - emit persistentChannelKeySet(channel, key); +void Network::initSetSupports(const QVariantMap &supports) { + QMapIterator iter(supports); + while(iter.hasNext()) { + iter.next(); + addSupport(iter.key(), iter.value().toString()); + } } IrcUser *Network::updateNickFromMask(const QString &mask) { QString nick(nickFromMask(mask).toLower()); IrcUser *ircuser; - + if(_ircUsers.contains(nick)) { ircuser = _ircUsers[nick]; ircuser->updateHostmask(mask); @@ -717,67 +674,6 @@ void Network::ircUserNickChanged(QString newnick) { setMyNick(newnick); } -void Network::ircUserInitDone() { - IrcUser *ircuser = static_cast(sender()); - Q_ASSERT(ircuser); - emit ircUserInitDone(ircuser); -} - -void Network::ircChannelInitDone() { - IrcChannel *ircchannel = static_cast(sender()); - Q_ASSERT(ircchannel); - emit ircChannelInitDone(ircchannel); -} - -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(sender()); - Q_ASSERT(channel); - _ircChannels.remove(_ircChannels.key(channel)); - emit ircChannelRemoved(channel); -} - -void Network::requestConnect() const { - if(!proxy()) return; - if(proxy()->proxyMode() == SignalProxy::Client) emit connectRequested(); // on the client this triggers calling this slot on the core - else { - if(connectionState() != Disconnected) { - qWarning() << "Requesting connect while already being connected!"; - return; - } - emit connectRequested(networkId()); // and this is for CoreSession :) - } -} - -void Network::requestDisconnect() const { - if(!proxy()) return; - if(proxy()->proxyMode() == SignalProxy::Client) emit disconnectRequested(); // on the client this triggers calling this slot on the core - else { - if(connectionState() == Disconnected) { - qWarning() << "Requesting disconnect while not being connected!"; - return; - } - emit disconnectRequested(networkId()); // and this is for CoreSession :) - } -} - void Network::emitConnectionError(const QString &errorMsg) { emit connectionError(errorMsg); } @@ -787,18 +683,24 @@ void Network::emitConnectionError(const QString &errorMsg) { // ==================== void Network::determinePrefixes() { // seems like we have to construct them first - QString PREFIX = support("PREFIX"); - - if(PREFIX.startsWith("(") && PREFIX.contains(")")) { - _prefixes = PREFIX.section(")", 1); - _prefixModes = PREFIX.mid(1).section(")", 0, 0); + QString prefix = support("PREFIX"); + + if(prefix.startsWith("(") && prefix.contains(")")) { + _prefixes = prefix.section(")", 1); + _prefixModes = prefix.mid(1).section(")", 0, 0); } else { QString defaultPrefixes("~&@%+"); QString defaultPrefixModes("qaohv"); + if(prefix.isEmpty()) { + _prefixes = defaultPrefixes; + _prefixModes = defaultPrefixModes; + return; + } + // we just assume that in PREFIX are only prefix chars stored for(int i = 0; i < defaultPrefixes.size(); i++) { - if(PREFIX.contains(defaultPrefixes[i])) { + if(prefix.contains(defaultPrefixes[i])) { _prefixes += defaultPrefixes[i]; _prefixModes += defaultPrefixModes[i]; } @@ -806,11 +708,11 @@ void Network::determinePrefixes() { // check for success if(!_prefixes.isNull()) return; - + // well... our assumption was obviously wrong... // check if it's only prefix modes for(int i = 0; i < defaultPrefixes.size(); i++) { - if(PREFIX.contains(defaultPrefixModes[i])) { + if(prefix.contains(defaultPrefixModes[i])) { _prefixes += defaultPrefixes[i]; _prefixModes += defaultPrefixModes[i]; } @@ -823,6 +725,21 @@ void Network::determinePrefixes() { * NetworkInfo ************************************************************************/ +NetworkInfo::NetworkInfo() +: networkId(0), + identity(1), + useRandomServer(false), + useAutoIdentify(false), + autoIdentifyService("NickServ"), + useAutoReconnect(true), + autoReconnectInterval(60), + autoReconnectRetries(20), + unlimitedReconnectRetries(false), + rejoinChannels(true) +{ + +} + bool NetworkInfo::operator==(const NetworkInfo &other) const { if(networkId != other.networkId) return false; if(networkName != other.networkName) return false; @@ -856,7 +773,7 @@ QDataStream &operator<<(QDataStream &out, const NetworkInfo &info) { i["CodecForServer"] = info.codecForServer; i["CodecForEncoding"] = info.codecForEncoding; i["CodecForDecoding"] = info.codecForDecoding; - i["ServerList"] = info.serverList; + i["ServerList"] = toVariantList(info.serverList); i["UseRandomServer"] = info.useRandomServer; i["Perform"] = info.perform; i["UseAutoIdentify"] = info.useAutoIdentify; @@ -880,7 +797,7 @@ QDataStream &operator>>(QDataStream &in, NetworkInfo &info) { info.codecForServer = i["CodecForServer"].toByteArray(); info.codecForEncoding = i["CodecForEncoding"].toByteArray(); info.codecForDecoding = i["CodecForDecoding"].toByteArray(); - info.serverList = i["ServerList"].toList(); + info.serverList = fromVariantList(i["ServerList"].toList()); info.useRandomServer = i["UseRandomServer"].toBool(); info.perform = i["Perform"].toStringList(); info.useAutoIdentify = i["UseAutoIdentify"].toBool(); @@ -896,15 +813,70 @@ QDataStream &operator>>(QDataStream &in, NetworkInfo &info) { QDebug operator<<(QDebug dbg, const NetworkInfo &i) { dbg.nospace() << "(id = " << i.networkId << " name = " << i.networkName << " identity = " << i.identity - << " codecForServer = " << i.codecForServer << " codecForEncoding = " << i.codecForEncoding << " codecForDecoding = " << i.codecForDecoding - << " serverList = " << i.serverList << " useRandomServer = " << i.useRandomServer << " perform = " << i.perform - << " useAutoIdentify = " << i.useAutoIdentify << " autoIdentifyService = " << i.autoIdentifyService << " autoIdentifyPassword = " << i.autoIdentifyPassword - << " useAutoReconnect = " << i.useAutoReconnect << " autoReconnectInterval = " << i.autoReconnectInterval - << " autoReconnectRetries = " << i.autoReconnectRetries << " unlimitedReconnectRetries = " << i.unlimitedReconnectRetries - << " rejoinChannels = " << i.rejoinChannels << ")"; + << " codecForServer = " << i.codecForServer << " codecForEncoding = " << i.codecForEncoding << " codecForDecoding = " << i.codecForDecoding + << " serverList = " << i.serverList << " useRandomServer = " << i.useRandomServer << " perform = " << i.perform + << " useAutoIdentify = " << i.useAutoIdentify << " autoIdentifyService = " << i.autoIdentifyService << " autoIdentifyPassword = " << i.autoIdentifyPassword + << " useAutoReconnect = " << i.useAutoReconnect << " autoReconnectInterval = " << i.autoReconnectInterval + << " autoReconnectRetries = " << i.autoReconnectRetries << " unlimitedReconnectRetries = " << i.unlimitedReconnectRetries + << " rejoinChannels = " << i.rejoinChannels << ")"; return dbg.space(); } +QDataStream &operator<<(QDataStream &out, const Network::Server &server) { + QVariantMap serverMap; + serverMap["Host"] = server.host; + serverMap["Port"] = server.port; + serverMap["Password"] = server.password; + serverMap["UseSSL"] = server.useSsl; + serverMap["sslVersion"] = server.sslVersion; + serverMap["UseProxy"] = server.useProxy; + serverMap["ProxyType"] = server.proxyType; + serverMap["ProxyHost"] = server.proxyHost; + serverMap["ProxyPort"] = server.proxyPort; + serverMap["ProxyUser"] = server.proxyUser; + serverMap["ProxyPass"] = server.proxyPass; + out << serverMap; + return out; +} +QDataStream &operator>>(QDataStream &in, Network::Server &server) { + QVariantMap serverMap; + in >> serverMap; + server.host = serverMap["Host"].toString(); + server.port = serverMap["Port"].toUInt(); + server.password = serverMap["Password"].toString(); + server.useSsl = serverMap["UseSSL"].toBool(); + server.sslVersion = serverMap["sslVersion"].toInt(); + server.useProxy = serverMap["UseProxy"].toBool(); + server.proxyType = serverMap["ProxyType"].toInt(); + server.proxyHost = serverMap["ProxyHost"].toString(); + server.proxyPort = serverMap["ProxyPort"].toUInt(); + server.proxyUser = serverMap["ProxyUser"].toString(); + server.proxyPass = serverMap["ProxyPass"].toString(); + return in; +} +bool Network::Server::operator==(const Server &other) const { + if(host != other.host) return false; + if(port != other.port) return false; + if(password != other.password) return false; + if(useSsl != other.useSsl) return false; + if(sslVersion != other.sslVersion) return false; + if(useProxy != other.useProxy) return false; + if(proxyType != other.proxyType) return false; + if(proxyHost != other.proxyHost) return false; + if(proxyPort != other.proxyPort) return false; + if(proxyUser != other.proxyUser) return false; + if(proxyPass != other.proxyPass) return false; + return true; +} + +bool Network::Server::operator!=(const Server &other) const { + return !(*this == other); +} + +QDebug operator<<(QDebug dbg, const Network::Server &server) { + dbg.nospace() << "Server(host = " << server.host << ":" << server.port << ", useSsl = " << server.useSsl << ")"; + return dbg.space(); +}