Fixed:

[greensite/jasmine.git] / client / tcpclient.cxx

diff --git a/client/tcpclient.cxx b/client/tcpclient.cxx
index 36f90b1..78acb99 100644 (file)
--- a/client/tcpclient.cxx
+++ b/client/tcpclient.cxx
@@ -6,30 +6,49 @@ tcpClient::tcpClient(quint64 buffersize,const QString &senderName,QObject *paren
        this->buffer_size=buffersize;
        this->senderName=&senderName;
        this->timeout_time=TIMEOUT;
-       connect(this,SIGNAL(connected()),SLOT(connectedSlot()));
+       this->want_disconnect=false;
+       connect(this,SIGNAL(readyRead()),SLOT(data_available()));
 }
 quint64 tcpClient::timeout()const {return this->timeout_time;}
 void tcpClient::timeout(const quint64 time){this->timeout_time=time;}
 tcpClient &tcpClient::operator<<(const QString &msg){
-       if(!this->check_connection_and_wait_connected()){return (*this);}
+       if(!this->check_connection_and_wait_connected())return (*this);
        header head_data(*(this->senderName),msg);
        QByteArray head_buffer;
        QDataStream datastream(head_buffer);
        datastream<<head_data;
        quint16 size=(quint16)head_buffer.size();
-       this->write((char*)&size,sizeof(quint16)/sizeof(char));
-       this->check_byte_written_and_wait_written();
+       this->write((char*)&size,sizeof(__typeof__(size))/sizeof(char));
+       if(!this->check_byte_written_and_wait_written())return (*this);
        this->write(head_buffer);
-       this->check_byte_written_and_wait_written();
-       this->write(msg.toUtf8());
-       this->check_byte_written_and_wait_written();
-       this->disconnectFromHost();
+       if(!this->check_byte_written_and_wait_written())return (*this);
+       QByteArray array=msg.toUtf8();
+       QBuffer memoryStream(&array,this);
+       while(this->write(memoryStream.read(this->buffer_size))>0);
+       if(this->check_byte_written_and_wait_written())return (*this);
+       emit this->sentData();
+       return (*this);
 }
-tcpClient &tcpClient::operator<<(const QFile &file){
+tcpClient &tcpClient::operator<<(QFile &file){
+       if(!this->check_connection_and_wait_connected()){return (*this);}
+       header head_data(*(this->senderName),QFileInfo(file));
+       QByteArray head_buffer;
+       QDataStream datastream(head_buffer);
+       quint16 size=(quint16)head_buffer.size();
+       datastream<<head_data;
+       this->write((char*)&size,sizeof(__typeof__(size))/sizeof(char));
+       if(!this->check_byte_written_and_wait_written())return (*this);
+       this->write(head_buffer);
+       if(!this->check_byte_written_and_wait_written())return (*this);
+       while(this->write(file.read(this->buffer_size))>0);
+       if(!this->check_byte_written_and_wait_written())return (*this);
+       emit this->sentData();
+       return (*this);
 }
 bool tcpClient::check_byte_written_and_wait_written(){
+       if(want_disconnect) return false;
        if(!this->waitForBytesWritten(this->timeout_time)){
-               this->setErrorString("The data couldn't be written.");
+               this->setErrorString(tr("The data couldn't be written."));
                emit this->error(QAbstractSocket::UnknownSocketError);
                return false;
        }
@@ -37,6 +56,7 @@ bool tcpClient::check_byte_written_and_wait_written(){
 }
 
 bool tcpClient::check_connection_and_wait_connected(){
+       if(want_disconnect) return false;
        if(this->state()!=QAbstractSocket::ConnectingState||this->state()!=QAbstractSocket::ConnectedState){
                this->setErrorString(tr("This socket haven't connected to somewhere yet."));
                emit this->error(QAbstractSocket::SocketAccessError);
@@ -49,3 +69,27 @@ bool tcpClient::check_connection_and_wait_connected(){
        }
        return true;
 }
+bool tcpClient::check_and_wait_byte_available(){
+       if(!this->waitForReadyRead(this->timeout_time)){
+               this->setErrorString(tr("The data couldn't be read."));
+               emit this->error(QAbstractSocket::UnknownSocketError);
+               return false;
+       }
+       return true;
+}
+void tcpClient::disconnectFromHostImplementation(){
+       this->want_disconnect=true;
+       QTcpSocket::disconnectFromHost();
+}
+
+void tcpClient::data_available(){
+       this->check_and_wait_byte_available();
+       QByteArray receive_data=this->read(1);
+       switch(receive_data[0]){
+       case 0x00:
+               this->disconnectFromHost();
+               break;
+       default:
+               return;
+       }
+}