[0.1.0][enhancement][0][细化room表的列,以便查询][core|network]

Author: takashiro

data/lobby.sql

@@ -0,0 +1,17 @@
+CREATE TABLE `room` (
+    `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+    `hostaddress` varchar(21),
+    `playernum` int,
+    `name` varchar(50),
+    `gamemode` varchar(20),
+    `banpackages` text,
+    `operationtimeout` int,
+    `nullificationcountdown` int,
+    `randomseat` boolean,
+    `enablecheat` boolean,
+    `freechoose` boolean,
+    `forbidaddingrobot` boolean,
+    `disablechat` boolean,
+    `firstshowingreward` boolean,
+    `requirepassword` boolean
+);

src/client/client.cpp

@@ -365,19 +365,18 @@ void Client::checkVersion(const QVariant &server_version) {
     emit version_checked(version_number, mod_name);
 }
 
-void Client::setup(const QVariant &setup_json) {
+void Client::setup(const QVariant &setup) {
     if (socket && !socket->isConnected())
         return;
 
-    QString setup_str = setup_json.toString();
-    if (ServerInfo.parse(setup_str)) {
+    if (ServerInfo.parse(setup)) {
         if (replayer) {
             ServerInfo.OperationTimeout = 0;
         } else {
             recorder = new Recorder(this);
 
             Packet setup_packet(S_SRC_ROOM | S_TYPE_NOTIFICATION | S_DEST_CLIENT, S_COMMAND_SETUP);
-            setup_packet.setMessageBody(setup_json);
+            setup_packet.setMessageBody(setup);
             recorder->recordLine(setup_packet.toJson());
         }
 
@@ -392,6 +391,8 @@ void Client::setup(const QVariant &setup_json) {
         emit roomServerConnected();
         notifyServer(S_COMMAND_TOGGLE_READY);
     } else {
+        JsonDocument doc(setup);
+        QString setup_str = QString::fromUtf8(doc.toJson());
         QMessageBox::warning(NULL, tr("Warning"), tr("Setup string can not be parsed: %1").arg(setup_str));
     }
 }

src/client/client.h

@@ -115,7 +115,7 @@ class Client : public QObject {
     typedef void (Client::*Callback) (const QVariant &);
 
     void checkVersion(const QVariant &server_version);
-    void setup(const QVariant &setup_str);
+    void setup(const QVariant &setup);
     void networkDelayTest(const QVariant &);
     void addPlayer(const QVariant &player_info);
     void removePlayer(const QVariant &player_name);

src/client/clientstruct.cpp

@@ -24,91 +24,13 @@
 #include "settings.h"
 #include "json.h"
 
-ServerInfoStruct ServerInfo;
+RoomInfoStruct ServerInfo;
 
 #include <QFormLayout>
 #include <QLabel>
 #include <QListWidget>
 #include <QCheckBox>
 
-time_t ServerInfoStruct::getCommandTimeout(QSanProtocol::CommandType command, QSanProtocol::ProcessInstanceType instance) {
-    time_t timeOut;
-    if (OperationTimeout == 0)
-        return 0;
-    else if (command == QSanProtocol::S_COMMAND_CHOOSE_GENERAL)
-        timeOut = OperationTimeout * 1500;
-    else if (command == QSanProtocol::S_COMMAND_SKILL_GUANXING
-        || command == QSanProtocol::S_COMMAND_ARRANGE_GENERAL)
-        timeOut = OperationTimeout * 2000;
-    else if (command == QSanProtocol::S_COMMAND_NULLIFICATION)
-        timeOut = NullificationCountDown * 1000;
-    else
-        timeOut = OperationTimeout * 1000;
-
-    if (instance == QSanProtocol::S_SERVER_INSTANCE)
-        timeOut += Config.S_SERVER_TIMEOUT_GRACIOUS_PERIOD;
-    return timeOut;
-}
-
-bool ServerInfoStruct::parse(const QString &str) {
-    QRegExp rx("(.*):(@?\\w+):(\\d+):(\\d+):([\\w-]+(?:\\+[\\w-]+)*)?:([RCFAMSP]*)");
-    if (!rx.exactMatch(str)) {
-        // older version, just take the player count
-        int count = str.split(":").at(1).toInt();
-        GameMode = QString("%1p").arg(count, 2, 10, QChar('0'));
-        return false;
-    }
-
-    QStringList texts = rx.capturedTexts();
-    if (texts.isEmpty()) {
-        DuringGame = false;
-    }
-    else {
-        DuringGame = true;
-
-        Name = texts.at(1);
-
-        GameMode = texts.at(2);
-        OperationTimeout = texts.at(3).toInt();
-        NullificationCountDown = texts.at(4).toInt();
-
-        QStringList ban_packages = texts.at(5).split("+");
-        const QList<const Package *> &packages = Sanguosha->getPackages();
-        Extensions.clear();
-        foreach(const Package *package, packages) {
-            QString package_name = package->objectName();
-            if (ban_packages.contains(package_name))
-                package_name = "!" + package_name;
-
-            Extensions << package_name;
-        }
-
-        QString flags = texts.at(6);
-
-        RandomSeat = flags.contains("R");
-        EnableCheat = flags.contains("C");
-        FreeChoose = EnableCheat && flags.contains("F");
-        ForbidAddingRobot = flags.contains("A");
-        DisableChat = flags.contains("M");
-        FirstShowingReward = flags.contains("S");
-        RequirePassword = flags.contains("P");
-    }
-
-    return true;
-}
-
-bool RoomInfoStruct::parse(const QVariant &data)
-{
-    JsonArray args = data.value<JsonArray>();
-    if (args.size() != 4 || !ServerInfoStruct::parse(args.at(1).toString())) {
-        return false;
-    }
-    RoomId = args.at(0).toLongLong();
-    HostAddress = args.at(2).toString();
-    PlayerNum = args.at(3).toInt();
-    return true;
-}
-
 ServerInfoWidget::ServerInfoWidget(bool show_lack) {
     name_label = new QLabel;
     address_label = new QLabel;
@@ -150,7 +72,7 @@ ServerInfoWidget::ServerInfoWidget(bool show_lack) {
     setLayout(layout);
 }
 
-void ServerInfoWidget::fill(const ServerInfoStruct &info, const QString &address) {
+void ServerInfoWidget::fill(const RoomInfoStruct &info, const QString &address) {
     name_label->setText(info.Name);
     address_label->setText(address);
     game_mode_label->setText(Sanguosha->getModeName(info.GameMode));
@@ -174,11 +96,9 @@ void ServerInfoWidget::fill(const ServerInfoStruct &info, const QString &address
     static QIcon enabled_icon("image/system/enabled.png");
     static QIcon disabled_icon("image/system/disabled.png");
 
-    foreach(QString extension, info.Extensions) {
-        bool checked = !extension.startsWith("!");
-        if (!checked)
-            extension.remove("!");
-
+    QStringList extentions = Sanguosha->getExtensions();
+    foreach (const QString &extension, extentions) {
+        bool checked = !info.BanPackages.contains(extension);
         QString package_name = Sanguosha->translate(extension);
         QCheckBox *checkbox = new QCheckBox(package_name);
         checkbox->setChecked(checked);

src/client/clientstruct.h

@@ -24,50 +24,22 @@
 #include "player.h"
 #include "qsanselectableitem.h"
 #include "protocol.h"
+#include "roomconfig.h"
+
 #include <QMap>
 #include <QWidget>
 
-struct ServerInfoStruct {
-    bool parse(const QString &str);
-    //Get the timeout allowance for a command. Server countdown is more lenient than the client.
-    //@param command: type of command
-    //@return countdown for command in milliseconds.
-    time_t getCommandTimeout(QSanProtocol::CommandType command, QSanProtocol::ProcessInstanceType instance);
-
-    QString Name;
-    QString GameMode;
-    int OperationTimeout;
-    int NullificationCountDown;
-    QStringList Extensions;
-    bool RandomSeat;
-    bool EnableCheat;
-    bool FreeChoose;
-    bool ForbidAddingRobot;
-    bool DisableChat;
-    bool FirstShowingReward;
-    bool RequirePassword;
-    bool DuringGame;
-};
-
-extern ServerInfoStruct ServerInfo;
-
-struct RoomInfoStruct : public ServerInfoStruct {
-    qlonglong RoomId;
-    QString HostAddress;
-    int PlayerNum;
-
-    bool parse(const QVariant &data);
-};
-
 class QLabel;
 class QListWidget;
 
+extern RoomInfoStruct ServerInfo;
+
 class ServerInfoWidget : public QWidget {
     Q_OBJECT
 
 public:
     ServerInfoWidget(bool show_lack = false);
-    void fill(const ServerInfoStruct &info, const QString &address);
+    void fill(const RoomInfoStruct &info, const QString &address);
     void updateLack(int count);
     void clear();
 

src/core/record-analysis.cpp

@@ -62,33 +62,25 @@ void RecAnalysis::initialize(const QString &dir) {
             continue;
 
         if (packet.getCommandType() == S_COMMAND_SETUP){
-            const QVariant &body = packet.getMessageBody();
-            if (JsonUtils::isString(body)){
-                QString l = body.toString();
-                QRegExp rx("(.*):(@?\\w+):(\\d+):(\\d+):([+\\w-]*):([RCFSTBHAMNP123a-r]*)(\\s+)?");
-                if (!rx.exactMatch(l))
-                    continue;
-
-                QStringList texts = rx.capturedTexts();
-                m_recordGameMode = texts.at(2);
-                m_recordPlayers = texts.at(2).split("_").first().remove(QRegExp("[^0-9]")).toInt();
-                QStringList ban_packages = texts.at(5).split("+");
+            RoomInfoStruct config;
+            if (config.parse(packet.getMessageBody())){
+                m_recordGameMode = config.GameMode;
+                m_recordPlayers = m_recordGameMode.split("_").first().remove(QRegExp("[^0-9]")).toInt();
                 foreach(const Package *package, Sanguosha->getPackages()) {
-                    if (!ban_packages.contains(package->objectName())
+                    if (!config.BanPackages.contains(package->objectName())
                         && Sanguosha->getScenario(package->objectName()) == NULL)
                         m_recordPackages << Sanguosha->translate(package->objectName());
                 }
 
-                QString flags = texts.at(6);
-                if (flags.contains("R")) m_recordServerOptions << tr("RandomSeats");
-                if (flags.contains("C")) m_recordServerOptions << tr("EnableCheat");
-                if (flags.contains("F")) m_recordServerOptions << tr("FreeChoose");
-                if (flags.contains("S")) m_recordServerOptions << tr("Enable2ndGeneral");
-                if (flags.contains("T")) m_recordServerOptions << tr("EnableSame");
-                if (flags.contains("N")) m_recordServerOptions << tr("EnableScene");
-                if (flags.contains("B")) m_recordServerOptions << tr("EnableBasara");
-                if (flags.contains("H")) m_recordServerOptions << tr("EnableHegemony");
-                if (flags.contains("A")) m_recordServerOptions << tr("EnableAI");
+                if (config.RandomSeat) m_recordServerOptions << tr("RandomSeats");
+                if (config.EnableCheat) m_recordServerOptions << tr("EnableCheat");
+                if (config.FreeChoose) m_recordServerOptions << tr("FreeChoose");
+                //if (config.EnableCheat) m_recordServerOptions << tr("Enable2ndGeneral");
+                //if (flags.contains("T")) m_recordServerOptions << tr("EnableSame");
+                //if (flags.contains("N")) m_recordServerOptions << tr("EnableScene");
+                //if (flags.contains("B")) m_recordServerOptions << tr("EnableBasara");
+                //if (flags.contains("H")) m_recordServerOptions << tr("EnableHegemony");
+                if (!config.ForbidAddingRobot) m_recordServerOptions << tr("EnableAI");
 
                 continue;
             }