add rooster ranges, remove woogerworks (#3163)

cockatrice/src/dlg_connect.cpp

@@ -167,11 +167,15 @@ void DlgConnect::rebuildComboBoxList()
     savedHostList = uci.getServerInfo();
 
     if (savedHostList.size() == 1) {
-        settingsCache->servers().addNewServer("Woogerworks", "cockatrice.woogerworks.com", "4747", "", "", false);
+        settingsCache->servers().addNewServer("Rooster Ranges", "server.cockatrice.us", "4747", "", "", false);
         settingsCache->servers().addNewServer("Chickatrice", "chickatrice.net", "4747", "", "", false);
         settingsCache->servers().addNewServer("dr4ft", "cockatrice.dr4ft.com", "4747", "", "", false);
         settingsCache->servers().addNewServer("Tetrarch", "mtg.tetrarch.co", "4747", "", "", false);
+    } else if (!savedHostList.contains("Rooster Ranges")) {
+        settingsCache->servers().addNewServer("Rooster Ranges", "server.cockatrice.us", "4747", "", "", false);
+        settingsCache->servers().removeServer("Woogerworks");
     }
+
     savedHostList = uci.getServerInfo();
 
     int i = 0;

cockatrice/src/dlg_forgotpasswordchallenge.cpp

@@ -15,7 +15,7 @@ DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialo
     QString lastfphost;
     QString lastfpport;
     QString lastfpplayername;
-    lastfphost = settingsCache->servers().getHostname("cockatrice.woogerworks.com");
+    lastfphost = settingsCache->servers().getHostname("server.cockatrice.us");
     lastfpport = settingsCache->servers().getPort("4747");
     lastfpplayername = settingsCache->servers().getPlayerName("Player");
 

cockatrice/src/dlg_forgotpasswordrequest.cpp

@@ -15,7 +15,7 @@ DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(pa
     QString lastfphost;
     QString lastfpport;
     QString lastfpplayername;
-    lastfphost = settingsCache->servers().getHostname("cockatrice.woogerworks.com");
+    lastfphost = settingsCache->servers().getHostname("server.cockatrice.us");
     lastfpport = settingsCache->servers().getPort("4747");
     lastfpplayername = settingsCache->servers().getPlayerName("Player");
 

cockatrice/src/dlg_forgotpasswordreset.cpp

@@ -15,7 +15,7 @@ DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent
     QString lastfphost;
     QString lastfpport;
     QString lastfpplayername;
-    lastfphost = settingsCache->servers().getHostname("cockatrice.woogerworks.com");
+    lastfphost = settingsCache->servers().getHostname("server.cockatrice.us");
     lastfpport = settingsCache->servers().getPort("4747");
     lastfpplayername = settingsCache->servers().getPlayerName("Player");
 

cockatrice/src/dlg_register.cpp

@@ -13,7 +13,7 @@
 DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
 {
     hostLabel = new QLabel(tr("&Host:"));
-    hostEdit = new QLineEdit(settingsCache->servers().getHostname("cockatrice.woogerworks.com"));
+    hostEdit = new QLineEdit(settingsCache->servers().getHostname("server.cockatrice.us"));
     hostLabel->setBuddy(hostEdit);
 
     portLabel = new QLabel(tr("&Port:"));

cockatrice/src/settings/serverssettings.cpp

@@ -196,6 +196,23 @@ void ServersSettings::addNewServer(QString saveName,
     setValue(password, QString("password%1").arg(index), "server", "server_details");
 }
 
+void ServersSettings::removeServer(QString saveName)
+{
+    int size = getValue("totalServers", "server", "server_details").toInt() + 1;
+
+    for (int i = 0; i < size; i++) {
+        if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString()) {
+            deleteValue(QString("server%1").arg(i), "server", "server_details");
+            deleteValue(QString("port%1").arg(i), "server", "server_details");
+            deleteValue(QString("username%1").arg(i), "server", "server_details");
+            deleteValue(QString("savePassword%1").arg(i), "server", "server_details");
+            deleteValue(QString("password%1").arg(i), "server", "server_details");
+            deleteValue(QString("saveName%1").arg(i), "server", "server_details");
+            return;
+        }
+    }
+}
+
 bool ServersSettings::updateExistingServer(QString saveName,
                                            QString serv,
                                            QString port,

cockatrice/src/settings/serverssettings.h

@@ -39,6 +39,7 @@ public:
     void setFPPlayerName(QString playerName);
     void
     addNewServer(QString saveName, QString serv, QString port, QString username, QString password, bool savePassword);
+    void removeServer(QString saveName);
     bool updateExistingServer(QString saveName,
                               QString serv,
                               QString port,

cockatrice/src/settings/settingsmanager.cpp

@@ -26,6 +26,27 @@ void SettingsManager::setValue(QVariant value, QString name, QString group, QStr
     }
 }
 
+void SettingsManager::deleteValue(QString name, QString group, QString subGroup)
+{
+    if (!group.isEmpty()) {
+        settings.beginGroup(group);
+    }
+
+    if (!subGroup.isEmpty()) {
+        settings.beginGroup(subGroup);
+    }
+
+    settings.remove(name);
+
+    if (!subGroup.isEmpty()) {
+        settings.endGroup();
+    }
+
+    if (!group.isEmpty()) {
+        settings.endGroup();
+    }
+}
+
 QVariant SettingsManager::getValue(QString name, QString group, QString subGroup)
 {
     if (!group.isEmpty()) {

cockatrice/src/settings/settingsmanager.h

@@ -10,7 +10,7 @@ class SettingsManager : public QObject
 {
     Q_OBJECT
 public:
-    SettingsManager(QString settingPath, QObject *parent = 0);
+    explicit SettingsManager(QString settingPath, QObject *parent = nullptr);
     QVariant getValue(QString name, QString group = "", QString subGroup = "");
 
 signals:
@@ -20,6 +20,7 @@ public slots:
 protected:
     QSettings settings;
     void setValue(QVariant value, QString name, QString group = "", QString subGroup = "");
+    void deleteValue(QString name, QString group = "", QString subGroup = "");
 };
 
 #endif // SETTINGSMANAGER_H

webclient/index.html

@@ -89,7 +89,7 @@ Loading cockatrice web client...
   $( "#host" ).autocomplete({
     source: [
       // add custom servers here
-      "cockatrice.woogerworks.com",
+      "server.cockatrice.us",
       "chickatrice.net",
       "127.0.0.1"
     ]