pisync fixes

2 files changed, 33 insertions, 18 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index df5a0d9..1f5f4c7 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1053,7 +1053,6 @@ void KSyncManager::syncPi()
         return;
     }
-    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this );
+    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
-    mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") );
     commandSocket->readFile(  syncFileName() );
 }
@@ -1066,5 +1065,5 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
         delete s;
         if ( state == KCommandSocket::errorR ) {
-            KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
+            KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget());
             connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
             commandSocket->sendStop();
@@ -1097,5 +1096,5 @@ void KSyncManager::readFileFromSocket()
         return;
     }
-    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
+    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
     if ( mWriteBackFile ) 
@@ -1264,5 +1263,5 @@ void KServerSocket::send_file()
     os.setEncoding( QTextStream::Latin1 );
     while ( ! ts.atEnd() ) {
-        os << ts.readLine() << "\r\n";
+        os << ts.readLine() << "\r\n\r\n";
     }
     //os << ts.read();
@@ -1330,15 +1329,28 @@ void KServerSocket::readBackFileFromSocket()
 }
 
-KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
+KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap,  const char * name ): QObject( parent, name )
 {
     mPassWord = password;
     mSocket = 0;
+    mFirst = false;
     mPort = port;
     mHost = host;
-
+    tlw = cap;
     mRetVal = quiet;
     mTimerSocket = new QTimer ( this );
     connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket()  ) );
 }
+void KCommandSocket::sendFileRequest()
+{
+    if ( tlw )
+        tlw->setCaption( i18n("Connected! Sending request for remote file ...") );
+    mTimerSocket->start( 300000 );
+    QTextStream os( mSocket );
+    os.setEncoding( QTextStream::Latin1 );
+
+    QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
+    os << "GET " << mPassWord << curDt <<"\r\n\r\n";
+}
+
 void KCommandSocket::readFile( QString fn )
 {
@@ -1347,15 +1359,14 @@ void KCommandSocket::readFile( QString fn )
         connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
+        connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() ));
     }
     mFileString = "";
     mFileName = fn;
     mFirst = true;
+    if ( tlw )
+        tlw->setCaption( i18n("Trying to connect to remote...") );
     mSocket->connectToHost( mHost, mPort ); 
-    QTextStream os( mSocket );
-    os.setEncoding( QTextStream::Latin1 );
-
-    QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
-    os << "GET " << mPassWord << curDt <<"\r\n";
-    mTimerSocket->start( 300000 );
+    qDebug("KSS: Waiting for connection");
+    mTimerSocket->start( 20000 );
 }
 
@@ -1384,7 +1395,7 @@ void KCommandSocket::writeFileToSocket()
     QTextStream os2( mSocket );
     os2.setEncoding( QTextStream::Latin1 );
-    os2 << "PUT " << mPassWord << "\r\n";;
+    os2 << "PUT " << mPassWord << "\r\n\r\n";;
     while ( ! ts2.atEnd() ) {
-        os2 << ts2.readLine() << "\r\n";
+        os2 << ts2.readLine() << "\r\n\r\n";
     }
     mRetVal= successW;
@@ -1403,5 +1414,5 @@ void KCommandSocket::sendStop()
     QTextStream os2( mSocket );
     os2.setEncoding( QTextStream::Latin1 );
-    os2 << "STOP\r\n";
+    os2 << "STOP\r\n\r\n";
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
@@ -1473,5 +1484,5 @@ void KCommandSocket::deleteSocket()
             mSocket = 0;
         }
-        KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host? "));
+        KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?"));
         emit commandFinished( this, mRetVal );
         return;      
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 6d89950..9a3066e 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -76,8 +76,11 @@ class KCommandSocket : public QObject
         public:
     enum state { successR, errorR, successW, errorW, errorTO, quiet };
-    KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 );
+    KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget*  cap = 0, const char * name=0 );
     void readFile( QString );
     void writeFile( QString );
     void sendStop();
+
+ private slots :
+    void sendFileRequest();
        
  signals:
@@ -89,4 +92,5 @@ class KCommandSocket : public QObject
     void writeFileToSocket();
  private :
+    QWidget* tlw;
     QSocket* mSocket; 
     QString mPassWord;