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

feat: update controller add sort

Browse Source
This commit is contained in:
semenov
2024-12-17 12:56:20 +03:00
parent b9f7ef3369
commit 7aeb9d8000
16 changed files with 165 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Core/FileData.h
View File

@@ -9,11 +9,17 @@ struct FileData
QString path;
QString hash;
bool operator==(const FileData& other)const{
bool operator==(const FileData& other)const
{
if(this->path==(other.path)) return true;
return false;
}
bool operator<(const FileData& data2) const
{
return this->hash == "FOLDER" && data2.hash !="FOLDER";
}
}; //путь
struct SAttribute

13
Core/UpdateController.cpp
View File

@@ -12,8 +12,9 @@ UpdateController::UpdateController(DataParser *parser,SendSystem *sendSystem, QO
void UpdateController::calculateCommonHash()
{
appDataList.clear();
appDataList = calculateHash(applicationFolderPath);
appDataList = calculateHash(applicationFolderPath,"StreamingAssets");
calculateStreamingHash();
appDataList.append(streamingDataList);
dataParser->createFileDataList(appDataList,hashFilename);
qDebug() << "UpdateController threadID " << QThread::currentThreadId();
}
@@ -21,8 +22,9 @@ void UpdateController::calculateCommonHash()
void UpdateController::calculateStreamingHash()
{
streamingDataList.clear();
streamingDataList = calculateHash(QDir::currentPath() + streamingAssetsPath);
dataParser->createFileDataList(appDataList,streamingHashFilename);
streamingDataList = calculateHash(QDir::currentPath() + streamingAssetsPath,"");
std::sort(streamingDataList.begin(),streamingDataList.end());
dataParser->createFileDataList(streamingDataList,streamingHashFilename);
}
void UpdateController::setServerVersion(StreamingVersionData *version)
@@ -30,7 +32,7 @@ void UpdateController::setServerVersion(StreamingVersionData *version)
serverVersion = version;
}
QList<FileData> UpdateController::calculateHash(QString path)
QList<FileData> UpdateController::calculateHash(QString path,QString ignoreName)
{
qDebug() << "Try calculate";
@@ -56,6 +58,7 @@ QList<FileData> UpdateController::calculateHash(QString path)
const quint64 bufferSize = 10240;
if(fileInfo.isHidden()) continue;
if(ignoreName != "" && fileInfo.path().contains(ignoreName)) continue;
if(fileInfo.isFile() && file.open(QIODevice::ReadOnly))
{
@@ -90,6 +93,8 @@ QList<FileData> UpdateController::calculateHash(QString path)
}
std::sort(hashes->begin(),hashes->end());
return *hashes;
}

2
Core/UpdateController.h
View File

@@ -47,7 +47,7 @@ private:
QList<FileData> streamingDataList;
StreamingVersionData *serverVersion;
QList<FileData> calculateHash(QString path);
QList<FileData> calculateHash(QString path,QString ignoreName);
};