sync

2 files changed, 18 insertions, 3 deletions

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 31ef338..9147af3 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -515,48 +515,56 @@ void  KOPrefs::deleteCalendar( int num )
             delete kkf;
             return;
         }
         kkf = mCalendars.next();
     }
 }
 int KOPrefs::getCalendarID( const QString & name )
 {
     KopiCalendarFile * kkf = mCalendars.first();
     while ( kkf ) {
         if ( name == kkf->mName)
             return  kkf->mCalNumber;
         kkf = mCalendars.next();
     }
     return 1;
 }
 int KOPrefs::getFuzzyCalendarID( const QString & name )
 {
     KopiCalendarFile * kkf = mCalendars.first();
     while ( kkf ) {
         if ( name.lower() == kkf->mName.lower())
             return  kkf->mCalNumber;
         kkf = mCalendars.next();
     }
+    QString name2 = name;
+    name2.replace (QRegExp ("_")," " );
+    kkf = mCalendars.first();
+    while ( kkf ) {
+        if ( name2.lower() == kkf->mName.lower())
+            return  kkf->mCalNumber;
+        kkf = mCalendars.next();
+    }
     return 0;
 }
 QString KOPrefs::calName( int calNum) const
 {
     return (mDefCalColors[calNum-1])->mName;
 }
 QColor  KOPrefs::defaultColor( int calNum ) const
 {
     if ( calNum == 1 ) return mEventColor;
     return (mDefCalColors[calNum-1])->mDefaultColor;
 }
 void KOPrefs::usrWriteConfig()
 {
   config()->setGroup("General");
   config()->writeEntry("Custom Categories",mCustomCategories); 
   
   config()->setGroup("Personal Settings");
   config()->writeEntry("user_name",mName);
   config()->writeEntry("user_email",mEmail);
 
   config()->setGroup("Category Colors");
   QDictIterator<QColor> it(mCategoryColors);
   while (it.current()) {
     config()->writeEntry(it.currentKey(),*(it.current()));
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 61a9899..795cd30 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1119,76 +1119,81 @@ QString KSyncManager::syncFileName()
     return (QString( "/tmp/" )+ fn );
 #endif
 }
 
 void KSyncManager::syncPi()
 {
     mIsKapiFile = true; 
     mPisyncFinished = false;
     qApp->processEvents();
     if ( mAskForPreferences )
         if ( !edit_pisync_options()) {
             mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
             mPisyncFinished = true;
             return;
         }
     bool ok;
     Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
         mPisyncFinished = true;
         return;
     }
     mCurrentResourceLocal = "";
     mCurrentResourceRemote = "";
+    qDebug ( "KSM: sync pi %d",mSpecificResources.count()  );
     if ( mSpecificResources.count() ) {
         int lastSyncRes = mSpecificResources.count()/2;
         int ccc = mSpecificResources.count()-1;
         while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) {
             --ccc;
             --lastSyncRes;
+            qDebug ( "KSM: sync pi %d",ccc  );
         }
         int startLocal = 0;
         int startRemote = mSpecificResources.count()/2;
         emit multiResourceSyncStart( true );
         while ( startLocal < mSpecificResources.count()/2 ) {
             if (  startLocal+1 >= lastSyncRes )
                 emit multiResourceSyncStart( false );
             mPisyncFinished = false;
             mCurrentResourceLocal = mSpecificResources[ startLocal ];
-            mCurrentResourceRemote = mSpecificResources[ startRemote ];
+            mCurrentResourceRemote = mSpecificResources[ startRemote ]; 
+            qDebug ( "KSM: AAASyncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(),  mCurrentResourceRemote.latin1() );
             if ( !mCurrentResourceRemote.isEmpty() ) {
                 qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(),  mCurrentResourceRemote.latin1() );
                 KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
                 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
                 commandSocket->readFile(  syncFileName() );
                 while ( !mPisyncFinished ) {
                     //qDebug("waiting ");
                     qApp->processEvents();
                 }
             }
+            ++startRemote;
             ++startLocal;
         }
+        mPisyncFinished = true;
     } else {
         KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
         connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
         commandSocket->readFile(  syncFileName() );
     }
 }
 
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
     //enum { success, errorW, errorR, quiet };
 
 
 
     if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ||
          state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) {
         if ( state == KCommandSocket::errorPW )
             mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") );
         else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO )
             mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
         else if ( state == KCommandSocket::errorCA )
             mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") );
         else if ( state == KCommandSocket::errorFI )
             mParent->topLevelWidget()->setCaption( i18n("File error on remote.") );
         else if ( state == KCommandSocket::errorED )
