rec dect fix

1 files changed, 66 insertions, 9 deletions

diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 46e8174..5285559 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -168,151 +168,208 @@ Event::Transparency Event::transparency() const
 
 void Event::setDuration(int seconds)
 {
   setHasEndDate(false);
   Incidence::setDuration(seconds);
 }
 bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, QDateTime* startDT )
 {
     if ( testEvent == this )
         return false;
     if ( ! doesRecur() && !testEvent->doesRecur() ) {
         QDateTime te;
         if ( testEvent->doesFloat() )
             te = testEvent->mDtEnd.addDays( 1 );
         else
             te = testEvent->mDtEnd;
         QDateTime e; 
         if ( doesFloat() )
             e = mDtEnd.addDays( 1 );
         else
             e = mDtEnd;
         if ( mDtStart < te && testEvent->mDtStart < e ) {
             if ( mDtStart < testEvent->mDtStart )
                 *overlapDT =  testEvent->mDtStart;
             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;
         recurEvent = this;
     }
     if ( nonRecur ) {
         QDateTime enr; 
         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 )
                         *overlapDT =  recStart;
                     else
                         *overlapDT =  nonRecur->mDtStart;
                     if ( startDT  ) {
                         if ( *overlapDT >= *startDT )
                             return true;
                     } else
                         return true;
                 }
             }
         }
         return false;
     }
-    
-    QDateTime incidenceStart = mDtStart;
+     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;
+             }
+
+         }
+    }
+    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;
      QDateTime incidenceStart = getNextOccurence( start_dt, &yes );
      if ( ! yes || cancelled() ) {
          *ok = false;
          return QDateTime ();
      }
   
      bool enabled = false;
      Alarm* alarm;
      int off = 0;
      QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );;
     //  if ( QDateTime::currentDateTime() > incidenceStart ){
 //          *ok = false;
 //          return incidenceStart;
 //      }
      for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
          if (alarm->enabled()) {
              if ( alarm->hasTime () ) {
                  if ( alarm->time() < alarmStart ) {
                      alarmStart = alarm->time();
                      enabled = true;
                      off = alarmStart.secsTo( incidenceStart );
                  }
 
              } else {