author | zautrix <zautrix> | 2005-11-25 19:44:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-11-25 19:44:15 (UTC) |
commit | 7a439999b9fa2bd7ad76e195cdf95bf5211952cb (patch) (unidiff) | |
tree | 88c7e5771ed955004b6ef3b74c339e6b44b8a7ad | |
parent | 231e6f8215bbc4f7e301965f8f3c650e44586ec9 (diff) | |
download | kdepimpi-7a439999b9fa2bd7ad76e195cdf95bf5211952cb.zip kdepimpi-7a439999b9fa2bd7ad76e195cdf95bf5211952cb.tar.gz kdepimpi-7a439999b9fa2bd7ad76e195cdf95bf5211952cb.tar.bz2 |
sync
-rw-r--r-- | korganizer/koprefs.cpp | 8 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 13 |
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 | |||
@@ -533,12 +533,20 @@ int KOPrefs::getFuzzyCalendarID( const QString & name ) | |||
533 | KopiCalendarFile * kkf = mCalendars.first(); | 533 | KopiCalendarFile * kkf = mCalendars.first(); |
534 | while ( kkf ) { | 534 | while ( kkf ) { |
535 | if ( name.lower() == kkf->mName.lower()) | 535 | if ( name.lower() == kkf->mName.lower()) |
536 | return kkf->mCalNumber; | 536 | return kkf->mCalNumber; |
537 | kkf = mCalendars.next(); | 537 | kkf = mCalendars.next(); |
538 | } | 538 | } |
539 | QString name2 = name; | ||
540 | name2.replace (QRegExp ("_")," " ); | ||
541 | kkf = mCalendars.first(); | ||
542 | while ( kkf ) { | ||
543 | if ( name2.lower() == kkf->mName.lower()) | ||
544 | return kkf->mCalNumber; | ||
545 | kkf = mCalendars.next(); | ||
546 | } | ||
539 | return 0; | 547 | return 0; |
540 | } | 548 | } |
541 | QString KOPrefs::calName( int calNum) const | 549 | QString KOPrefs::calName( int calNum) const |
542 | { | 550 | { |
543 | return (mDefCalColors[calNum-1])->mName; | 551 | return (mDefCalColors[calNum-1])->mName; |
544 | } | 552 | } |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 61a9899..795cd30 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1137,40 +1137,45 @@ void KSyncManager::syncPi() | |||
1137 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 1137 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
1138 | mPisyncFinished = true; | 1138 | mPisyncFinished = true; |
1139 | return; | 1139 | return; |
1140 | } | 1140 | } |
1141 | mCurrentResourceLocal = ""; | 1141 | mCurrentResourceLocal = ""; |
1142 | mCurrentResourceRemote = ""; | 1142 | mCurrentResourceRemote = ""; |
1143 | qDebug ( "KSM: sync pi %d",mSpecificResources.count() ); | ||
1143 | if ( mSpecificResources.count() ) { | 1144 | if ( mSpecificResources.count() ) { |
1144 | int lastSyncRes = mSpecificResources.count()/2; | 1145 | int lastSyncRes = mSpecificResources.count()/2; |
1145 | int ccc = mSpecificResources.count()-1; | 1146 | int ccc = mSpecificResources.count()-1; |
1146 | while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) { | 1147 | while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) { |
1147 | --ccc; | 1148 | --ccc; |
1148 | --lastSyncRes; | 1149 | --lastSyncRes; |
1150 | qDebug ( "KSM: sync pi %d",ccc ); | ||
1149 | } | 1151 | } |
1150 | int startLocal = 0; | 1152 | int startLocal = 0; |
1151 | int startRemote = mSpecificResources.count()/2; | 1153 | int startRemote = mSpecificResources.count()/2; |
1152 | emit multiResourceSyncStart( true ); | 1154 | emit multiResourceSyncStart( true ); |
1153 | while ( startLocal < mSpecificResources.count()/2 ) { | 1155 | while ( startLocal < mSpecificResources.count()/2 ) { |
1154 | if ( startLocal+1 >= lastSyncRes ) | 1156 | if ( startLocal+1 >= lastSyncRes ) |
1155 | emit multiResourceSyncStart( false ); | 1157 | emit multiResourceSyncStart( false ); |
1156 | mPisyncFinished = false; | 1158 | mPisyncFinished = false; |
1157 | mCurrentResourceLocal = mSpecificResources[ startLocal ]; | 1159 | mCurrentResourceLocal = mSpecificResources[ startLocal ]; |
1158 | mCurrentResourceRemote = mSpecificResources[ startRemote ]; | 1160 | mCurrentResourceRemote = mSpecificResources[ startRemote ]; |
1161 | qDebug ( "KSM: AAASyncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); | ||
1159 | if ( !mCurrentResourceRemote.isEmpty() ) { | 1162 | if ( !mCurrentResourceRemote.isEmpty() ) { |
1160 | qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); | 1163 | qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); |
1161 | KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1164 | KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1162 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1165 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1163 | commandSocket->readFile( syncFileName() ); | 1166 | commandSocket->readFile( syncFileName() ); |
1164 | while ( !mPisyncFinished ) { | 1167 | while ( !mPisyncFinished ) { |
1165 | //qDebug("waiting "); | 1168 | //qDebug("waiting "); |
1166 | qApp->processEvents(); | 1169 | qApp->processEvents(); |
1167 | } | 1170 | } |
1168 | } | 1171 | } |
1172 | ++startRemote; | ||
1169 | ++startLocal; | 1173 | ++startLocal; |
1170 | } | 1174 | } |
1175 | mPisyncFinished = true; | ||
1171 | } else { | 1176 | } else { |
1172 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1177 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1173 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1178 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1174 | commandSocket->readFile( syncFileName() ); | 1179 | commandSocket->readFile( syncFileName() ); |
1175 | } | 1180 | } |
1176 | } | 1181 | } |
@@ -1513,12 +1518,14 @@ void KServerSocket::readBackFileFromSocket() | |||
1513 | 1518 | ||
1514 | KCommandSocket::KCommandSocket ( QString remres, QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) | 1519 | KCommandSocket::KCommandSocket ( QString remres, QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) |
1515 | { | 1520 | { |
1516 | mRemoteResource = remres; | 1521 | mRemoteResource = remres; |
1517 | if ( mRemoteResource.isEmpty() ) | 1522 | if ( mRemoteResource.isEmpty() ) |
1518 | mRemoteResource = "ALL"; | 1523 | mRemoteResource = "ALL"; |
1524 | else | ||
1525 | mRemoteResource.replace (QRegExp (" "),"_" ); | ||
1519 | mPassWord = password; | 1526 | mPassWord = password; |
1520 | mSocket = 0; | 1527 | mSocket = 0; |
1521 | mFirst = false; | 1528 | mFirst = false; |
1522 | mFirstLine = true; | 1529 | mFirstLine = true; |
1523 | mPort = port; | 1530 | mPort = port; |
1524 | mHost = host; | 1531 | mHost = host; |
@@ -1539,13 +1546,13 @@ void KCommandSocket::sendFileRequest() | |||
1539 | mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") ); | 1546 | mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") ); |
1540 | mTimerSocket->start( 100, true ); | 1547 | mTimerSocket->start( 100, true ); |
1541 | QTextStream os( mSocket ); | 1548 | QTextStream os( mSocket ); |
1542 | os.setEncoding( QTextStream::Latin1 ); | 1549 | os.setEncoding( QTextStream::Latin1 ); |
1543 | 1550 | ||
1544 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); | 1551 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); |
1545 | os << "GET " << mPassWord << curDt << mRemoteResource << "\r\n\r\n"; | 1552 | os << "GET " << mPassWord << curDt << " " << mRemoteResource << "\r\n\r\n"; |
1546 | } | 1553 | } |
1547 | 1554 | ||
1548 | void KCommandSocket::readFile( QString fn ) | 1555 | void KCommandSocket::readFile( QString fn ) |
1549 | { | 1556 | { |
1550 | if ( !mSocket ) { | 1557 | if ( !mSocket ) { |
1551 | mSocket = new QSocket( this ); | 1558 | mSocket = new QSocket( this ); |
@@ -1614,13 +1621,13 @@ void KCommandSocket::writeFileToSocket() | |||
1614 | mConnectProgress.setProgress( count ); | 1621 | mConnectProgress.setProgress( count ); |
1615 | mConnectProgress.blockSignals( true ); | 1622 | mConnectProgress.blockSignals( true ); |
1616 | QTextStream ts2( &file2 ); | 1623 | QTextStream ts2( &file2 ); |
1617 | ts2.setEncoding( QTextStream::Latin1 ); | 1624 | ts2.setEncoding( QTextStream::Latin1 ); |
1618 | QTextStream os2( mSocket ); | 1625 | QTextStream os2( mSocket ); |
1619 | os2.setEncoding( QTextStream::Latin1 ); | 1626 | os2.setEncoding( QTextStream::Latin1 ); |
1620 | os2 << "PUT " << mPassWord << mRemoteResource << "\r\n\r\n";; | 1627 | os2 << "PUT " << mPassWord << " " << mRemoteResource << "\r\n\r\n";; |
1621 | int byteCount = 0; | 1628 | int byteCount = 0; |
1622 | int byteMax = file2.size()/53; | 1629 | int byteMax = file2.size()/53; |
1623 | while ( ! ts2.atEnd() ) { | 1630 | while ( ! ts2.atEnd() ) { |
1624 | qApp->processEvents(); | 1631 | qApp->processEvents(); |
1625 | if ( byteCount > byteMax ) { | 1632 | if ( byteCount > byteMax ) { |
1626 | byteCount = 0; | 1633 | byteCount = 0; |