2 files changed, 142 insertions, 70 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 10cb2a2..e4b7869 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -50,50 +50,48 @@
 #include "kofilterview.h"
 #include "kstandarddirs.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kconfig.h"
 #include "simplealarmclient.h"
 #include "externalapphandler.h"
 
 using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #include "koimportoldialog.h"
 #endif
 #include "mainwindow.h"
 
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     QMainWindow( parent, name )
 {
     mPassWordPiSync = "abc";
-    mTimerCommandSocket = new QTimer ( this );
-    connect( mTimerCommandSocket, SIGNAL ( timeout () ), this, SLOT ( deleteCommandSocket()  ) );
 #ifdef DESKTOP_VERSION
     setFont( QFont("Arial"), 14 );
 #endif
     mCommandSocket = 0;
     mCommandSocketFinish = 0;
     mSyncActionDialog = 0;
     mServerSocket = 0;
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
     QFileInfo finf ( confFile );
     bool showWarning =  !finf.exists();
     setIcon(SmallIcon( "ko24" )  );
     mBlockAtStartup = true;
     mFlagKeyPressed = false;
     setCaption("KOrganizer/Pi");
     KOPrefs *p = KOPrefs::instance();
     KPimGlobalPrefs::instance()->setGlobalConfig();
    //  if ( QApplication::desktop()->height() > 480 ) {
 //         if ( p->mHourSize == 4 )
 //             p->mHourSize = 6;
 //     }
     if ( p->mHourSize >  18 )
         p->mHourSize = 18;
@@ -2082,189 +2080,148 @@ void MainWindow::performQuick()
     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";
+    mCommandSocket = new KCommandSocket( mPassWordPiSync, port, KOPrefs::instance()->mActiveSyncIP, this );
+    connect( mCommandSocket, SIGNAL(commandFinished( bool )), this, SLOT(deleteCommandSocket(bool)) );
     setCaption( i18n("Sending request for remote file ...") );
-    mTimerCommandSocket->start( 10000 );
-
+    QString fileName;
+#ifdef _WIN32_
+    fileName = defaultFileName() +"sync";
+#else
+    fileName = "/tmp/kopitempfile.ics";
+#endif
+    mCommandSocket->readFile(  fileName );
 }
-void MainWindow::deleteCommandSocket()
+void MainWindow::deleteCommandSocket( bool success)
 {
-    if ( !mCommandSocket)
+    if ( ! success ) {
+        setCaption( i18n("ERROR:Receiving remote file failed.") );
+        // pending : send stop
         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; 
+    QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
+    delete mCommandSocket;
 }
 void MainWindow::deleteCommandSocketFinish()
 {
     if ( ! mCommandSocketFinish)
         return;
     // KMessageBox::information( 0, i18n("MainWindow::deleteCommandSocketFinish() "));
     qDebug("MainWindow::deletemCommandSocketFinish() ");
    delete mCommandSocketFinish;
    mCommandSocketFinish = 0; 
 }
 void MainWindow::readFileFromSocket()
 {
-    mTimerCommandSocket->stop();
+    // 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 () < 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 ;
                     
     } 
     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 )
         QTimer::singleShot( 10, this , SLOT ( deleteCommandSocketFinish()));
-    file.close();
+    file2.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 );
     }
 
 }
@@ -2570,35 +2527,122 @@ void KServerSocket::readClient()
         QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), mSocket->readLine() );
         qDebug("KServerSocket socket->canReadLine()");
         if ( tokens[0] == "GET" ) {
             if (  tokens[1] == mPassWord )
                 emit sendFile( mSocket );
             else {
                 KMessageBox::information( 0, i18n("ERROR:\nGot send file request\nwith invalid password"));
                 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "PUT" ) {
             if (  tokens[1] == mPassWord )
                 emit getFile( mSocket );
             else {
                 KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password"));
                 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "STOP" ) {
             emit endConnect();
         }
     }
 }
 
+KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
+{
+    mPassWord = password;
+    mSocket = 0;
+    mPort = port;
+    mHost = host;
 
+    mRetVal = false;
+    mTimerSocket = new QTimer ( this );
+    connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket()  ) );
+}
+void KCommandSocket::readFile( QString fn )
+{
+    if ( !mSocket ) {
+        mSocket = new QSocket( this );
+        connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
+        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
+    }
+    mFileString = "";
+    mFileName = fn;
+    mFirst = true;
+    mSocket->connectToHost( mHost, mPort ); 
+    QTextStream os( mSocket );
+    os.setEncoding( QTextStream::UnicodeUTF8 );
+    os << "GET " << mPassWord << "\r\n";
+    mTimerSocket->start( 10000 );
+}
 
+void KCommandSocket::writeFile( QString )
+{
 
+}
+void KCommandSocket::startReadFileFromSocket()
+{
+    if ( ! mFirst )
+        return;
+    mFirst = false;
+    mTimerSocket->stop();
+    mFileString = "";
+    mTime.start();
+    QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) ));
 
