| -rw-r--r-- | libkcal/event.cpp | 73 |
1 files changed, 65 insertions, 8 deletions
diff --git a/libkcal/event.cpp b/libkcal/event.cpp index 46e8174..5285559 100644 --- a/libkcal/event.cpp +++ b/libkcal/event.cpp @@ -192,16 +192,23 @@ bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, QDateTime* else *overlapDT = mDtStart; if ( startDT ) return (*overlapDT >= *startDT ); return true; } return false; } + if ( !doesFloat() && !testEvent->doesFloat() && !isMultiDay() && !testEvent->isMultiDay() ) { + if ( mDtStart.time() >= testEvent->mDtEnd.time() || testEvent->mDtStart.time() >= mDtEnd.time() ) { + // no need to test. times mismatch + //fprintf(stderr,"timi "); + return false; + } + } Event *nonRecur = 0; Event *recurEvent = 0; if ( ! doesRecur() ) { nonRecur = this; recurEvent = testEvent; } else if ( !testEvent->doesRecur() ) { nonRecur = testEvent; @@ -212,21 +219,33 @@ bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, QDateTime* if ( nonRecur->doesFloat() ) enr = nonRecur->mDtEnd.addDays( 1 ); else enr = nonRecur->mDtEnd; if ( enr < recurEvent->mDtStart ) return false; if ( startDT && enr < *startDT ) return false; + int recDuration = recurEvent->mDtStart.secsTo( recurEvent->mDtEnd ); if ( recurEvent->doesFloat() ) recDuration += 86400; - bool ok = true; - QDateTime recStart = recurEvent->mDtStart.addSecs( -300);; + bool ok = false; + QDateTime recStart; + if ( startDT ) { + recStart = recurEvent->recurrence()->getPreviousDateTime( startDT->addSecs( 61 ), &ok ); + } + if ( recStart.isValid() ) { + //qDebug("%s start at %s ", startDT-> toString().latin1(), recStart.toString().latin1()); + recStart = recStart.addSecs( -300); + } + else + recStart = recurEvent->mDtStart.addSecs( -300); + ok = true; + while ( ok ) { recStart = recurEvent->getNextOccurence( recStart.addSecs( 60 ), &ok ); if ( ok ) { if ( recStart > enr ) return false; QDateTime recEnd = recStart.addSecs( recDuration ); if ( nonRecur->mDtStart < recEnd && recStart < nonRecur->mDtEnd ) { if ( nonRecur->mDtStart < recStart ) @@ -238,57 +257,95 @@ bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, QDateTime* return true; } else return true; } } } return false; } + if ( !doesFloat() && !testEvent->doesFloat() && !isMultiDay() && !testEvent->isMultiDay() ) { + if ( recurrence()->doesRecur() == Recurrence::rWeekly && testEvent->recurrence()->doesRecur() == Recurrence::rWeekly ) { + bool found = false; + uint i; + for ( i=0; i< recurrence()->days().size();++i ) { + found = found || (recurrence()->days().testBit( i ) && testEvent->recurrence()->days().testBit( i ) ); + } + if ( ! found ) { + //qDebug("recurring days mismatch %s -- %s", summary().latin1(),testEvent->summary().latin1()); + return false; + } - QDateTime incidenceStart = mDtStart; + } + } + bool ok = true; + QDateTime incidenceStart;// = mDtStart; + QDateTime testincidenceStart;// = testEvent->mDtStart; + if ( startDT ) { + incidenceStart = recurrence()->getPreviousDateTime( startDT->addSecs( 61 ), &ok ); + testincidenceStart = testEvent->recurrence()->getPreviousDateTime( startDT->addSecs( 61 ), &ok ); + } + if ( !testincidenceStart.isValid() ) + testincidenceStart = testEvent->mDtStart; + if ( !incidenceStart.isValid() ) + incidenceStart = mDtStart; int duration = mDtStart.secsTo( mDtEnd ); if ( doesFloat() ) duration += 86400; - QDateTime testincidenceStart = testEvent->mDtStart; int testduration = testEvent->mDtStart.secsTo( testEvent->mDtEnd ); if ( testEvent->doesFloat() ) testduration += 86400; bool computeThis = false; if ( incidenceStart < testincidenceStart ) computeThis = true; - bool ok = true; if ( computeThis ) incidenceStart = incidenceStart.addSecs( -300 ); else testincidenceStart = testincidenceStart.addSecs( -300 ); int count = 0; + ok = true; + int countbreak = 2000; + QDateTime stopSearch; + bool testStop = false; + if ( startDT ) { + stopSearch = startDT->addDays( 365*3 ); + testStop = true; + } while ( ok ) { ++count; - if ( count > 1000 ) break; - if ( computeThis ) + if ( count > countbreak ) break; + if ( computeThis ) { + if ( testStop ) + if ( testincidenceStart > stopSearch ) + break; incidenceStart = getNextOccurence( incidenceStart.addSecs( 60 ), &ok ); - else + } + else { + if ( testStop ) + if ( incidenceStart > stopSearch ) + break; testincidenceStart = testEvent->getNextOccurence( testincidenceStart.addSecs( 60 ), &ok ); + } if ( ok ) { if ( incidenceStart < testincidenceStart.addSecs( testduration ) && testincidenceStart < incidenceStart.addSecs( duration ) ) { if ( incidenceStart < testincidenceStart ) *overlapDT = testincidenceStart; else *overlapDT = incidenceStart; if ( startDT ) { if ( *overlapDT >= *startDT ) return true; } else return true; } computeThis = ( incidenceStart < testincidenceStart ); } } + //qDebug("%d rec counter stopped at %d - %s %s", ok ,count, summary().latin1(),testEvent->summary().latin1() ); return false; } QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const { *ok = false; if ( !alarmEnabled() ) return QDateTime (); bool yes; |