X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=0dae357e3650fbf14c272960e25ccc98ee4ee9a4;hp=df2a8376788417225175b6854ea61040be960cf0;hb=9d3446581d6f1900806b42078b7d2c16289a5fa5;hpb=a5dfcc8ecf8b81025d24b3c5c816169e3e030ea4 diff --git a/src/common/network.cpp b/src/common/network.cpp index df2a8376..0dae357e 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,34 +17,21 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "network.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; - -Network::Server Network::Server::fromVariant(const QVariant &variant) { - QVariantMap serverMap = variant.toMap(); - return Server(serverMap["Host"].toString(), serverMap["Port"].toUInt(), serverMap["Password"].toString(), serverMap["UseSSL"].toBool()); -} - -QVariant Network::Server::toVariant() const { - QVariantMap serverMap; - serverMap["Host"] = host; - serverMap["Port"] = port; - serverMap["Password"] = password; - serverMap["UseSSL"] = useSsl; - return QVariant::fromValue(serverMap); -} +QString Network::_networksIniPath = QString(); // ==================== // Public: // ==================== +INIT_SYNCABLE_OBJECT(Network) Network::Network(const NetworkId &networkid, QObject *parent) : SyncableObject(parent), _proxy(0), @@ -94,7 +81,7 @@ NetworkInfo Network::networkInfo() const { info.codecForServer = codecForServer(); info.codecForEncoding = codecForEncoding(); info.codecForDecoding = codecForDecoding(); - info.serverList = variantServerList(); + info.serverList = serverList(); info.useRandomServer = useRandomServer(); info.perform = perform(); info.useAutoIdentify = useAutoIdentify(); @@ -115,7 +102,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); @@ -152,16 +139,6 @@ QStringList Network::nicks() const { return nicks; } -QVariantList Network::variantServerList() const { - QVariantList servers; - ServerList::const_iterator serverIter = _serverList.constBegin(); - while(serverIter != _serverList.constEnd()) { - servers << serverIter->toVariant(); - serverIter++; - } - return servers; -} - QString Network::prefixes() { if(_prefixes.isNull()) determinePrefixes(); @@ -225,7 +202,8 @@ IrcUser *Network::newIrcUser(const QString &hostmask, const QVariantMap &initDat _ircUsers[nick] = ircuser; - emit ircUserAdded(hostmask); + SYNC_OTHER(addIrcUser, ARG(hostmask)) + // emit ircUserAdded(hostmask); emit ircUserAdded(ircuser); } @@ -299,7 +277,8 @@ IrcChannel *Network::newIrcChannel(const QString &channelname, const QVariantMap _ircChannels[channelname.toLower()] = channel; - emit ircChannelAdded(channelname); + SYNC_OTHER(addIrcChannel, ARG(channelname)) + // emit ircChannelAdded(channelname); emit ircChannelAdded(channel); } return _ircChannels[channelname.toLower()]; @@ -355,7 +334,9 @@ void Network::setCodecForServer(const QByteArray &name) { void Network::setCodecForServer(QTextCodec *codec) { _codecForServer = codec; - emit codecForServerSet(codecForServer()); + QByteArray codecName = codecForServer(); + SYNC_OTHER(setCodecForServer, ARG(codecName)) + emit configChanged(); } QByteArray Network::codecForEncoding() const { @@ -370,7 +351,9 @@ void Network::setCodecForEncoding(const QByteArray &name) { void Network::setCodecForEncoding(QTextCodec *codec) { _codecForEncoding = codec; - emit codecForEncodingSet(codecForEncoding()); + QByteArray codecName = codecForEncoding(); + SYNC_OTHER(setCodecForEncoding, ARG(codecName)) + emit configChanged(); } QByteArray Network::codecForDecoding() const { @@ -385,7 +368,9 @@ void Network::setCodecForDecoding(const QByteArray &name) { void Network::setCodecForDecoding(QTextCodec *codec) { _codecForDecoding = codec; - emit codecForDecodingSet(codecForDecoding()); + QByteArray codecName = codecForDecoding(); + SYNC_OTHER(setCodecForDecoding, ARG(codecName)) + emit configChanged(); } // FIXME use server encoding if appropriate @@ -422,16 +407,81 @@ 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: // ==================== void Network::setNetworkName(const QString &networkName) { _networkName = networkName; + SYNC(ARG(networkName)) emit networkNameSet(networkName); + emit configChanged(); } void Network::setCurrentServer(const QString ¤tServer) { _currentServer = currentServer; + SYNC(ARG(currentServer)) emit currentServerSet(currentServer); } @@ -445,6 +495,7 @@ void Network::setConnected(bool connected) { setCurrentServer(QString()); removeChansAndUsers(); } + SYNC(ARG(connected)) emit connectedSet(connected); } @@ -452,7 +503,7 @@ void Network::setConnected(bool connected) { void Network::setConnectionState(int state) { _connectionState = (ConnectionState)state; //qDebug() << "netstate" << networkId() << networkName() << state; - emit connectionStateSet(state); + SYNC(ARG(state)) emit connectionStateSet(_connectionState); } @@ -461,6 +512,7 @@ void Network::setMyNick(const QString &nickname) { if(!_myNick.isEmpty() && !ircUser(myNick())) { newIrcUser(myNick()); } + SYNC(ARG(nickname)) emit myNickSet(nickname); } @@ -468,83 +520,93 @@ void Network::setLatency(int latency) { if(_latency == latency) return; _latency = latency; - emit latencySet(latency); + SYNC(ARG(latency)) } void Network::setIdentity(IdentityId id) { _identity = id; + SYNC(ARG(id)) emit identitySet(id); + emit configChanged(); } void Network::setServerList(const QVariantList &serverList) { - _serverList.clear(); - foreach(QVariant variant, serverList) { - _serverList << Server::fromVariant(variant); - } - emit serverListSet(serverList); + _serverList = fromVariantList(serverList); + SYNC(ARG(serverList)) + emit configChanged(); } void Network::setUseRandomServer(bool use) { _useRandomServer = use; - emit useRandomServerSet(use); + SYNC(ARG(use)) + emit configChanged(); } void Network::setPerform(const QStringList &perform) { _perform = perform; - emit performSet(perform); + SYNC(ARG(perform)) + emit configChanged(); } void Network::setUseAutoIdentify(bool use) { _useAutoIdentify = use; - emit useAutoIdentifySet(use); + SYNC(ARG(use)) + emit configChanged(); } void Network::setAutoIdentifyService(const QString &service) { _autoIdentifyService = service; - emit autoIdentifyServiceSet(service); + SYNC(ARG(service)) + emit configChanged(); } void Network::setAutoIdentifyPassword(const QString &password) { _autoIdentifyPassword = password; - emit autoIdentifyPasswordSet(password); + SYNC(ARG(password)) + emit configChanged(); } void Network::setUseAutoReconnect(bool use) { _useAutoReconnect = use; - emit useAutoReconnectSet(use); + SYNC(ARG(use)) + emit configChanged(); } void Network::setAutoReconnectInterval(quint32 interval) { _autoReconnectInterval = interval; - emit autoReconnectIntervalSet(interval); + SYNC(ARG(interval)) + emit configChanged(); } void Network::setAutoReconnectRetries(quint16 retries) { _autoReconnectRetries = retries; - emit autoReconnectRetriesSet(retries); + SYNC(ARG(retries)) + emit configChanged(); } void Network::setUnlimitedReconnectRetries(bool unlimited) { _unlimitedReconnectRetries = unlimited; - emit unlimitedReconnectRetriesSet(unlimited); + SYNC(ARG(unlimited)) + emit configChanged(); } void Network::setRejoinChannels(bool rejoin) { _rejoinChannels = rejoin; - emit rejoinChannelsSet(rejoin); + SYNC(ARG(rejoin)) + emit configChanged(); } void Network::addSupport(const QString ¶m, const QString &value) { if(!_supports.contains(param)) { _supports[param] = value; - emit supportAdded(param, value); + SYNC(ARG(param), ARG(value)) } } void Network::removeSupport(const QString ¶m) { if(_supports.contains(param)) { _supports.remove(param); - emit supportRemoved(param); + SYNC(ARG(param)) } } @@ -614,12 +676,6 @@ void Network::initSetSupports(const QVariantMap &supports) { } } -void Network::initSetServerList(const QVariantList &serverList) { - foreach(QVariant variant, serverList) { - _serverList << Server::fromVariant(variant); - } -} - IrcUser *Network::updateNickFromMask(const QString &mask) { QString nick(nickFromMask(mask).toLower()); IrcUser *ircuser; @@ -696,6 +752,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; @@ -729,7 +800,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; @@ -753,7 +824,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(); @@ -769,11 +840,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(); }