+}
+void KCommandSocket::readFileFromSocket()
+{
+    qDebug("readBackFileFromSocket() %d ", mTime.elapsed ());
+    while ( mSocket->canReadLine ()  ) {
+        mTime.restart();
+        QString line = mSocket->readLine ();
+        mFileString += line;
+        qDebug("readline: %s ", line.latin1());
+    }
+    if ( mTime.elapsed () < 3000 ) {
+        // wait for more 
+        qDebug("waitformore ");
+        QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) ));
+        return;
+    }
+    QString fileName = mFileName;
+    QFile file ( fileName );
+    if (!file.open( IO_WriteOnly ) ) {
+        mFileString = "";
+        mRetVal = false;
+        qDebug("Error open temp calender file for writing: %s",fileName.latin1() );
+        deleteSocket();
+        return ;
+                    
+    } 
+    // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
+    QTextStream ts ( &file );
+    ts.setCodec( QTextCodec::codecForName("utf8") );
+    qDebug("finish ");
+    ts << mFileString;
+    file.close();  
+    mFileString = "";
+    mRetVal = true;
+    mSocket->close();
+    // if state is not idle, deleteSocket(); is called via 
+    //  connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
+    if ( mSocket->state() == QSocket::Idle )
+        deleteSocket();
+}
 
-
-
-
-
-
+void KCommandSocket::deleteSocket()
+{
+    if ( !mSocket)
+        return;
+    if ( mTimerSocket->isActive () ) {
+      mTimerSocket->stop();
+      KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out "));
+      mRetVal = false;
+    }
+    qDebug("KCommandSocket::deleteSocket() %d", mRetVal);
+    delete mSocket;
+    mSocket = 0; 
+    emit commandFinished( mRetVal );
+}
 
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index d217578..11a816c 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -25,48 +25,76 @@ class QPEToolBar;
 #include <qsocket.h>
 #include <qnetworkprotocol.h>
 
 class KServerSocket : public QServerSocket
 {
     Q_OBJECT
 
 public:
     KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
 
     void newConnection ( int socket ) ;
    
 signals:
     void sendFile(QSocket*); 
     void getFile(QSocket*); 
     void endConnect();
 private slots:
     void discardClient();
     void readClient();
  private :
     QSocket* mSocket; 
     QString mPassWord;
 };
 
+class KCommandSocket : public QObject
+{
+    Q_OBJECT
+
+public:
+    KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 );
+    void readFile( QString );
+    void writeFile( QString );
+    
+   
+signals:
+    void commandFinished( bool );
+private slots:
+    void startReadFileFromSocket();
+    void readFileFromSocket();
+    void deleteSocket();
+ private :
+    QSocket* mSocket; 
+    QString mPassWord;
+    Q_UINT16 mPort;
+    QString mHost;
+    QString mFileName;
+    QTimer* mTimerSocket;
+    bool mRetVal;
+    QTime mTime;
+    QString mFileString;
+    bool mFirst;
+};
 
 namespace KCal {
 class CalendarLocal;
 }
 
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
     ~MainWindow();
  public  slots:  
     virtual void showMaximized (); 
      void configureAgenda( int );
     void recieve( const QCString& msg, const QByteArray& data );
     static  QString defaultFileName();
     static QString resourcePath();
     protected slots:  
     void setCaptionToDates();
     int ringSync();
     void multiSync( bool askforPrefs = false );
     void about(); 
@@ -100,60 +128,60 @@ class MainWindow : public QMainWindow
     void exportVCalendar();
     void fillFilterMenu();
     void selectFilter( int );
 
     void slotSyncMenu( int );
     void syncSSH();
     void confSync();
     void syncSharp();
     void syncPhone();
     void syncLocalFile();
     bool syncWithFile( QString, bool );
     void quickSyncLocalFile();
     
     
   protected:
     void displayText( QString, QString);
     void displayFile( QString, QString);
     
     void enableIncidenceActions( bool );
     
   private slots:
     QSocket* piSocket;
     QString  piFileString;
     QTime piTime;
-    void deleteCommandSocket();
+    void deleteCommandSocket(bool);
     void deleteCommandSocketFinish();
     void fillSyncMenu();
     void sendFile(QSocket* s);
     void getFile(QSocket* socket);
     void readFileFromSocket();
     void readBackFileFromSocket();
     void endConnect();
   private:
-    QTimer* mTimerCommandSocket;
+    //QTimer* mTimerCommandSocket;
     QString mPassWordPiSync;
-    QSocket* mCommandSocket;
+    KCommandSocket* mCommandSocket;
     QSocket* mCommandSocketFinish;
     KServerSocket * mServerSocket;
     bool mClosed;
     void saveOnClose();
     int mCurrentSyncProfile;
     void enableQuick();
     void performQuick();
     void performQuickQuick();
     void syncRemote( KSyncProfile* , bool ask = true);
     bool  mFlagKeyPressed;
     bool  mBlockAtStartup;
     QPEToolBar *iconToolBar;
     void initActions();
     void setDefaultPreferences(); 
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
     QPopupMenu *configureToolBarMenu;
     QPopupMenu *selectFilterMenu;
     QPopupMenu *configureAgendaMenu, *syncMenu;
     CalendarLocal *mCalendar;
     CalendarView *mView;
     QString  getPassword();
     QAction *mNewSubTodoAction;