-rw-r--r-- | korganizer/calendarview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 547d02b..7eca69d 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -846,192 +846,193 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
846 | break; | 846 | break; |
847 | } | 847 | } |
848 | return 0; | 848 | return 0; |
849 | } | 849 | } |
850 | Event* CalendarView::getLastSyncEvent() | 850 | Event* CalendarView::getLastSyncEvent() |
851 | { | 851 | { |
852 | Event* lse; | 852 | Event* lse; |
853 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 853 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
854 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); | 854 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); |
855 | if (!lse) { | 855 | if (!lse) { |
856 | lse = new Event(); | 856 | lse = new Event(); |
857 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); | 857 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); |
858 | QString sum = ""; | 858 | QString sum = ""; |
859 | if ( KOPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) | 859 | if ( KOPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) |
860 | sum = "E: "; | 860 | sum = "E: "; |
861 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); | 861 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); |
862 | lse->setDtStart( mLastCalendarSync ); | 862 | lse->setDtStart( mLastCalendarSync ); |
863 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 863 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
864 | lse->setCategories( i18n("SyncEvent") ); | 864 | lse->setCategories( i18n("SyncEvent") ); |
865 | lse->setReadOnly( true ); | 865 | lse->setReadOnly( true ); |
866 | mCalendar->addEvent( lse ); | 866 | mCalendar->addEvent( lse ); |
867 | } | 867 | } |
868 | 868 | ||
869 | return lse; | 869 | return lse; |
870 | 870 | ||
871 | } | 871 | } |
872 | // probaly useless | 872 | // probaly useless |
873 | void CalendarView::setupExternSyncProfiles() | 873 | void CalendarView::setupExternSyncProfiles() |
874 | { | 874 | { |
875 | Event* lse; | 875 | Event* lse; |
876 | mExternLastSyncEvent.clear(); | 876 | mExternLastSyncEvent.clear(); |
877 | int i; | 877 | int i; |
878 | for ( i = 0; i < KOPrefs::instance()->mExternSyncProfiles.count(); ++i ) { | 878 | for ( i = 0; i < KOPrefs::instance()->mExternSyncProfiles.count(); ++i ) { |
879 | lse = mCalendar->event( "last-syncEvent-"+ KOPrefs::instance()->mExternSyncProfiles[i] ); | 879 | lse = mCalendar->event( "last-syncEvent-"+ KOPrefs::instance()->mExternSyncProfiles[i] ); |
880 | if ( lse ) | 880 | if ( lse ) |
881 | mExternLastSyncEvent.append( lse ); | 881 | mExternLastSyncEvent.append( lse ); |
882 | else | 882 | else |
883 | qDebug("Last Sync event not found for %s ", KOPrefs::instance()->mExternSyncProfiles[i].latin1()); | 883 | qDebug("Last Sync event not found for %s ", KOPrefs::instance()->mExternSyncProfiles[i].latin1()); |
884 | } | 884 | } |
885 | 885 | ||
886 | } | 886 | } |
887 | // we check, if the to delete event has a id for a profile | 887 | // we check, if the to delete event has a id for a profile |
888 | // if yes, we set this id in the profile to delete | 888 | // if yes, we set this id in the profile to delete |
889 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) | 889 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) |
890 | { | 890 | { |
891 | if ( lastSync.count() == 0 ) { | 891 | if ( lastSync.count() == 0 ) { |
892 | //qDebug(" lastSync.count() == 0"); | 892 | //qDebug(" lastSync.count() == 0"); |
893 | return; | 893 | return; |
894 | } | 894 | } |
895 | if ( toDelete->type() == "Journal" ) | 895 | if ( toDelete->type() == "Journal" ) |
896 | return; | 896 | return; |
897 | 897 | ||
898 | Event* eve = lastSync.first(); | 898 | Event* eve = lastSync.first(); |
899 | 899 | ||
900 | while ( eve ) { | 900 | while ( eve ) { |
901 | QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name | 901 | QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name |
902 | if ( !id.isEmpty() ) { | 902 | if ( !id.isEmpty() ) { |
903 | QString des = eve->description(); | 903 | QString des = eve->description(); |
904 | QString pref = "e"; | 904 | QString pref = "e"; |
905 | if ( toDelete->type() == "Todo" ) | 905 | if ( toDelete->type() == "Todo" ) |
906 | pref = "t"; | 906 | pref = "t"; |
907 | des += pref+ id + ","; | 907 | des += pref+ id + ","; |
908 | eve->setReadOnly( false ); | 908 | eve->setReadOnly( false ); |
909 | eve->setDescription( des ); | 909 | eve->setDescription( des ); |
910 | //qDebug("setdes %s ", des.latin1()); | 910 | //qDebug("setdes %s ", des.latin1()); |
911 | eve->setReadOnly( true ); | 911 | eve->setReadOnly( true ); |
912 | } | 912 | } |
913 | eve = lastSync.next(); | 913 | eve = lastSync.next(); |
914 | } | 914 | } |
915 | 915 | ||
916 | } | 916 | } |
917 | void CalendarView::checkExternalId( Incidence * inc ) | 917 | void CalendarView::checkExternalId( Incidence * inc ) |
918 | { | 918 | { |
919 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; | 919 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; |
920 | checkExternSyncEvent( lastSync, inc ); | 920 | checkExternSyncEvent( lastSync, inc ); |
921 | 921 | ||
922 | } | 922 | } |
923 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) | 923 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) |
924 | { | 924 | { |
925 | bool syncOK = true; | 925 | bool syncOK = true; |
926 | int addedEvent = 0; | 926 | int addedEvent = 0; |
927 | int addedEventR = 0; | 927 | int addedEventR = 0; |
928 | int deletedEventR = 0; | 928 | int deletedEventR = 0; |
929 | int deletedEventL = 0; | 929 | int deletedEventL = 0; |
930 | int changedLocal = 0; | 930 | int changedLocal = 0; |
931 | int changedRemote = 0; | 931 | int changedRemote = 0; |
932 | //QPtrList<Event> el = local->rawEvents(); | 932 | //QPtrList<Event> el = local->rawEvents(); |
933 | Event* eventR; | 933 | Event* eventR; |
934 | QString uid; | 934 | QString uid; |
935 | int take; | 935 | int take; |
936 | Event* eventL; | 936 | Event* eventL; |
937 | Event* eventRSync; | 937 | Event* eventRSync; |
938 | Event* eventLSync; | 938 | Event* eventLSync; |
939 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 939 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
940 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 940 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
941 | bool fullDateRange = false; | 941 | bool fullDateRange = false; |
942 | local->resetTempSyncStat(); | ||
942 | mLastCalendarSync = QDateTime::currentDateTime(); | 943 | mLastCalendarSync = QDateTime::currentDateTime(); |
943 | QDateTime modifiedCalendar = mLastCalendarSync;; | 944 | QDateTime modifiedCalendar = mLastCalendarSync;; |
944 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 945 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
945 | if ( eventR ) { | 946 | if ( eventR ) { |
946 | eventRSync = (Event*) eventR->clone(); | 947 | eventRSync = (Event*) eventR->clone(); |
947 | remote->deleteEvent(eventR ); | 948 | remote->deleteEvent(eventR ); |
948 | 949 | ||
949 | } else { | 950 | } else { |
950 | fullDateRange = true; | 951 | fullDateRange = true; |
951 | eventRSync = new Event(); | 952 | eventRSync = new Event(); |
952 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); | 953 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); |
953 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); | 954 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); |
954 | eventRSync->setDtStart( mLastCalendarSync ); | 955 | eventRSync->setDtStart( mLastCalendarSync ); |
955 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 956 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
956 | eventRSync->setCategories( i18n("SyncEvent") ); | 957 | eventRSync->setCategories( i18n("SyncEvent") ); |
957 | } | 958 | } |
958 | eventLSync = getLastSyncEvent(); | 959 | eventLSync = getLastSyncEvent(); |
959 | if ( eventLSync->dtStart() == mLastCalendarSync ) | 960 | if ( eventLSync->dtStart() == mLastCalendarSync ) |
960 | fullDateRange = true; | 961 | fullDateRange = true; |
961 | 962 | ||
962 | if ( ! fullDateRange ) { | 963 | if ( ! fullDateRange ) { |
963 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { | 964 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { |
964 | 965 | ||
965 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); | 966 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); |
966 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); | 967 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); |
967 | fullDateRange = true; | 968 | fullDateRange = true; |
968 | } | 969 | } |
969 | } | 970 | } |
970 | if ( fullDateRange ) | 971 | if ( fullDateRange ) |
971 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 972 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |
972 | else | 973 | else |
973 | mLastCalendarSync = eventLSync->dtStart(); | 974 | mLastCalendarSync = eventLSync->dtStart(); |
974 | // for resyncing if own file has changed | 975 | // for resyncing if own file has changed |
975 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 976 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
976 | mLastCalendarSync = loadedFileVersion; | 977 | mLastCalendarSync = loadedFileVersion; |
977 | qDebug("setting mLastCalendarSync "); | 978 | qDebug("setting mLastCalendarSync "); |
978 | } | 979 | } |
979 | //qDebug("*************************** "); | 980 | //qDebug("*************************** "); |
980 | qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() ); | 981 | qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() ); |
981 | QPtrList<Incidence> er = remote->rawIncidences(); | 982 | QPtrList<Incidence> er = remote->rawIncidences(); |
982 | Incidence* inR = er.first(); | 983 | Incidence* inR = er.first(); |
983 | Incidence* inL; | 984 | Incidence* inL; |
984 | QProgressBar bar( er.count(),0 ); | 985 | QProgressBar bar( er.count(),0 ); |
985 | bar.setCaption (i18n("Syncing - close to abort!") ); | 986 | bar.setCaption (i18n("Syncing - close to abort!") ); |
986 | 987 | ||
987 | int w = 300; | 988 | int w = 300; |
988 | if ( QApplication::desktop()->width() < 320 ) | 989 | if ( QApplication::desktop()->width() < 320 ) |
989 | w = 220; | 990 | w = 220; |
990 | int h = bar.sizeHint().height() ; | 991 | int h = bar.sizeHint().height() ; |
991 | int dw = QApplication::desktop()->width(); | 992 | int dw = QApplication::desktop()->width(); |
992 | int dh = QApplication::desktop()->height(); | 993 | int dh = QApplication::desktop()->height(); |
993 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 994 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
994 | bar.show(); | 995 | bar.show(); |
995 | int modulo = (er.count()/10)+1; | 996 | int modulo = (er.count()/10)+1; |
996 | int incCounter = 0; | 997 | int incCounter = 0; |
997 | while ( inR ) { | 998 | while ( inR ) { |
998 | if ( ! bar.isVisible() ) | 999 | if ( ! bar.isVisible() ) |
999 | return false; | 1000 | return false; |
1000 | if ( incCounter % modulo == 0 ) | 1001 | if ( incCounter % modulo == 0 ) |
1001 | bar.setProgress( incCounter ); | 1002 | bar.setProgress( incCounter ); |
1002 | ++incCounter; | 1003 | ++incCounter; |
1003 | uid = inR->uid(); | 1004 | uid = inR->uid(); |
1004 | bool skipIncidence = false; | 1005 | bool skipIncidence = false; |
1005 | if ( uid.left(15) == QString("last-syncEvent-") ) | 1006 | if ( uid.left(15) == QString("last-syncEvent-") ) |
1006 | skipIncidence = true; | 1007 | skipIncidence = true; |
1007 | 1008 | ||
1008 | qApp->processEvents(); | 1009 | qApp->processEvents(); |
1009 | if ( !skipIncidence ) { | 1010 | if ( !skipIncidence ) { |
1010 | inL = local->incidence( uid ); | 1011 | inL = local->incidence( uid ); |
1011 | if ( inL ) { // maybe conflict - same uid in both calendars | 1012 | if ( inL ) { // maybe conflict - same uid in both calendars |
1012 | int maxrev = inL->revision(); | 1013 | int maxrev = inL->revision(); |
1013 | if ( maxrev < inR->revision() ) | 1014 | if ( maxrev < inR->revision() ) |
1014 | maxrev = inR->revision(); | 1015 | maxrev = inR->revision(); |
1015 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { | 1016 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { |
1016 | //qDebug("take %d %s ", take, inL->summary().latin1()); | 1017 | //qDebug("take %d %s ", take, inL->summary().latin1()); |
1017 | if ( take == 3 ) | 1018 | if ( take == 3 ) |
1018 | return false; | 1019 | return false; |
1019 | if ( take == 1 ) {// take local | 1020 | if ( take == 1 ) {// take local |
1020 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1021 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
1021 | remote->deleteIncidence( inR ); | 1022 | remote->deleteIncidence( inR ); |
1022 | if ( inL->revision() < maxrev ) | 1023 | if ( inL->revision() < maxrev ) |
1023 | inL->setRevision( maxrev ); | 1024 | inL->setRevision( maxrev ); |
1024 | remote->addIncidence( inL->clone() ); | 1025 | remote->addIncidence( inL->clone() ); |
1025 | ++changedRemote; | 1026 | ++changedRemote; |
1026 | } else { | 1027 | } else { |
1027 | if ( inR->revision() < maxrev ) | 1028 | if ( inR->revision() < maxrev ) |
1028 | inR->setRevision( maxrev ); | 1029 | inR->setRevision( maxrev ); |
1029 | local->deleteIncidence( inL ); | 1030 | local->deleteIncidence( inL ); |
1030 | local->addIncidence( inR->clone() ); | 1031 | local->addIncidence( inR->clone() ); |
1031 | ++changedLocal; | 1032 | ++changedLocal; |
1032 | } | 1033 | } |
1033 | } | 1034 | } |
1034 | } else { // no conflict | 1035 | } else { // no conflict |
1035 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1036 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1036 | QString des = eventLSync->description(); | 1037 | QString des = eventLSync->description(); |
1037 | QString pref = "e"; | 1038 | QString pref = "e"; |