1 files changed, 23 insertions, 11 deletions

diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index de07496..f7d40ad 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -1,324 +1,336 @@
 /*
     This file is part of libkcal.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <qregexp.h>
 #include <qfileinfo.h>
 
 #include "calendarlocal.h"
 #include "icalformat.h"
 #include "todo.h"
 
 #define SAVETIMER_TIMEOUT_SECONDS 300
 //#define SAVETIMER_TIMEOUT_SECONDS 8
 #define SAVETIMER_TIMEOUT_RETRY_SECONDS 5
 
 using namespace KCal;
 
 Todo::Todo():  QObject(), Incidence()
 {
 //  mStatus = TENTATIVE;
 
   mHasDueDate = false;
   setHasStartDate( false );
   mCompleted = getEvenTime(QDateTime::currentDateTime());
   mHasCompletedDate = false;
   mPercentComplete = 0;
   mRunning = false;
   mRunSaveTimer = 0;
   setFloats( true );
   mCurrentTimerDelay = 0;
 }
 
 Todo::Todo(const Todo &t) : QObject(),Incidence(t)
 {
   mDtDue = t.mDtDue;
   mHasDueDate = t.mHasDueDate;
   mCompleted = t.mCompleted;
   mHasCompletedDate = t.mHasCompletedDate;
   mPercentComplete = t.mPercentComplete;
   mRunning = false;
   mRunSaveTimer = 0;
   mCurrentTimerDelay = 0;
 }
 
 Todo::~Todo()
 {
     setRunning( false );
     //qDebug("Todo::~Todo() ");
 }
 
 void Todo::setRunningFalse( QString s )
 {
     if ( ! mRunning )
         return;
     mRunning = false;
     if ( mRunSaveTimer )
         mRunSaveTimer->stop();
     saveRunningInfoToFile( s );
 }
 void Todo::stopRunning()
 {
     if ( !mRunning )
         return;
     if ( mRunSaveTimer )
         mRunSaveTimer->stop();
     mRunning = false;
 }
 void Todo::setRunning( bool run )
 {
     if ( run == mRunning )
         return;
     //qDebug("Todo::setRunning %d ", run);
     if ( !mRunSaveTimer ) {
         mRunSaveTimer = new QTimer ( this );
         connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( timerSlotSaveRunningInfoToFile() ) );
     }
     mRunning = run;
     mRunLastSave = QDateTime::currentDateTime();
     if ( mRunning ) {
-        mRunSaveTimer->start( SAVETIMER_TIMEOUT_SECONDS * 1000 ); // 5 min
+        restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS );
         mRunStart = QDateTime::currentDateTime();
-        mRunLastSave = QDateTime::currentDateTime();
-        mCurrentTimerDelay = SAVETIMER_TIMEOUT_SECONDS;
     } else {
         mRunSaveTimer->stop();
         saveRunningInfoToFile();
     }
 }
 void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end )
 {
     if ( !mRunning) return;
     mRunning = false;
     mRunStart = start;
     mRunEnd = end;
     saveRunningInfoToFile( comment );
 }
+void Todo::restartSaveTimer( int secs )
+{
+    mRunSaveTimer->start( secs * 1000 ); 
+    mRunLastSave = QDateTime::currentDateTime();
+    mCurrentTimerDelay = secs;
+}
 void Todo::timerSlotSaveRunningInfoToFile()
 {
     mRunEnd = QDateTime::currentDateTime();
     int secsTo = mRunLastSave.secsTo( mRunEnd );
-    if( secsTo == 8 ) ++secsTo;
+    //if( secsTo == 8 ) ++secsTo;
     qDebug("KO Todo::saveTimerTimeout %d %d",  secsTo, mCurrentTimerDelay );
     if ( secsTo > mCurrentTimerDelay  ) {
-    qDebug("KO Todo::saveTimerTimeout restart %d ", SAVETIMER_TIMEOUT_RETRY_SECONDS );
-        mRunSaveTimer->start( SAVETIMER_TIMEOUT_RETRY_SECONDS * 1000 ); 
-        mRunLastSave = QDateTime::currentDateTime();
-        mCurrentTimerDelay = SAVETIMER_TIMEOUT_RETRY_SECONDS;
+        qDebug("KO Todo::saveTimerTimeout restart %d ", SAVETIMER_TIMEOUT_RETRY_SECONDS );
+        restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS );
         return;
     }
-    mRunSaveTimer->start( SAVETIMER_TIMEOUT_SECONDS * 1000 ); // 5 min
-    mRunLastSave = QDateTime::currentDateTime();
-    mCurrentTimerDelay = SAVETIMER_TIMEOUT_SECONDS;
+    int msecs =  mRunLastSave.time().msecsTo( mRunEnd.time());
+    if ( msecs < 0 ) {
+        restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS );
+        return;
+    }  
+    // qDebug("KO Todo::saveTimerTimeout restarting! millisecs %d",  msecs - ( ( mCurrentTimerDelay * 1000 ) + 50 ) );
+    if ( msecs > ( ( mCurrentTimerDelay * 1000 ) + 50 )) {
+        qDebug("KO Todo::saveTimerTimeout restarting! millisecs %d",  msecs - ( ( mCurrentTimerDelay * 1000 ) + 50 ) );
+        restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS );
+        return;
+
+    }
+    restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS );
     saveRunningInfoToFile( QString::null );
 }
 void Todo::saveRunningInfoToFile()
 {
     mRunEnd = QDateTime::currentDateTime();
     saveRunningInfoToFile( QString::null );
 }
 void Todo::saveRunningInfoToFile( QString comment )
 {
     //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1());
     if ( mRunStart.secsTo ( mRunEnd) < 15   )  {
         qDebug("Running time < 15 seconds. Skipped. ");
         return;
     }
     QString dir = KGlobalSettings::timeTrackerDir();
     //qDebug("%s ", dir.latin1());
     QString file = "%1%2%3-%4%5%6-";
     file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2  ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 );
     file.replace ( QRegExp (" "), "0" ); 
     file += uid();
     //qDebug("File %s ",file.latin1() );
     CalendarLocal cal;
     cal.setLocalTime();
     Todo  * to = (Todo*) clone();
     to->setFloats( false );
     to->setDtStart( mRunStart );
     to->setHasStartDate( true );
     to->setDtDue( mRunEnd );
     to->setHasDueDate( true );
     to->setUid( file );
     if ( !comment.isEmpty() ) {
         QString des = to->description();
         if ( des.isEmpty () )
             to->setDescription( "TT-Note: " + comment );
         else
             to->setDescription( "TT-Note: " + comment +"\n" +  des );
     }
     cal.addIncidence( to );
     ICalFormat format( false );
     file = dir +"/" +file +".ics";
     format.save( &cal, file );
     saveParents();
     
 }
 void Todo::saveParents()
 {
     if (!relatedTo() )
         return;
     Incidence * inc = relatedTo();
     if ( inc->typeID() != todoID )
         return;
     Todo* to = (Todo*)inc;
     bool saveTodo = false;
     QString file = KGlobalSettings::timeTrackerDir() + "/"+ to->uid() + ".ics";
     QFileInfo fi ( file );
     if ( fi.exists() ) {
         if ( fi.lastModified () < to->lastModified ())
             saveTodo = true;
     } else {
         saveTodo = true;
     }
     if ( saveTodo ) {
         CalendarLocal cal;
         cal.setLocalTime();
         Todo  * par = (Todo  *) to->clone();
         cal.addIncidence( par );
         ICalFormat format( false );
         format.save( &cal, file );
     } 
     to->saveParents();
 }
 
 int Todo::runTime()
 {
     if ( !mRunning )
         return 0;
     return  mRunStart.secsTo( QDateTime::currentDateTime() );
 }
 bool Todo::hasRunningSub()
 {
     if ( mRunning )
         return true;
     Incidence *aTodo;
     for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) {
         if ( ((Todo*)aTodo)->hasRunningSub() )
             return true;
     }
     return false;
 }
 Incidence *Todo::clone()
 {
   return new Todo(*this);
 }
 
 bool Todo::contains ( Todo* from )
 { 
 
     if ( !from->summary().isEmpty() )
         if (  !summary().startsWith(  from->summary() ))
             return false;
     if ( from->hasStartDate() ) {
         if ( !hasStartDate() )
             return false;
         if ( from->dtStart() != dtStart())
             return false;      
     }
     if ( from->hasDueDate() ){
         if ( !hasDueDate() )
             return false;
         if ( from->dtDue() != dtDue())
             return false;  
     }
     if ( !from->location().isEmpty() )
         if (  !location().startsWith( from->location() ) )
             return false;
     if ( !from->description().isEmpty() )
         if (  !description().startsWith(  from->description() ))
             return false;
      if ( from->alarms().count() ) {
         Alarm *a = from->alarms().first();
         if (  a->enabled()  ){
             if ( !alarms().count() )
                 return false;
             Alarm *b = alarms().first();
             if( ! b->enabled() )
                 return false;
             if ( ! (a->offset() == b->offset() ))
                 return false;
         }
     }
    
     QStringList cat = categories();
     QStringList catFrom = from->categories();
     QString nCat;
     unsigned int iii;
     for ( iii = 0; iii < catFrom.count();++iii ) {
         nCat = catFrom[iii];
         if ( !nCat.isEmpty() )
             if ( !cat.contains( nCat )) {
                 return false;
             }
     }
     if ( from->isCompleted() ) {
         if ( !isCompleted() )
             return false;
     }
     if( priority() !=  from->priority() )
         return false;
 
 
     return true;
 
 }
 bool KCal::operator==( const Todo& t1, const Todo& t2 )
 {
 
     bool ret = operator==( (const Incidence&)t1, (const Incidence&)t2 );
     if ( ! ret )
         return false;
     if (  t1.hasDueDate() == t2.hasDueDate() ) {
         if ( t1.hasDueDate() ) {
             if ( t1.doesFloat() == t2.doesFloat() ) {
                 if ( t1.doesFloat() ) {
                     if ( t1.dtDue().date() != t2.dtDue().date() )
                         return false;
                 } else
                     if ( t1.dtDue() != t2.dtDue() ) 
                         return false;
             } else
                 return false;// float !=
         }
         
     } else
         return false;
     if ( t1.percentComplete() != t2.percentComplete() )
         return false;
     if ( t1.isCompleted() ) {
         if (  t1.hasCompletedDate() == t2.hasCompletedDate() ) {
             if ( t1.hasCompletedDate() ) {
                 if ( t1.completed() != t2.completed() )
                     return false;
             }
             
         } else
             return false;
     }
     return true;
 
 }
 
 void Todo::setDtDue(const QDateTime &dtDue)
 {