save tt fix

2 files changed, 8 insertions, 0 deletions

diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 29f725f..2201814 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -1,576 +1,583 @@
 /*
     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"
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 
 #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 ) {
         restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS );
         mRunStart = QDateTime::currentDateTime();
     } else {
         mRunSaveTimer->stop();
         saveRunningInfoToFile();
     }
+    mLastSavedFileName = "";
 }
 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;
     qDebug("KO Todo::saveTimerTimeout %d %d",  secsTo, mCurrentTimerDelay );
     if ( secsTo > mCurrentTimerDelay  ) {
         qDebug("KO Todo::saveTimerTimeout restart %d ", SAVETIMER_TIMEOUT_RETRY_SECONDS );
         restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS );
         return;
     }
     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 )
 {
 #ifndef DESKTOP_VERSION
     //QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable );
 #endif
     //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();
+    if ( !mLastSavedFileName.isEmpty() ) {
+        if ( mLastSavedFileName != file ) {
+            QFile::remove( mLastSavedFileName ); 
+        }
+    }
+    mLastSavedFileName = file;
 #ifndef DESKTOP_VERSION
     //QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable );
 #endif   
 }
 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)
 {
   //int diffsecs = mDtDue.secsTo(dtDue);
 
   /*if (mReadOnly) return;
   const QPtrList<Alarm>& alarms = alarms();
   for (Alarm* alarm = alarms.first(); alarm; alarm = alarms.next()) {
     if (alarm->enabled()) {
       alarm->setTime(alarm->time().addSecs(diffsecs));
     }
   }*/
   mDtDue = getEvenTime(dtDue);
 
   //kdDebug(5800) << "setDtDue says date is " << mDtDue.toString() << endl;
 
   /*const QPtrList<Alarm>& alarms = alarms();
   for (Alarm* alarm = alarms.first(); alarm; alarm = alarms.next())
     alarm->setAlarmStart(mDtDue);*/
   updated();
 }
 
 QDateTime Todo::dtDue() const
 {
   return mDtDue;
 }
 
 QString Todo::dtDueTimeStr() const
 {
   return KGlobal::locale()->formatTime(mDtDue.time());
 }
 
 QString Todo::dtDueDateStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt);
 }
 
 QString Todo::dtDueStr(bool shortfmt) const
 {
     if ( doesFloat() )
         return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt);
     return KGlobal::locale()->formatDateTime(mDtDue, shortfmt);
 }
 // retval 0 : no found
 //        1 : due for date found
 //        2 : overdue for date found
 int Todo::hasDueSubTodoForDate( const QDate & date, bool checkSubtodos  )
 {
     int retval = 0;
     if ( isCompleted() )
         return 0;
     if ( hasDueDate() ) {
         if ( dtDue().date() < date )
             return 2;
         // we do not return, because we may find an overdue sub todo
         if ( dtDue().date() == date )
             retval = 1;
     }
     if ( checkSubtodos ) {
         Incidence *aTodo;
         for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) {
             int ret = ((Todo*)aTodo)->hasDueSubTodoForDate( date ,checkSubtodos );
             if ( ret == 2 )
                 return 2;
             if ( ret == 1)
                 retval = 1;
         }
     }
     return retval;
 }
 int Todo::hasDueSubTodo( bool checkSubtodos  ) //= true
 {  
     return hasDueSubTodoForDate(QDate::currentDate(), checkSubtodos );
 }
 bool Todo::hasDueDate() const
 {
   return mHasDueDate;
 }
 
 void Todo::setHasDueDate(bool f)
 {
   if (mReadOnly) return;
   mHasDueDate = f;
   updated();
 }
 
 
 #if 0
 void Todo::setStatus(const QString &statStr)
 {
   if (mReadOnly) return;
   QString ss(statStr.upper());
 
   if (ss == "X-ACTION")
     mStatus = NEEDS_ACTION;
   else if (ss == "NEEDS ACTION")
     mStatus = NEEDS_ACTION;
   else if (ss == "ACCEPTED")
     mStatus = ACCEPTED;
   else if (ss == "SENT")
     mStatus = SENT;
   else if (ss == "TENTATIVE")
     mStatus = TENTATIVE;
   else if (ss == "CONFIRMED")
     mStatus = CONFIRMED;
   else if (ss == "DECLINED")
     mStatus = DECLINED;
   else if (ss == "COMPLETED")
     mStatus = COMPLETED;
   else if (ss == "DELEGATED")
     mStatus = DELEGATED;
 
   updated();
 }
 
 void Todo::setStatus(int status)
 {
   if (mReadOnly) return;
   mStatus = status;
   updated();
 }
 
 int Todo::status() const
 {
   return mStatus;
 }
 
 QString Todo::statusStr() const
 {
   switch(mStatus) {
   case NEEDS_ACTION:
     return QString("NEEDS ACTION");
     break;
   case ACCEPTED:
     return QString("ACCEPTED");
     break;
   case SENT:
     return QString("SENT");
     break;
   case TENTATIVE:
     return QString("TENTATIVE");
     break;
   case CONFIRMED:
     return QString("CONFIRMED");
     break;
   case DECLINED:
     return QString("DECLINED");
     break;
   case COMPLETED:
     return QString("COMPLETED");
     break;
   case DELEGATED:
     return QString("DELEGATED");
     break;
   }
   return QString("");
 }
 #endif
 
 bool Todo::isCompleted() const
 {
     if (mPercentComplete == 100) {
         return true;
     }
     else return false;
 }
 
 void Todo::setCompleted(bool completed)
 {
     if ( mHasRecurrenceID && completed && mPercentComplete != 100 ) {
         if ( !setRecurDates() )
             completed = false;
     }
   if (completed) mPercentComplete = 100;
   else {
       mPercentComplete = 0;
       mHasCompletedDate = false;
   }
   updated();
 }
 
 QDateTime Todo::completed() const
 {
   return mCompleted;
 }
 
 QString Todo::completedStr( bool shortF ) const
 {
     return KGlobal::locale()->formatDateTime(mCompleted, shortF);
 }
 
 void Todo::setCompleted(const QDateTime &completed)
 {
     //qDebug("Todo::setCompleted ");
     if ( mHasCompletedDate ) {
         // qDebug("has completed data - return ");
         return;
     }
   mHasCompletedDate = true;
   mPercentComplete = 100;
   mCompleted = getEvenTime(completed);
   updated();
 }
 
 bool Todo::hasCompletedDate() const
 {
   return mHasCompletedDate;
 }
 
 int Todo::percentComplete() const
 {
   return mPercentComplete;
 }
 bool Todo::setRecurDates()
 {
     if ( !mHasRecurrenceID )
         return true;
     int secs = mDtStart.secsTo( dtDue() );   
     bool ok;
     qDebug("T:setRecurDates() ");
     //qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() );
     QDateTime next = getNextOccurence(  mRecurrenceID, &ok );
     if ( ok ) { 
         mRecurrenceID = next;
         mDtStart = next;
         setDtDue( next.addSecs( secs ) );
         if ( QDateTime::currentDateTime() > next) 
             return false;
     } else {
         setHasRecurrenceID( false );
         recurrence()->unsetRecurs();
     }
     return true;
 }
 void Todo::setPercentComplete(int v)
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 71b7a4e..2131732 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -1,161 +1,162 @@
 /*
     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.
 */
 #ifndef TODO_H
 #define TODO_H
 //
 // Todo component, representing a VTODO object
 //
 
 #include "incidence.h"
 
 #include <qtimer.h>
 
 namespace KCal {
 
 /**
   This class provides a Todo in the sense of RFC2445.
 */
     class Todo : public QObject,public Incidence
 {
  Q_OBJECT
   public:
     Todo();
     Todo(const Todo &);
     ~Todo();
     typedef ListBase<Todo> List;
     QCString type() const { return "Todo"; }
     IncTypeID typeID() const { return todoID; }
 
     /** Return an exact copy of this todo. */
     Incidence *clone();
     QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const;
 
     /** for setting the todo's due date/time with a QDateTime. */
     void setDtDue(const QDateTime &dtDue);
     /** returns an event's Due date/time as a QDateTime. */
     QDateTime dtDue() const;
     /** returns an event's due time as a string formatted according to the
      users locale settings */
     QString dtDueTimeStr() const;
     /** returns an event's due date as a string formatted according to the
      users locale settings */
     QString dtDueDateStr(bool shortfmt=true) const;
     /** returns an event's due date and time as a string formatted according
      to the users locale settings */
     QString dtDueStr(bool shortfmt=true) const;
 
     /** returns TRUE or FALSE depending on whether the todo has a due date */
     bool hasDueDate() const;
     /** sets the event's hasDueDate value. */
     void setHasDueDate(bool f);
 
     /*
       Looks for a subtodo (including itself ) which is not complete and is
       - overdue, or
       - due today.
       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:
+    QString mLastSavedFileName;
     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