bugfix/feat: main loading bar, add bar for sender

Core/recognizesystem.cpp

@@ -157,7 +157,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                     emit sigSendDebugLog(Tools::getTime() + "FINAL Count send: " + QString::number(countSend));
                     emit sigSendDebugLog(Tools::getTime() + "FINAL Size received: " + QString::number(sizeReceiveData));
                     emit sigSendDebugLog(Tools::getTime() + "FINAL File size" + QString::number(fileSize));
-                    emit sigUpdateBytesAvailable(fileSize,sizeReceiveData);
+                    emit sigUpdateBytesAvailable();
                     break;
                 }
             }

Core/recognizesystem.h

@@ -23,7 +23,7 @@ public:
     void recognize(QTcpSocket *socket);
 
 signals:
-    void sigUpdateBytesAvailable(qint64 size,quint64 sended);
+    void sigUpdateBytesAvailable();
     void sigLoadComplete();
     void sigNeedUpdate(bool flag,qint64 size,quint64 fileCount);
     void sigSendDebugLog(QString message);

Core/sendsystem.cpp

@@ -65,7 +65,8 @@ void SendSystem::sendFileBlock(QString path)
     stream << PacketType::TYPE_FILE; //Отправляем тип блока
     stream << path << fileSize;
 
-    socket->waitForBytesWritten();
+    socket->waitForReadyRead(20);
+    //socket->waitForBytesWritten();
 
     if(file.open(QFile::ReadOnly)){
         while(!file.atEnd()){
@@ -80,10 +81,11 @@ void SendSystem::sendFileBlock(QString path)
 
     file.close();
 
+    emit sigSend();
     //qDebug() << "Transaction after send file: " << socket->isTransactionStarted();
     countSend = 0;
-    socket->waitForBytesWritten();
-    socket->waitForReadyRead(100);
+    //socket->waitForBytesWritten();
+    socket->waitForReadyRead(20);
 }
 
 void SendSystem::sendFolderBlock(QString path)
@@ -93,6 +95,7 @@ void SendSystem::sendFolderBlock(QString path)
 
     stream << PacketType::TYPE_FOLDER;
     stream << path;
+    emit sigSend();
     socket->waitForReadyRead(100);
 }
 
@@ -113,16 +116,16 @@ void SendSystem::sendXMLAnswer(QByteArray array)
     stream << array;
 
     socket->waitForBytesWritten();
+    socket->waitForReadyRead(100);
 }
 
 void SendSystem::sendFinish()
 {
-    socket->waitForReadyRead();
+    socket->waitForReadyRead(100);
     QDataStream stream(socket);
     stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
 
     stream << PacketType::TYPE_FINISH;
-
     socket->waitForReadyRead(100);
 }
 

Core/sendsystem.h

@@ -20,7 +20,7 @@ public:
     ~SendSystem();
     void sendFinish();
 signals:
-
+    void sigSend();
     QByteArray sigGetXmlAnswer(QString);
 
 private: