X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=c71b5c2c5b4a2233f9e00a197011f1dde00fb5e6;hp=fc8b508ded73c705ea188e681728408f0fe46346;hb=cd37744f0a2cd8ffe027892ddce5c7d6f4848ab0;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/common/network.cpp b/src/common/network.cpp
index fc8b508d..c71b5c2c 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -17,14 +17,16 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "network.h"
-
-#include <QDebug>
+#include <QSettings>
 #include <QTextCodec>
 
+#include "network.h"
+#include "quassel.h"
+
 QTextCodec *Network::_defaultCodecForServer = 0;
 QTextCodec *Network::_defaultCodecForEncoding = 0;
 QTextCodec *Network::_defaultCodecForDecoding = 0;
+QString Network::_networksIniPath = QString();
 
 // ====================
 //  Public:
@@ -396,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<QString, QString> 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:
 // ====================
@@ -661,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;