author | zautrix <zautrix> | 2004-09-18 17:25:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-18 17:25:46 (UTC) |
commit | 3f16c7aa0ab6badf304c537a6981ece743138821 (patch) (unidiff) | |
tree | 1dda326a1025477c7dd1a284609fa108da4e2e1d /kaddressbook | |
parent | a355a58898d0d08d797f872751254cfa958387c1 (diff) | |
download | kdepimpi-3f16c7aa0ab6badf304c537a6981ece743138821.zip kdepimpi-3f16c7aa0ab6badf304c537a6981ece743138821.tar.gz kdepimpi-3f16c7aa0ab6badf304c537a6981ece743138821.tar.bz2 |
sync fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 215ce83..74c10d2 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2483,97 +2483,97 @@ void KABCore::edit_sync_options() | |||
2483 | // both.setChecked( true); | 2483 | // both.setChecked( true); |
2484 | break; | 2484 | break; |
2485 | default: | 2485 | default: |
2486 | break; | 2486 | break; |
2487 | } | 2487 | } |
2488 | if ( dia.exec() ) { | 2488 | if ( dia.exec() ) { |
2489 | KABPrefs::instance()->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; | 2489 | KABPrefs::instance()->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; |
2490 | } | 2490 | } |
2491 | 2491 | ||
2492 | 2492 | ||
2493 | } | 2493 | } |
2494 | QString KABCore::getPassword( ) | 2494 | QString KABCore::getPassword( ) |
2495 | { | 2495 | { |
2496 | QString retfile = ""; | 2496 | QString retfile = ""; |
2497 | QDialog dia ( this, "input-dialog", true ); | 2497 | QDialog dia ( this, "input-dialog", true ); |
2498 | QLineEdit lab ( &dia ); | 2498 | QLineEdit lab ( &dia ); |
2499 | lab.setEchoMode( QLineEdit::Password ); | 2499 | lab.setEchoMode( QLineEdit::Password ); |
2500 | QVBoxLayout lay( &dia ); | 2500 | QVBoxLayout lay( &dia ); |
2501 | lay.setMargin(7); | 2501 | lay.setMargin(7); |
2502 | lay.setSpacing(7); | 2502 | lay.setSpacing(7); |
2503 | lay.addWidget( &lab); | 2503 | lay.addWidget( &lab); |
2504 | dia.setFixedSize( 230,50 ); | 2504 | dia.setFixedSize( 230,50 ); |
2505 | dia.setCaption( i18n("Enter password") ); | 2505 | dia.setCaption( i18n("Enter password") ); |
2506 | QPushButton pb ( "OK", &dia); | 2506 | QPushButton pb ( "OK", &dia); |
2507 | lay.addWidget( &pb ); | 2507 | lay.addWidget( &pb ); |
2508 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 2508 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
2509 | dia.show(); | 2509 | dia.show(); |
2510 | int res = dia.exec(); | 2510 | int res = dia.exec(); |
2511 | if ( res ) | 2511 | if ( res ) |
2512 | retfile = lab.text(); | 2512 | retfile = lab.text(); |
2513 | dia.hide(); | 2513 | dia.hide(); |
2514 | qApp->processEvents(); | 2514 | qApp->processEvents(); |
2515 | return retfile; | 2515 | return retfile; |
2516 | 2516 | ||
2517 | } | 2517 | } |
2518 | #include <libkcal/syncdefines.h> | 2518 | #include <libkcal/syncdefines.h> |
2519 | 2519 | ||
2520 | KABC::Addressee KABCore::getLastSyncAddressee() | 2520 | KABC::Addressee KABCore::getLastSyncAddressee() |
2521 | { | 2521 | { |
2522 | Addressee lse; | 2522 | Addressee lse; |
2523 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 2523 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
2524 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2524 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2525 | if (lse.isEmpty()) { | 2525 | if (lse.isEmpty()) { |
2526 | qDebug("Creating new last-syncAddressee "); | 2526 | qDebug("Creating new last-syncAddressee "); |
2527 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2527 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2528 | QString sum = ""; | 2528 | QString sum = ""; |
2529 | if ( KABPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) | 2529 | if ( KABPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) |
2530 | sum = "E: "; | 2530 | sum = "E: "; |
2531 | lse.setFamilyName(sum+mCurrentSyncDevice + i18n(" - sync event")); | 2531 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); |
2532 | lse.setRevision( mLastAddressbookSync ); | 2532 | lse.setRevision( mLastAddressbookSync ); |
2533 | lse.setCategories( i18n("SyncEvent") ); | 2533 | lse.setCategories( i18n("SyncEvent") ); |
2534 | mAddressBook->insertAddressee( lse ); | 2534 | mAddressBook->insertAddressee( lse ); |
2535 | } | 2535 | } |
2536 | return lse; | 2536 | return lse; |
2537 | } | 2537 | } |
2538 | int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ) | 2538 | int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ) |
2539 | { | 2539 | { |
2540 | 2540 | ||
2541 | //void setZaurusId(int id); | 2541 | //void setZaurusId(int id); |
2542 | // int zaurusId() const; | 2542 | // int zaurusId() const; |
2543 | // void setZaurusUid(int id); | 2543 | // void setZaurusUid(int id); |
2544 | // int zaurusUid() const; | 2544 | // int zaurusUid() const; |
2545 | // void setZaurusStat(int id); | 2545 | // void setZaurusStat(int id); |
2546 | // int zaurusStat() const; | 2546 | // int zaurusStat() const; |
2547 | // 0 equal | 2547 | // 0 equal |
2548 | // 1 take local | 2548 | // 1 take local |
2549 | // 2 take remote | 2549 | // 2 take remote |
2550 | // 3 cancel | 2550 | // 3 cancel |
2551 | QDateTime lastSync = mLastAddressbookSync; | 2551 | QDateTime lastSync = mLastAddressbookSync; |
2552 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2552 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2553 | bool remCh, locCh; | 2553 | bool remCh, locCh; |
2554 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 2554 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
2555 | //if ( remCh ) | 2555 | //if ( remCh ) |
2556 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 2556 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
2557 | locCh = ( local->revision() > mLastAddressbookSync ); | 2557 | locCh = ( local->revision() > mLastAddressbookSync ); |
2558 | if ( !remCh && ! locCh ) { | 2558 | if ( !remCh && ! locCh ) { |
2559 | //qDebug("both not changed "); | 2559 | //qDebug("both not changed "); |
2560 | lastSync = local->revision().addDays(1); | 2560 | lastSync = local->revision().addDays(1); |
2561 | } else { | 2561 | } else { |
2562 | if ( locCh ) { | 2562 | if ( locCh ) { |
2563 | //qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1()); | 2563 | //qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1()); |
2564 | lastSync = local->revision().addDays( -1 ); | 2564 | lastSync = local->revision().addDays( -1 ); |
2565 | if ( !remCh ) | 2565 | if ( !remCh ) |
2566 | remote->setRevision( lastSync.addDays( -1 ) ); | 2566 | remote->setRevision( lastSync.addDays( -1 ) ); |
2567 | } else { | 2567 | } else { |
2568 | //qDebug(" not loc changed "); | 2568 | //qDebug(" not loc changed "); |
2569 | lastSync = local->revision().addDays( 1 ); | 2569 | lastSync = local->revision().addDays( 1 ); |
2570 | if ( remCh ) | 2570 | if ( remCh ) |
2571 | remote->setRevision( lastSync.addDays( 1 ) ); | 2571 | remote->setRevision( lastSync.addDays( 1 ) ); |
2572 | 2572 | ||
2573 | } | 2573 | } |
2574 | } | 2574 | } |
2575 | full = true; | 2575 | full = true; |
2576 | if ( mode < SYNC_PREF_ASK ) | 2576 | if ( mode < SYNC_PREF_ASK ) |
2577 | mode = SYNC_PREF_ASK; | 2577 | mode = SYNC_PREF_ASK; |
2578 | } else { | 2578 | } else { |
2579 | if ( local->revision() == remote->revision() ) | 2579 | if ( local->revision() == remote->revision() ) |
@@ -2718,249 +2718,251 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2718 | } | 2718 | } |
2719 | if ( ! fullDateRange ) { | 2719 | if ( ! fullDateRange ) { |
2720 | if ( addresseeLSync.revision() != addresseeRSync.revision() ) { | 2720 | if ( addresseeLSync.revision() != addresseeRSync.revision() ) { |
2721 | 2721 | ||
2722 | // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); | 2722 | // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); |
2723 | //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec()); | 2723 | //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec()); |
2724 | fullDateRange = true; | 2724 | fullDateRange = true; |
2725 | qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); | 2725 | qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); |
2726 | } | 2726 | } |
2727 | } | 2727 | } |
2728 | if ( fullDateRange ) | 2728 | if ( fullDateRange ) |
2729 | mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365); | 2729 | mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365); |
2730 | else | 2730 | else |
2731 | mLastAddressbookSync = addresseeLSync.revision(); | 2731 | mLastAddressbookSync = addresseeLSync.revision(); |
2732 | // for resyncing if own file has changed | 2732 | // for resyncing if own file has changed |
2733 | // PENDING fixme later when implemented | 2733 | // PENDING fixme later when implemented |
2734 | #if 0 | 2734 | #if 0 |
2735 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 2735 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
2736 | mLastAddressbookSync = loadedFileVersion; | 2736 | mLastAddressbookSync = loadedFileVersion; |
2737 | qDebug("setting mLastAddressbookSync "); | 2737 | qDebug("setting mLastAddressbookSync "); |
2738 | } | 2738 | } |
2739 | #endif | 2739 | #endif |
2740 | 2740 | ||
2741 | //qDebug("*************************** "); | 2741 | //qDebug("*************************** "); |
2742 | qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() ); | 2742 | qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() ); |
2743 | QStringList er = remote->uidList(); | 2743 | QStringList er = remote->uidList(); |
2744 | Addressee inR ;//= er.first(); | 2744 | Addressee inR ;//= er.first(); |
2745 | Addressee inL; | 2745 | Addressee inL; |
2746 | QProgressBar bar( er.count(),0 ); | 2746 | QProgressBar bar( er.count(),0 ); |
2747 | bar.setCaption (i18n("Syncing - close to abort!") ); | 2747 | bar.setCaption (i18n("Syncing - close to abort!") ); |
2748 | 2748 | ||
2749 | int w = 300; | 2749 | int w = 300; |
2750 | if ( QApplication::desktop()->width() < 320 ) | 2750 | if ( QApplication::desktop()->width() < 320 ) |
2751 | w = 220; | 2751 | w = 220; |
2752 | int h = bar.sizeHint().height() ; | 2752 | int h = bar.sizeHint().height() ; |
2753 | int dw = QApplication::desktop()->width(); | 2753 | int dw = QApplication::desktop()->width(); |
2754 | int dh = QApplication::desktop()->height(); | 2754 | int dh = QApplication::desktop()->height(); |
2755 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 2755 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
2756 | bar.show(); | 2756 | bar.show(); |
2757 | int modulo = (er.count()/10)+1; | 2757 | int modulo = (er.count()/10)+1; |
2758 | int incCounter = 0; | 2758 | int incCounter = 0; |
2759 | while ( incCounter < er.count()) { | 2759 | while ( incCounter < er.count()) { |
2760 | if ( ! bar.isVisible() ) | 2760 | if ( ! bar.isVisible() ) |
2761 | return false; | 2761 | return false; |
2762 | if ( incCounter % modulo == 0 ) | 2762 | if ( incCounter % modulo == 0 ) |
2763 | bar.setProgress( incCounter ); | 2763 | bar.setProgress( incCounter ); |
2764 | uid = er[ incCounter ]; | 2764 | uid = er[ incCounter ]; |
2765 | bool skipIncidence = false; | 2765 | bool skipIncidence = false; |
2766 | if ( uid.left(20) == QString("last-syncAddressee-") ) | 2766 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2767 | skipIncidence = true; | 2767 | skipIncidence = true; |
2768 | QString idS; | 2768 | QString idS; |
2769 | qApp->processEvents(); | 2769 | qApp->processEvents(); |
2770 | if ( !skipIncidence ) { | 2770 | if ( !skipIncidence ) { |
2771 | inL = local->findByUid( uid ); | 2771 | inL = local->findByUid( uid ); |
2772 | inR = remote->findByUid( uid ); | 2772 | inR = remote->findByUid( uid ); |
2773 | //inL.setResource( 0 ); | 2773 | //inL.setResource( 0 ); |
2774 | //inR.setResource( 0 ); | 2774 | //inR.setResource( 0 ); |
2775 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars | 2775 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars |
2776 | if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) { | 2776 | if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) { |
2777 | //qDebug("take %d %s ", take, inL.summary().latin1()); | 2777 | //qDebug("take %d %s ", take, inL.summary().latin1()); |
2778 | if ( take == 3 ) | 2778 | if ( take == 3 ) |
2779 | return false; | 2779 | return false; |
2780 | if ( take == 1 ) {// take local | 2780 | if ( take == 1 ) {// take local |
2781 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2781 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2782 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); | 2782 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); |
2783 | local->insertAddressee( inL, false ); | 2783 | local->insertAddressee( inL, false ); |
2784 | } | 2784 | } |
2785 | else | 2785 | else |
2786 | idS = inR.IDStr(); | 2786 | idS = inR.IDStr(); |
2787 | remote->removeAddressee( inR ); | 2787 | remote->removeAddressee( inR ); |
2788 | inR = inL; | 2788 | inR = inL; |
2789 | inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 2789 | inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
2790 | if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) | 2790 | if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) |
2791 | inR.setIDStr( idS ); | 2791 | inR.setIDStr( idS ); |
2792 | inR.setResource( 0 ); | 2792 | inR.setResource( 0 ); |
2793 | remote->insertAddressee( inR , false); | 2793 | remote->insertAddressee( inR , false); |
2794 | ++changedRemote; | 2794 | ++changedRemote; |
2795 | } else { | 2795 | } else { |
2796 | idS = inL.IDStr(); | 2796 | idS = inL.IDStr(); |
2797 | local->removeAddressee( inL ); | 2797 | local->removeAddressee( inL ); |
2798 | inL = inR; | 2798 | inL = inR; |
2799 | inL.setIDStr( idS ); | 2799 | inL.setIDStr( idS ); |
2800 | inL.setResource( 0 ); | 2800 | inL.setResource( 0 ); |
2801 | local->insertAddressee( inL , false ); | 2801 | local->insertAddressee( inL , false ); |
2802 | ++changedLocal; | 2802 | ++changedLocal; |
2803 | } | 2803 | } |
2804 | } | 2804 | } |
2805 | } else { // no conflict | 2805 | } else { // no conflict |
2806 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2806 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2807 | QString des = addresseeLSync.note(); | 2807 | QString des = addresseeLSync.note(); |
2808 | QString pref = "a"; | 2808 | QString pref = "a"; |
2809 | if ( des.find(pref+ inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it | 2809 | if ( des.find(pref+ inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
2810 | inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 2810 | inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
2811 | ++deletedAddresseeR; | 2811 | ++deletedAddresseeR; |
2812 | } else { | 2812 | } else { |
2813 | inR.setRevision( modifiedCalendar ); | 2813 | inR.setRevision( modifiedCalendar ); |
2814 | remote->insertAddressee( inR, false ); | 2814 | remote->insertAddressee( inR, false ); |
2815 | inL = inR; | 2815 | inL = inR; |
2816 | inL.setResource( 0 ); | 2816 | inL.setResource( 0 ); |
2817 | local->insertAddressee( inL , false); | 2817 | local->insertAddressee( inL , false); |
2818 | ++addedAddressee; | 2818 | ++addedAddressee; |
2819 | } | 2819 | } |
2820 | } else { | 2820 | } else { |
2821 | if ( inR.revision() > mLastAddressbookSync || mode == 5 ) { | 2821 | if ( inR.revision() > mLastAddressbookSync || mode == 5 ) { |
2822 | inR.setRevision( modifiedCalendar ); | 2822 | inR.setRevision( modifiedCalendar ); |
2823 | remote->insertAddressee( inR, false ); | 2823 | remote->insertAddressee( inR, false ); |
2824 | inR.setResource( 0 ); | 2824 | inR.setResource( 0 ); |
2825 | local->insertAddressee( inR, false ); | 2825 | local->insertAddressee( inR, false ); |
2826 | ++addedAddressee; | 2826 | ++addedAddressee; |
2827 | } else { | 2827 | } else { |
2828 | // pending checkExternSyncAddressee(addresseeRSyncSharp, inR); | 2828 | // pending checkExternSyncAddressee(addresseeRSyncSharp, inR); |
2829 | remote->removeAddressee( inR ); | 2829 | remote->removeAddressee( inR ); |
2830 | ++deletedAddresseeR; | 2830 | ++deletedAddresseeR; |
2831 | } | 2831 | } |
2832 | } | 2832 | } |
2833 | } | 2833 | } |
2834 | } | 2834 | } |
2835 | ++incCounter; | 2835 | ++incCounter; |
2836 | } | 2836 | } |
2837 | er.clear(); | 2837 | er.clear(); |
2838 | QStringList el = remote->uidList(); | 2838 | QStringList el = remote->uidList(); |
2839 | modulo = (el.count()/10)+1; | 2839 | modulo = (el.count()/10)+1; |
2840 | bar.setCaption (i18n("Add / remove addressees") ); | 2840 | bar.setCaption (i18n("Add / remove addressees") ); |
2841 | bar.setTotalSteps ( el.count() ) ; | 2841 | bar.setTotalSteps ( el.count() ) ; |
2842 | bar.show(); | 2842 | bar.show(); |
2843 | incCounter = 0; | 2843 | incCounter = 0; |
2844 | while ( incCounter < el.count()) { | 2844 | while ( incCounter < el.count()) { |
2845 | 2845 | ||
2846 | qApp->processEvents(); | 2846 | qApp->processEvents(); |
2847 | if ( ! bar.isVisible() ) | 2847 | if ( ! bar.isVisible() ) |
2848 | return false; | 2848 | return false; |
2849 | if ( incCounter % modulo == 0 ) | 2849 | if ( incCounter % modulo == 0 ) |
2850 | bar.setProgress( incCounter ); | 2850 | bar.setProgress( incCounter ); |
2851 | uid = el[ incCounter ]; | 2851 | uid = el[ incCounter ]; |
2852 | bool skipIncidence = false; | 2852 | bool skipIncidence = false; |
2853 | if ( uid.left(20) == QString("last-syncAddressee-") ) | 2853 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2854 | skipIncidence = true; | 2854 | skipIncidence = true; |
2855 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) | 2855 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) |
2856 | skipIncidence = true; | 2856 | skipIncidence = true; |
2857 | if ( !skipIncidence ) { | 2857 | if ( !skipIncidence ) { |
2858 | inL = local->findByUid( uid ); | 2858 | inL = local->findByUid( uid ); |
2859 | inR = remote->findByUid( uid ); | 2859 | inR = remote->findByUid( uid ); |
2860 | if ( inR.isEmpty() ) { | 2860 | if ( inR.isEmpty() ) { |
2861 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2861 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2862 | if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 2862 | if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
2863 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); | 2863 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); |
2864 | local->removeAddressee( inL ); | 2864 | local->removeAddressee( inL ); |
2865 | ++deletedAddresseeL; | 2865 | ++deletedAddresseeL; |
2866 | } else { | 2866 | } else { |
2867 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { | 2867 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { |
2868 | inL.removeID(mCurrentSyncDevice ); | 2868 | inL.removeID(mCurrentSyncDevice ); |
2869 | ++addedAddresseeR; | 2869 | ++addedAddresseeR; |
2870 | //qDebug("remote added Incidence %s ", inL.summary().latin1()); | 2870 | //qDebug("remote added Incidence %s ", inL.summary().latin1()); |
2871 | inL.setRevision( modifiedCalendar ); | 2871 | inL.setRevision( modifiedCalendar ); |
2872 | local->insertAddressee( inL, false ); | 2872 | local->insertAddressee( inL, false ); |
2873 | inR = inL; | 2873 | inR = inL; |
2874 | inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 2874 | inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
2875 | inR.setResource( 0 ); | 2875 | inR.setResource( 0 ); |
2876 | remote->insertAddressee( inR, false ); | 2876 | remote->insertAddressee( inR, false ); |
2877 | } | 2877 | } |
2878 | } | 2878 | } |
2879 | } else { | 2879 | } else { |
2880 | if ( inL.revision() < mLastAddressbookSync && mode != 4 ) { | 2880 | if ( inL.revision() < mLastAddressbookSync && mode != 4 ) { |
2881 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); | 2881 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); |
2882 | local->removeAddressee( inL ); | 2882 | local->removeAddressee( inL ); |
2883 | ++deletedAddresseeL; | 2883 | ++deletedAddresseeL; |
2884 | } else { | 2884 | } else { |
2885 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { | 2885 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { |
2886 | ++addedAddresseeR; | 2886 | ++addedAddresseeR; |
2887 | inL.setRevision( modifiedCalendar ); | 2887 | inL.setRevision( modifiedCalendar ); |
2888 | local->insertAddressee( inL, false ); | 2888 | local->insertAddressee( inL, false ); |
2889 | inR = inL; | 2889 | inR = inL; |
2890 | inR.setResource( 0 ); | 2890 | inR.setResource( 0 ); |
2891 | remote->insertAddressee( inR, false ); | 2891 | remote->insertAddressee( inR, false ); |
2892 | } | 2892 | } |
2893 | } | 2893 | } |
2894 | } | 2894 | } |
2895 | } | 2895 | } |
2896 | } | 2896 | } |
2897 | ++incCounter; | 2897 | ++incCounter; |
2898 | } | 2898 | } |
2899 | el.clear(); | 2899 | el.clear(); |
2900 | |||
2901 | |||
2902 | |||
2903 | bar.hide(); | 2900 | bar.hide(); |
2904 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); | 2901 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); |
2905 | // get rid of micro seconds | 2902 | // get rid of micro seconds |
2906 | QTime t = mLastAddressbookSync.time(); | 2903 | QTime t = mLastAddressbookSync.time(); |
2907 | mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); | 2904 | mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); |
2908 | addresseeLSync.setRevision( mLastAddressbookSync ); | 2905 | addresseeLSync.setRevision( mLastAddressbookSync ); |
2909 | addresseeRSync.setRevision( mLastAddressbookSync ); | 2906 | addresseeRSync.setRevision( mLastAddressbookSync ); |
2910 | addresseeRSync.setGivenName( i18n("Remote from: ")+mCurrentSyncName ) ; | 2907 | addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; |
2911 | addresseeLSync.setGivenName(i18n("Local from: ") + mCurrentSyncName ); | 2908 | addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); |
2909 | addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ; | ||
2910 | addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") ); | ||
2911 | addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ; | ||
2912 | addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() ); | ||
2913 | |||
2912 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) | 2914 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) |
2913 | remote->insertAddressee( addresseeRSync, false ); | 2915 | remote->insertAddressee( addresseeRSync, false ); |
2914 | local->insertAddressee( addresseeLSync, false ); | 2916 | local->insertAddressee( addresseeLSync, false ); |
2915 | QString mes; | 2917 | QString mes; |
2916 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); | 2918 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); |
2917 | if ( KABPrefs::instance()->mShowSyncSummary ) { | 2919 | if ( KABPrefs::instance()->mShowSyncSummary ) { |
2918 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); | 2920 | KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") ); |
2919 | } | 2921 | } |
2920 | qDebug( mes ); | 2922 | qDebug( mes ); |
2921 | return syncOK; | 2923 | return syncOK; |
2922 | } | 2924 | } |
2923 | 2925 | ||
2924 | bool KABCore::syncAB(QString filename, int mode) | 2926 | bool KABCore::syncAB(QString filename, int mode) |
2925 | { | 2927 | { |
2926 | 2928 | ||
2927 | //pending prepare addresseeview for output | 2929 | //pending prepare addresseeview for output |
2928 | //pending detect, if remote file has REV field. if not switch to external sync | 2930 | //pending detect, if remote file has REV field. if not switch to external sync |
2929 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 2931 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
2930 | AddressBook abLocal(filename,"syncContact"); | 2932 | AddressBook abLocal(filename,"syncContact"); |
2931 | bool syncOK = false; | 2933 | bool syncOK = false; |
2932 | if ( abLocal.load() ) { | 2934 | if ( abLocal.load() ) { |
2933 | qDebug("AB loaded %s mode %d",filename.latin1(), mode ); | 2935 | qDebug("AB loaded %s mode %d",filename.latin1(), mode ); |
2934 | AddressBook::Iterator it; | 2936 | AddressBook::Iterator it; |
2935 | //QStringList vcards; | 2937 | //QStringList vcards; |
2936 | //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | 2938 | //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { |
2937 | // qDebug("Name %s ", (*it).familyName().latin1()); | 2939 | // qDebug("Name %s ", (*it).familyName().latin1()); |
2938 | //} | 2940 | //} |
2939 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); | 2941 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); |
2940 | if ( syncOK ) { | 2942 | if ( syncOK ) { |
2941 | if ( KABPrefs::instance()->mWriteBackFile ) | 2943 | if ( KABPrefs::instance()->mWriteBackFile ) |
2942 | { | 2944 | { |
2943 | qDebug("saving remote AB "); | 2945 | qDebug("saving remote AB "); |
2944 | abLocal.saveAB(); | 2946 | abLocal.saveAB(); |
2945 | } | 2947 | } |
2946 | } | 2948 | } |
2947 | setModified(); | 2949 | setModified(); |
2948 | 2950 | ||
2949 | } | 2951 | } |
2950 | if ( syncOK ) | 2952 | if ( syncOK ) |
2951 | mViewManager->refreshView(); | 2953 | mViewManager->refreshView(); |
2952 | return syncOK; | 2954 | return syncOK; |
2953 | #if 0 | 2955 | #if 0 |
2954 | 2956 | ||
2955 | if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { | 2957 | if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { |
2956 | getEventViewerDialog()->setSyncMode( true ); | 2958 | getEventViewerDialog()->setSyncMode( true ); |
2957 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); | 2959 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); |
2958 | getEventViewerDialog()->setSyncMode( false ); | 2960 | getEventViewerDialog()->setSyncMode( false ); |
2959 | if ( syncOK ) { | 2961 | if ( syncOK ) { |
2960 | if ( KOPrefs::instance()->mWriteBackFile ) | 2962 | if ( KOPrefs::instance()->mWriteBackFile ) |
2961 | { | 2963 | { |
2962 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); | 2964 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); |
2963 | storage->save(); | 2965 | storage->save(); |
2964 | } | 2966 | } |
2965 | } | 2967 | } |
2966 | setModified(); | 2968 | setModified(); |