todo timer fix

2 files changed, 33 insertions, 2 deletions

diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 48d37d5..de07496 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -1,139 +1,166 @@
 /*
     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 ( saveRunningInfoToFile() ) );
+        connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( timerSlotSaveRunningInfoToFile() ) );
     }
     mRunning = run;
+    mRunLastSave = QDateTime::currentDateTime();
     if ( mRunning ) {
-        mRunSaveTimer->start( 1000  * 60 * 5 ); // 5 min
+        mRunSaveTimer->start( SAVETIMER_TIMEOUT_SECONDS * 1000 ); // 5 min
         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::timerSlotSaveRunningInfoToFile()
+{
+    mRunEnd = QDateTime::currentDateTime();
+    int secsTo = mRunLastSave.secsTo( mRunEnd );
+    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;
+        return;
+    }
+    mRunSaveTimer->start( SAVETIMER_TIMEOUT_SECONDS * 1000 ); // 5 min
+    mRunLastSave = QDateTime::currentDateTime();
+    mCurrentTimerDelay = 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 );
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 7feb32e..e6b8a21 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -102,55 +102,59 @@ namespace KCal {
     */
     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:
+    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