[0.1.0][enhancement][0][避免多处重复de读写录像代码][record|client]

Mogara · Jan 13, 2015 · a6243e8 · a6243e8
1 parent 185d5be
commit a6243e8
Show file tree

Hide file tree

Showing 7 changed files with 271 additions and 169 deletions.
diff --git a/src/client/client.cpp b/src/client/client.cpp
@@ -162,7 +162,7 @@ Client::Client(QObject *parent, const QString &filename)
         socket = NULL;
 
         replayer = new Replayer(filename, this);
-        connect(replayer, &Replayer::command_parsed, this, &Client::processServerPacket);
+        connect(replayer, &Replayer::commandParsed, this, &Client::processServerPacket);
     } else {
         socket = new NativeClientSocket(this);
         connect(socket, &NativeClientSocket::message_got, this, &Client::processServerPacket);

diff --git a/src/core/record-analysis.cpp b/src/core/record-analysis.cpp
@@ -33,28 +33,20 @@ RecAnalysis::RecAnalysis(const QString &dir) : m_recordPlayers(0), m_currentPlay
     initialize(dir);
 }
 
-void RecAnalysis::initialize(const QString &dir) {
+void RecAnalysis::initialize(const QString &fileName) {
     QList<QByteArray> records_line;
-    if (dir.isEmpty()) {
+    if (fileName.isEmpty()) {
         records_line = ClientInstance->getRecords();
-    } else if (dir.endsWith(".qsgs")) {
-        QFile file(dir);
-        if (file.open(QIODevice::ReadOnly)) {
-            char header;
-            file.getChar(&header);
-            if (header == 0) {
-                QByteArray lines = file.readAll();
-                lines = qUncompress(lines);
-                records_line = lines.split('\n');
-            } else {
-                file.ungetChar(header);
-                while (!file.atEnd())
-                    records_line << file.readLine();
-            }
-        }
     } else {
-        QMessageBox::warning(NULL, tr("Warning"), tr("The file is unreadable"));
-        return;
+        Record record(fileName);
+        if (!record.open()) {
+            QMessageBox::warning(NULL, tr("Warning"), tr("The file is unreadable"));
+            return;
+        }
+
+        const QList<Record::Command> &commands = record.commands();
+        foreach (const Record::Command &command, commands)
+            records_line << command.data;
     }
     records_line.removeAll(QByteArray());
 

diff --git a/src/core/record-analysis.h b/src/core/record-analysis.h
@@ -53,7 +53,7 @@ class RecAnalysis : public QObject {
         ZeroDamaged = 0x800
     };
 
-    void initialize(const QString &dir = QString());
+    void initialize(const QString &fileName = QString());
     PlayerRecordStruct *getPlayerRecord(const Player *player) const;
     QMap<QString, PlayerRecordStruct *> getRecordMap() const;
     QStringList getRecordPackages() const;

diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp
@@ -1074,33 +1074,20 @@ void MainWindow::on_actionReplay_file_convert_triggered() {
         return;
 
     foreach (const QString &filename, filenames) {
-        QFile file(filename);
-        if (file.open(QIODevice::ReadOnly)) {
+        Record record(filename);
+        if (record.open()) {
             QFileInfo info(filename);
-            QString tosave = info.absoluteDir().absoluteFilePath(info.baseName());
-
-            char header;
-            file.getChar(&header);
-            if (header == '\0') {
-                QByteArray content = file.readAll();
-                content = qUncompress(content);
+            QString tosave = info.dir().absoluteFilePath(info.baseName());
 
+            if (record.format() == Record::CompressedText) {
                 tosave.append("-uncompressed.qsgs");
-                QFile file(tosave);
-                if (file.open(QFile::WriteOnly | QFile::Text))
-                    file.write(content);
+                record.setFormat(Record::PlainText);
             } else {
-                file.ungetChar(header);
-                QByteArray content = file.readAll();
-                content = qCompress(content);
-
                 tosave.append("-compressed.qsgs");
-                QFile file(tosave);
-                if (file.open(QFile::WriteOnly)) {
-                    file.putChar('\0');
-                    file.write(content);
-                }
+                record.setFormat(Record::CompressedText);
             }
+
+            record.saveAs(tosave);
         }
     }
 }

diff --git a/src/ui/roomscene.cpp b/src/ui/roomscene.cpp
@@ -711,7 +711,7 @@ ReplayerControlBar::ReplayerControlBar(Dashboard *dashboard) {
     connect(slow_down, &QSanButton::clicked, replayer, &Replayer::slowDown);
     connect(speed_up, &QSanButton::clicked, replayer, &Replayer::speedUp);
     connect(replayer, &Replayer::elasped, this, &ReplayerControlBar::setTime);
-    connect(replayer, &Replayer::speed_changed, this, &ReplayerControlBar::setSpeed);
+    connect(replayer, &Replayer::speedChanged, this, &ReplayerControlBar::setSpeed);
 
     speed = replayer->getSpeed();
     setParentItem(dashboard);