todo timer fix

2 files changed, 24 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
@@ -36,161 +36,173 @@
 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();
diff --git a/libkcal/todo.h b/libkcal/todo.h
index e6b8a21..71b7a4e 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -73,88 +73,89 @@ namespace KCal {
       It returns 0 for nothing found,
       1 for found a todo which is due today and no overdue found
       2 for found a overdue todo
     */
     int hasDueSubTodo( bool checkSubtodos = true );
     /* same as above, but a specific date can be specified*/
     int hasDueSubTodoForDate( const  QDate & date, bool checkSubtodos );
 
  
     /** sets the event's status to the string specified.  The string
      * must be a recognized value for the status field, i.e. a string
      * equivalent of the possible status enumerations previously described. */
 //    void setStatus(const QString &statStr);
     /** sets the event's status to the value specified.  See the enumeration
      * above for possible values. */
 //    void setStatus(int);
     /** return the event's status. */
 //    int status() const;
     /** return the event's status in string format. */
 //    QString statusStr() const;
 
     /** return, if this todo is completed */
     bool isCompleted() const;
     /** set completed state of this todo */
     void setCompleted(bool);
     
     /**
       Return how many percent of the task are completed. Returns a value
       between 0 and 100.
     */
     int percentComplete() const;
     /**
       Set how many percent of the task are completed. Valid values are in the
       range from 0 to 100.
     */
     void setPercentComplete(int);
 
     /** return date and time when todo was completed */
     QDateTime completed() const;
     QString completedStr(bool shortF = true) const;
     /** set date and time of completion */
     void setCompleted(const QDateTime &completed);
 
     /** Return true, if todo has a date associated with completion */
     bool hasCompletedDate() const;
     bool contains ( Todo*);
     void checkSetCompletedFalse();
     bool setRecurDates();
     bool isRunning() {return mRunning;}
     bool hasRunningSub();
     void setRunning( bool );
     void setRunningFalse( QString );
     void stopRunning();
     int runTime();
     QDateTime runStart () const { return mRunStart;}
     void saveRunningInfo( QString comment, QDateTime start, QDateTime end );
     public slots:
     void saveRunningInfoToFile( QString st );
     void saveRunningInfoToFile( );
     void saveParents();
     QString durationText();
   private slots:
     void timerSlotSaveRunningInfoToFile( );
   private:
+    void restartSaveTimer( int secs );
     int mCurrentTimerDelay;
     bool mRunning;
     QTimer * mRunSaveTimer;
     QDateTime mRunStart;
     QDateTime mRunLastSave;
     QDateTime mRunEnd;
     bool accept(Visitor &v) { return v.visit(this); }
 
     QDateTime mDtDue;                     // due date of todo
 
     bool mHasDueDate;                    // if todo has associated due date
 
 //    int  mStatus;                         // confirmed/delegated/tentative/etc
 
     QDateTime mCompleted;
     bool mHasCompletedDate;
 
     int mPercentComplete;
 };
 
     bool operator==( const Todo&, const Todo& );
 }
 
 #endif