sync fixes

1 files changed, 6 insertions, 4 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8e2f956..10cb2a2 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2071,226 +2071,228 @@ void MainWindow::performQuick()
     QLineEdit lepw ( &dia );
     lepw.setText( mPassWordPiSync );
     QLabel label3 ( i18n("Password to enable\naccess to remote:"), &dia );
     lay.addWidget( &label3);
     lay.addWidget( &lepw);
 
     dia.setFixedSize( 230,200 );
     dia.setCaption( i18n("Enter port for Pi-Sync ") );
     QPushButton pb ( "OK",  &dia);
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
     dia.show();
     int res = dia.exec();
     if ( !res ) {
         setCaption( i18n("Syncing cancelled!") );
         return;
     }
     mPassWordPiSync = lepw.text();
     dia.hide();
     KOPrefs::instance()->mActiveSyncPort = lab2.text();
     KOPrefs::instance()->mActiveSyncIP = lab.text();
     qApp->processEvents();
     performQuickQuick();
 }
 
 void MainWindow::performQuickQuick()
 {
     // setCaption( i18n("") );
    
     bool ok;
     Q_UINT16 port = KOPrefs::instance()->mActiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
         return;
     }
     if ( !mCommandSocket ) {
         mCommandSocket = new QSocket( this );
     // delete mCommandSocket;
     //mCommandSocket = new QSocket( this );
         connect( mCommandSocket, SIGNAL(readyRead()), this, SLOT(readFileFromSocket()) );
         connect( mCommandSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteCommandSocket()) );
     }
     QString host = KOPrefs::instance()->mActiveSyncIP;
     mCommandSocket->connectToHost( host, port ); 
     QTextStream os( mCommandSocket );
     os.setEncoding( QTextStream::UnicodeUTF8 );
     os << "GET " << mPassWordPiSync << "\r\n";
     setCaption( i18n("Sending request for remote file ...") );
-    mTimerCommandSocket->start( 15000 );
+    mTimerCommandSocket->start( 10000 );
 
 }
 void MainWindow::deleteCommandSocket()
 {
     if ( !mCommandSocket)
         return;
     if ( mTimerCommandSocket->isActive () ) {
       KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out "));
       mTimerCommandSocket->stop();
     }
+    //KMessageBox::information( 0, i18n("MainWindow::deleteCommandSocket "));
     qDebug("MainWindow::deletemCommandSocket() ");
    delete mCommandSocket;
    mCommandSocket = 0; 
 }
 void MainWindow::deleteCommandSocketFinish()
 {
     if ( ! mCommandSocketFinish)
         return;
     //KMessageBox::information( 0, i18n("MainWindow::deleteCommandSocketFinish() "));
     qDebug("MainWindow::deletemCommandSocketFinish() ");
    delete mCommandSocketFinish;
    mCommandSocketFinish = 0; 
 }
 void MainWindow::readFileFromSocket()
 {
     mTimerCommandSocket->stop();
     setCaption( i18n("Receiving remote file ...") );
     qDebug("MainWindow::readFileFromSocket() ");
     QString fileName;
 #ifdef _WIN32_
     fileName = defaultFileName() +"sync";
 #else
     fileName = "/tmp/kopitempfile.ics";
 #endif
     QFile file( fileName );
     if (!file.open( IO_WriteOnly ) ) {
         setCaption( i18n("Error: Cannot open temp file for write.") );
         qDebug("Error open temp calender file for writing: %s",fileName.latin1() );
         return ;
     } 
     
     //QTextStream os2( mCommandSocket );
     //os2.setEncoding( QTextStream::UnicodeUTF8 );
 
     QTextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") ); 
     bool first = true; 
     while ( mCommandSocket->canReadLine () || first) {
         first = false;
         while ( mCommandSocket->canReadLine () ) {
             ts <<   mCommandSocket->readLine ();
         } 
         QTime ti;
         ti.start();
-        while ( ti.elapsed () < 5000  && !mCommandSocket->canReadLine () ) {
+        while ( ti.elapsed () < 3000  && !mCommandSocket->canReadLine () ) {
             qApp->processEvents();
             qDebug("waiting2 %d ",ti.elapsed () );
             if ( !mCommandSocket->canReadLine () )
                 mCommandSocket->waitForMore ( 100 );
         }
         //mCommandSocket->waitForMore ( 5000 );
     }
     file.close();  
     mCommandSocket->close();
     if ( mCommandSocket->state() == QSocket::Idle )
         deleteCommandSocket();
     // pending: deleting after signal  SIGNAL(delayedCloseFinished())
     //delete mCommandSocket;
     setCaption( i18n("Remote file saved to temp file.") );
     //mCommandSocket = 0;
     mCurrentSyncProfile = 2 ; // last file
     mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
     mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
     KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs();
     KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
     KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
     KOPrefs::instance()->mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() )
         KOPrefs::instance()->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
     KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync();
     delete temp;
     setCaption( i18n("Remote file saved to temp file.") );
     if ( ! syncWithFile( fileName , true ) ) {
         setCaption( i18n("Syncing failed.") );
         qDebug("Syncing failed ");
         return;
     }
 
     if ( !mCommandSocketFinish ) {
         mCommandSocketFinish  = new QSocket( this );
         connect( mCommandSocketFinish, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteCommandSocketFinish()) );
     }
     mCommandSocketFinish->connectToHost( KOPrefs::instance()->mActiveSyncIP, KOPrefs::instance()->mActiveSyncPort.toUInt() ); 
 
     // pending connect signals connected () and error to new slots
     QString host = KOPrefs::instance()->mActiveSyncIP;
     QFile file2( fileName );
     if (!file2.open( IO_ReadOnly ) ) {
         setCaption( i18n("Error: Cannot open temp file for read.") );
         qDebug("error open cal file ");
         return ;
                     
     } 