@@ -1495,75 +1500,77 @@ void KServerSocket::readBackFileFromSocket()
 
     // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
     QTextStream ts ( &file );
     ts.setEncoding( QTextStream::Latin1 );
     mSyncActionDialog->setCaption( i18n("Writing file to disk...") );
     ts << piFileString;
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
         QTimer::singleShot( 10, this , SLOT ( discardClient()));
     file.close(); 
     piFileString = "";
     emit file_received( true, mResource );
     emit file_received( true);
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
     blockRC = false;
 
 }
 
 KCommandSocket::KCommandSocket ( QString remres, QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap,  const char * name ): QObject( parent, name )
 {
     mRemoteResource = remres;
     if ( mRemoteResource.isEmpty() )
         mRemoteResource = "ALL";
+    else
+        mRemoteResource.replace (QRegExp (" "),"_" );
     mPassWord = password;
     mSocket = 0;
     mFirst = false;
     mFirstLine = true;
     mPort = port;
     mHost = host;
     tlw = cap;
     mRetVal = quiet;
     mTimerSocket = new QTimer ( this );
     connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( updateConnectDialog() ) );
     mConnectProgress.setCaption( i18n("Pi-Sync") );
     connect( &mConnectProgress, SIGNAL ( cancelled () ), this, SLOT ( deleteSocket() ) );
     mConnectCount = -1;
 }
 void KCommandSocket::sendFileRequest()
 {
     if ( tlw )
         tlw->setCaption( i18n("Connected! Sending request for remote file ...") );
     mConnectProgress.hide();
     mConnectCount = 300;mConnectMax = 300;
     mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") );
     mTimerSocket->start( 100, true );
     QTextStream os( mSocket );
     os.setEncoding( QTextStream::Latin1 );
 
     QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
-    os << "GET " << mPassWord << curDt << mRemoteResource  << "\r\n\r\n";
+    os << "GET " << mPassWord << curDt << " " << mRemoteResource  << "\r\n\r\n";
 }
 
 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()) );
         connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() ));
     }
     mFileString = "";
     mFileName = fn;
     mFirst = true;
     if ( tlw )
         tlw->setCaption( i18n("Trying to connect to remote...") );
     mConnectCount = 30;mConnectMax = 30;
     mTimerSocket->start( 1000, true );
     mSocket->connectToHost( mHost, mPort ); 
     qDebug("KSS: Waiting for connection");
 }
 void KCommandSocket::updateConnectDialog()
 {
     
     if ( mConnectCount == mConnectMax  ) {
@@ -1596,49 +1603,49 @@ void KCommandSocket::writeFile( QString fileName  )
 }
 void KCommandSocket::writeFileToSocket()
 {
     mTimerSocket->stop();
     QFile file2( mFileName );
     if (!file2.open( IO_ReadOnly ) ) {
         mConnectProgress.hide();
         mConnectCount = -1;
         mRetVal= errorW;
         mSocket->close();
         if ( mSocket->state() == QSocket::Idle )
             QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
         return ;
     }  
     mConnectProgress.setTotalSteps ( file2.size() );
     mConnectProgress.show();
     int count = 0;
     mConnectProgress.setLabelText( i18n("Sending back synced file...") );
     mConnectProgress.setProgress( count );
     mConnectProgress.blockSignals( true );
     QTextStream ts2( &file2 );
     ts2.setEncoding( QTextStream::Latin1 );
     QTextStream os2( mSocket );
     os2.setEncoding( QTextStream::Latin1 );
-    os2 << "PUT " << mPassWord << mRemoteResource << "\r\n\r\n";;
+    os2 << "PUT " << mPassWord << " " << mRemoteResource << "\r\n\r\n";;
     int byteCount = 0;
     int byteMax = file2.size()/53;
     while ( ! ts2.atEnd() ) {
         qApp->processEvents();
         if ( byteCount > byteMax ) {
             byteCount = 0;
             mConnectProgress.setProgress( count );
         }
         QString temp = ts2.readLine();
         count += temp.length();
         byteCount += temp.length();
         os2 << temp << "\r\n";
     }
     file2.close();
     mConnectProgress.hide();
     mConnectCount = -1;
     os2 << "\r\n";
     mRetVal= successW;
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
         QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
     mConnectProgress.blockSignals( false );
 }
 void KCommandSocket::sendStop()