Constanta-Design/RRJClient
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git synced 2026-03-28 05:25:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

fear: add copy version

Browse Source
This commit is contained in:
semenov
2024-12-20 12:00:26 +03:00
parent c48831b77e
commit 7e13c6dc5d
57 changed files with 1402 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/UpdateController.cpp
View File

@@ -20,7 +20,7 @@ void UpdateController::calculateCommonHash()
appDataList = calculateHash(applicationFolderPath,"StreamingAssets");
calculateStreamingHash();
appDataList.append(streamingDataList);
dataParser->createFileDataList(appDataList,QDir::currentPath() + hashFilename);
dataParser->createFileDataList(appDataList,fullStaticDataFolderName + hashFilename);
qDebug() << "UpdateController threadID " << QThread::currentThreadId();
}
@@ -29,7 +29,7 @@ void UpdateController::calculateStreamingHash()
streamingDataList.clear();
streamingDataList = calculateHash(QDir::currentPath() + streamingAssetsPath,"");
std::sort(streamingDataList.begin(),streamingDataList.end());
dataParser->createFileDataList(streamingDataList,QDir::currentPath() + streamingHashFilename);
dataParser->createFileDataList(streamingDataList,streamingHashFilename);
}
void UpdateController::setServerVersion(StreamingVersionData *version)

6
Core/dataparser.cpp
View File

@@ -8,8 +8,8 @@
DataParser::DataParser(QObject *parent) :
QObject(parent)
{
if(!QDir(staticDataFolderName).exists()){
QDir().mkdir(staticDataFolderName);
if(!QDir(fullStaticDataFolderName).exists()){
QDir().mkdir(fullStaticDataFolderName);
}
}
@@ -167,7 +167,7 @@ void DataParser::addRunData(QList<int> displays)
ServerSettings *DataParser::getServerSettings()
{
ServerSettings *settings = new ServerSettings;
QFile file(QDir::currentPath() + settingsName);
QFile file(settingsName);
file.open(QIODevice::ReadOnly);
QXmlStreamReader xmlReader(&file);

4
Core/hashcomparer.cpp
View File

@@ -21,13 +21,13 @@ void HashComparer::CompareDeltas()
QList<FileData> *localStreamingHash = new QList<FileData>;
QList<FileData> *files = new QList<FileData>;
QFile file(QDir::currentPath() + serverHash);
QFile file(serverHash);
file.open(QIODevice::ReadOnly | QIODevice::Text);
serverStreamingHash = dataParser->xmlFileDataParse(file.readAll(),"StreamingAssets");
file.close();
QFile file2(QDir::currentPath() + streamingHashFilename);
QFile file2(streamingHashFilename);
file2.open(QIODevice::ReadOnly | QIODevice::Text);
localStreamingHash = dataParser->xmlFileDataParse(file2.readAll(),"StreamingAssets");

4
Core/sendsystem.cpp
View File

@@ -149,13 +149,13 @@ void SendSystem::sendChangeVersion(StreamingVersionData* streamingVersion)
socket->waitForReadyRead(100);
}
void SendSystem::sendCopyVersion(StreamingVersionData *streamingVersion)
void SendSystem::sendCopyVersion(QString streamingVersion)
{
QDataStream stream(socket);
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
stream << PacketType::COPY_VERSION;
stream << streamingVersion->getViewName();
stream << streamingVersion;
}
SendSystem::~SendSystem()

2
Core/sendsystem.h
View File

@@ -29,7 +29,7 @@ public:
~SendSystem();
void sendChangeVersion(StreamingVersionData *streamingVersion);
void sendCopyVersion(StreamingVersionData* streamingVersion);
void sendCopyVersion(QString versionName);
signals:
void sigSend();
QByteArray sigGetXmlAnswer(QString);

2
Core/tcpclient.cpp
View File

@@ -86,7 +86,7 @@ void TCPClient::slotSendCommand(QString command)
stream << command;
socket->waitForBytesWritten();
sendSystem->sendFileBlock("/" + hashFilename);
sendSystem->sendFileBlock(staticDataFolderName + hashFilename);
emit sigSendDebugLog(Tools::getTime() + " Local checkFile sended");
socket->waitForReadyRead(1000);

16
Core/tools.h
View File

@@ -6,20 +6,22 @@
#include <QString>
#include <QTime>
#include <QDebug>
#include <QDir>
#define TCP_READ_TIMEOUT 2000
static QString applicationEXEName = "RRJ.exe";
static QString applicationFolderName = "/Application";
static QString staticDataFolderName = "/StaticData";
static QString fullStaticDataFolderName = QDir::currentPath() + staticDataFolderName;
static QString streamingAssetsPath = "/Application/RRJLoader/RRJ_Data/StreamingAssets";
static QString hashFilename = staticDataFolderName + "/clientHash.xml";
static QString settingsName = staticDataFolderName + "/settings.xml";
static QString tempName = staticDataFolderName + "/temp.xml";
static QString authTempName = staticDataFolderName + "/authData.xml";
static QString displayTemp = staticDataFolderName + "/displayData.xml";
static QString streamingHashFilename = staticDataFolderName + "/streamingHash.xml";
static QString serverHash = staticDataFolderName + "/serverHash.xml";
static QString hashFilename = "/clientHash.xml";
static QString settingsName = fullStaticDataFolderName + "/settings.xml";
static QString tempName = fullStaticDataFolderName + "/temp.xml";
static QString authTempName = fullStaticDataFolderName + "/authData.xml";
static QString displayTemp = fullStaticDataFolderName + "/displayData.xml";
static QString streamingHashFilename = fullStaticDataFolderName + "/streamingHash.xml";
static QString serverHash = fullStaticDataFolderName + "/serverHash.xml";
static QString cmd_CheckVersionList = "CHECKVERSIONLIST";
static QString cmd_GetServerHash = "GETSERVERDATALIST";