-    setCaption( i18n("Sending back synced file...") );
     QTextStream ts2( &file2 );
     ts2.setCodec( QTextCodec::codecForName("utf8") );
     QTextStream os2( mCommandSocketFinish );
     os2.setCodec( QTextCodec::codecForName("utf8") );
     //os.setEncoding( QTextStream::UnicodeUTF8 );
     if ( KOPrefs::instance()->mWriteBackFile ) {
+    setCaption( i18n("Sending back synced file...") );
         os2 << "PUT " << mPassWordPiSync << "\r\n";;
         while ( ! ts2.atEnd() ) {
            os2 << ts2.readLine() << "\n";
         }
     } else {
         os2 << "STOP\r\n";
     }
     mCommandSocketFinish->close();
     if ( mCommandSocketFinish->state() == QSocket::Idle )
-        deleteCommandSocketFinish();
+        QTimer::singleShot( 10, this , SLOT ( deleteCommandSocketFinish()));
     file.close();
     qDebug("Syncing succesful! ");
     setCaption( i18n("Pi-Sync succesful!") );
 
+    // KMessageBox::information( 0, i18n(" Pi-Sync succesful! "));
 
 }
 
 void MainWindow::syncLocalFile()
 {
 
     QString fn =KOPrefs::instance()->mLastSyncedLocalFile;
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
     //mView->setSyncDevice("local-file" );
     if (  syncWithFile(  fn, false ) ) {
        //  Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
 //         e->setLocation( i18n("Local file: ")+ KOPrefs::instance()->mLastSyncedLocalFile);
 //         e->setReadOnly( true );
     }
 
 }
 
 bool  MainWindow::syncWithFile( QString fn , bool quick )
 {
     bool ret = false;
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;
     if ( !info. exists() ) {
         mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                            mess );
         return ret;
     }
     int result = 0;
     if ( !quick ) {
         mess =  i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        mess,
                                        i18n("Sync"), i18n("Cancel"), 0,
                                        0, 1 );
         if ( result )
             return false;
     }
     if ( KOPrefs::instance()->mAskForPreferences )
         mView->edit_sync_options();
     if ( result == 0 ) {
         //qDebug("Now sycing ... ");