Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

refact2

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-02-24 11:17:48 +03:00
parent a1f3e04fad
commit a0e54c0e18
8 changed files with 79 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
LibServer/clienthandler/clienthandler.cpp
View File

@@ -44,14 +44,14 @@ void ClientHandler::initialize(int descriptor,
connect(this,&ClientHandler::sigSendXmlAnswer,sendSystem,&SendSystem::slot_sendXmlAnswer,Qt::AutoConnection);
//connect(this,&ClientHandler::sigInitSender,sendSystem,&SendSystem::initialize,Qt::AutoConnection/*Qt::DirectConnection*/);
connect(this,&ClientHandler::sigFileBlock,sendSystem,&SendSystem::slot_sendFileBlock,Qt::AutoConnection);
connect(this,&ClientHandler::sigFileBlock_forGUI,sendSystem,&SendSystem::slot_sendFileBlock_forGUI,Qt::AutoConnection);
connect(this,&ClientHandler::sigFileBlockByteArray,sendSystem,&SendSystem::slot_sendFileBlockByteArray,Qt::AutoConnection);
connect(this,&ClientHandler::sigFolderBlock,sendSystem,&SendSystem::slot_sendFolderBlock,Qt::AutoConnection);
connect(this,&ClientHandler::sigGetIsSendStopped,sendSystem,&SendSystem::slot_getIsSendingStopped,/*Qt::AutoConnection*/Qt::DirectConnection); //Возвращает значение
connect(this,&ClientHandler::sigSendDeleteBlock,sendSystem,&SendSystem::slot_sendDeleteBlock,Qt::AutoConnection);
connect(this,&ClientHandler::sigNeedUpdate,sendSystem,&SendSystem::slot_sendNeedUpdate,Qt::AutoConnection);
connect(this,&ClientHandler::sigSendNotify,sendSystem,&SendSystem::slot_sendNotify,Qt::AutoConnection);
connect(this,&ClientHandler::sigSendFileBlockWithRename,sendSystem,&SendSystem::slot_sendFileBlockWithRename,Qt::AutoConnection);
connect(this,&ClientHandler::sigSendFileBlockWithRename_Hash_forQtClient,sendSystem,&SendSystem::slot_sendFileBlockWithRename_Hash_forQtClient,Qt::AutoConnection);
connect(this,&ClientHandler::sigSendVersion,sendSystem,&SendSystem::slot_sendVersion,Qt::AutoConnection);
connect(this,&ClientHandler::sigSocketClose,sendSystem,&SendSystem::slot_socketClose,Qt::AutoConnection);
//connect(this,&ClientHandler::sigSocketFlush,sendSystem,&SendSystem::socketFlush,Qt::AutoConnection); //не используется
@@ -101,7 +101,7 @@ void ClientHandler::initClientType()
void ClientHandler::sendHash()
{
QString path = "\\" + hashFileName;
emit sigSendFileBlockWithRename(path,"/serverHash.xml");
emit sigSendFileBlockWithRename_Hash_forQtClient(path,"/serverHash.xml");
//emit sigSendNotify("HASHSENDCOMPLETE");
}
@@ -135,9 +135,9 @@ void ClientHandler::sendXmlAnswer(QByteArray array, PacketType packetType)
emit sigSendXmlAnswer(array, packetType);
}
void ClientHandler::sendFileBlock(QString path)
void ClientHandler::sendFileBlock_forGUI(QString path)
{
emit sigFileBlock(path);
emit sigFileBlock_forGUI(path);
}
void ClientHandler::sendFileBlockByteArray(QByteArray array, PacketType packetType)

6
LibServer/clienthandler/clienthandler.h
View File

@@ -27,7 +27,7 @@ public:
void initSender(DataParser *dataParser);
void sendXmlAnswer(QByteArray array, PacketType packetType = PacketType::TYPE_XMLANSWER);
void sendFolderBlock(QString path);
void sendFileBlock(QString path);
void sendFileBlock_forGUI(QString path);
void sendFileBlockByteArray(QByteArray array, PacketType packetType);
bool getIsSendStopped();
void sendDeleteBlock(QString path);
@@ -53,7 +53,7 @@ signals:
void sigSendXmlAnswer(QByteArray array, PacketType packetType);
//void sigInitSender (DataParser *dataParse, QMutex *mutex);
void sigFolderBlock(QString path);
void sigFileBlock(QString path);
void sigFileBlock_forGUI(QString path);
void sigFileBlockByteArray(QByteArray array, PacketType packetType);
bool sigGetIsSendStopped();
void sigSendDeleteBlock(QString path);
@@ -62,7 +62,7 @@ signals:
void sigSendHash();
void sigRecognize(ClientHandler *handler);
void sigSendNotify(QString notify);
void sigSendFileBlockWithRename (QString path,QString newName);
void sigSendFileBlockWithRename_Hash_forQtClient (QString path,QString newName);
void sigSocketClose();
//bool sigSocketFlush(); //не используется
void sigSendVersion();