File kmail_remember_dimap_deletions.diff of Package kdepim3

Overview Repositories Revisions Requests Users Attributes Meta

File kmail_remember_dimap_deletions.diff of Package kdepim3 (Revision 74c5d35b7e207d5f88ebf4be1cb22451)

Currently displaying revision 74c5d35b7e207d5f88ebf4be1cb22451 , Show latest

Index: kmail/kmfoldersearch.h
================================================================================
--- kmail/folderstorage.cpp
+++ kmail/folderstorage.cpp
@@ -96,6 +96,14 @@
 }
 
 
+void FolderStorage::close( const char * owner, bool aForced )
+{
+  if (mOpenCount <= 0) return;
+  if (mOpenCount > 0) mOpenCount--;
+  if (mOpenCount > 0 && !aForced) return;
+    reallyDoClose( owner );
+}
+
 //-----------------------------------------------------------------------------
 QString FolderStorage::dotEscape(const QString& aStr)
 {
--- kmail/folderstorage.h
+++ kmail/folderstorage.h
@@ -259,7 +259,8 @@
 
   /** Close folder. If force is TRUE the files are closed even if
     others still use it (e.g. other mail reader windows). */
-  virtual void close(const char * owner,bool force=FALSE) = 0;
+  void close(const char * owner, bool force=FALSE);
+  virtual void reallyDoClose(const char * owner) = 0;
 
   /** Try releasing @p folder if possible, something is attempting an exclusive access to it.
       Currently used for KMFolderSearch and the background tasks like expiry. */
--- kmail/kmfoldercachedimap.cpp
+++ kmail/kmfoldercachedimap.cpp
@@ -179,12 +179,15 @@
 
 KMFolderCachedImap::~KMFolderCachedImap()
 {
+  if (kmkernel->undoStack()) kmkernel->undoStack()->folderDestroyed( folder() );
+}
+
+void KMFolderCachedImap::reallyDoClose( const char * owner )
+{
   if( !mFolderRemoved ) {
-    writeConfig();
     writeUidCache();
   }
-
-  if (kmkernel->undoStack()) kmkernel->undoStack()->folderDestroyed( folder() );
+  KMFolderMaildir::reallyDoClose( owner );
 }
 
 void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent )
@@ -247,6 +250,12 @@
   if ( mImapPath.isEmpty() ) {
     mImapPathCreation = config->readEntry("ImapPathCreation");
   }
+
+  QStringList uids = config->readListEntry( "UIDSDeletedSinceLastSync" );
+  kdDebug( 5006 ) << "READING IN UIDSDeletedSinceLastSync: " << folder()->prettyURL() << endl << uids << endl;
+  for ( QStringList::iterator it = uids.begin(); it != uids.end(); it++ ) {
+      mDeletedUIDsSinceLastSync.insert( (*it).toULong(), 0);
+  }
 }
 
 void KMFolderCachedImap::writeConfig()
@@ -262,6 +271,15 @@
     } else {
       configGroup.deleteEntry( "ImapPathCreation" );
     }
+    if ( !mDeletedUIDsSinceLastSync.isEmpty() ) {
+        QValueList<ulong> uids = mDeletedUIDsSinceLastSync.keys();
+        QStringList uidstrings;
+        for( QValueList<ulong>::iterator it = uids.begin(); it != uids.end(); it++ ) {
+            uidstrings.append(  QString::number( (*it) ) );
+        }
+        configGroup.writeEntry( "UIDSDeletedSinceLastSync", uidstrings );
+        kdDebug( 5006 ) << "WRITING OUT UIDSDeletedSinceLastSync in: " << folder( )->prettyURL( ) << endl << uidstrings << endl;
+    }
   }
   writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig();
   KMFolderMaildir::writeConfig();
@@ -336,11 +354,12 @@
       if( cacheVersion == UIDCACHE_VERSION ) {
         len = uidcache.readLine( buf, sizeof(buf) );
         if( len > 0 ) {
-          setUidValidity( QString::fromLocal8Bit( buf).stripWhiteSpace() );
+          setUidValidity( QString::fromLocal8Bit(buf).stripWhiteSpace() );
           len = uidcache.readLine( buf, sizeof(buf) );
           if( len > 0 ) {
+            kdDebug(5006) << "Reading in last uid from cache: " << QString::fromLocal8Bit(buf).stripWhiteSpace() << " in " << folder()->prettyURL() << endl;
             // load the last known highest uid from the on disk cache
-            setLastUid( QString::fromLocal8Bit( buf).stripWhiteSpace().toULong() );
+            setLastUid( QString::fromLocal8Bit(buf).stripWhiteSpace().toULong() );
             return 0;
           }
         }
@@ -359,6 +378,7 @@
     return 0;
   }
 
+  kdDebug(5006) << "Writing out UID cache lastuid: " << lastUid()  << " in: " << folder()->prettyURL() << endl;
   QFile uidcache( uidCacheLocation() );
   if( uidcache.open( IO_WriteOnly ) ) {
     QTextStream str( &uidcache );
@@ -400,6 +420,7 @@
 KMMessage* KMFolderCachedImap::take(int idx)
 {
   uidMapDirty = true;
+  rememberDeletion( idx );
   return KMFolderMaildir::take(idx);
 }
 
@@ -432,11 +453,21 @@
   return rc;
 }
 
+void KMFolderCachedImap::rememberDeletion( int idx )
+{
+  KMMsgBase *msg = getMsgBase( idx );
+  assert(msg);
+  ulong uid = msg->UID();
+  assert(uid>=0);
+  mDeletedUIDsSinceLastSync.insert(uid, 0);
+  kdDebug(5006) << "Explicit delete of UID " << uid << " at index: " << idx << " in " << folder()->prettyURL();
+}
 
 /* Reimplemented from KMFolderMaildir */
 void KMFolderCachedImap::removeMsg(int idx, bool imapQuiet)
 {
   uidMapDirty = true;
+  rememberDeletion( idx );
   // Remove it from disk
   KMFolderMaildir::removeMsg(idx,imapQuiet);
 }
@@ -493,6 +524,7 @@
 
 void KMFolderCachedImap::setLastUid( ulong uid )
 {
+  kdDebug(5006) << "Setting mLastUid to: " << uid  <<  " in " << folder()->prettyURL() << endl;
   mLastUid = uid;
   if( uidWriteTimer == -1 )
     // Write in one minute
@@ -524,6 +556,7 @@
   if( it != uidMap.end() ) {
     KMMsgBase *msg = getMsgBase( *it );
 #if MAIL_LOSS_DEBUGGING
+    kdDebug(5006) << "Folder: " << folder()->prettyURL() << endl;
     kdDebug(5006) << "UID " << uid << " is supposed to be in the map" << endl;
     kdDebug(5006) << "UID's index is to be " << *it << endl;
     kdDebug(5006) << "There is a message there? " << (msg != 0) << endl;
@@ -1559,14 +1592,24 @@
         // kdDebug(5006) << "KMFolderCachedImap::slotGetMessagesData() : folder "<<label()<<" already has msg="<<msg->headerField("Subject") << ", UID="<<uid << ", lastUid = " << mLastUid << endl;
         KMMsgBase *existingMessage = findByUID(uid);
         if( !existingMessage ) {
-          if ( mUserRights <= 0 || ( mUserRights & KMail::ACLJobs::Delete ) ) {
+           kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should delete it" << endl;
+          // double check we deleted it since the last sync
+           if ( mDeletedUIDsSinceLastSync.contains(uid) ) {
+               if ( mUserRights <= 0 || ( mUserRights & KMail::ACLJobs::Delete ) ) {
 #if MAIL_LOSS_DEBUGGING
-            kdDebug(5006) << "message with uid " << uid << " is gone from local cache. Must be deleted on server!!!" << endl;
+                   kdDebug(5006) << "message with uid " << uid << " is gone from local cache. Must be deleted on server!!!" << endl;
 #endif
-            uidsForDeletionOnServer << uid;
-          } else {
-            redownload = true;
-          }
+                   uidsForDeletionOnServer << uid;
+               } else {
+                   redownload = true;
+               }
+           } else {
+               kdDebug(5006) << "WARNING: ####### " << endl;
+               kdDebug(5006) << "Message locally missing but not deleted in folder: " << folder()->prettyURL() << endl;
+               kdDebug(5006) << "The missing UID: " << uid << ". It will be redownloaded " << endl;
+               redownload = true;
+           }
+
         } else {
           // if this is a read only folder, ignore status updates from the server
           // since we can't write our status back our local version is what has to
@@ -1579,6 +1622,7 @@
         // kdDebug(5006) << "message with uid " << uid << " found in the local cache. " << endl;
       }
       if ( uid > lastUid() || redownload ) {
+      kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should download it" << endl;
         // The message is new since the last sync, but we might have just uploaded it, in which case
         // the uid map already contains it.
         if ( !uidMap.contains( uid ) ) {
@@ -1588,8 +1632,10 @@
             mUidsForDownload << uid;
         }
         // Remember the highest uid and once the download is completed, update mLastUid
-        if ( uid > mTentativeHighestUid )
+        if ( uid > mTentativeHighestUid ) {
+          kdDebug(5006) << "Setting the tentative highest UID to: " << uid << endl;
           mTentativeHighestUid = uid;
+        }
       }
     }
     (*it).cdata.remove(0, pos);
@@ -2523,9 +2569,39 @@
 
 void KMFolderCachedImap::slotUpdateLastUid()
 {
-  if( mTentativeHighestUid != 0 )
-    setLastUid( mTentativeHighestUid );
+  if( mTentativeHighestUid != 0 ) {
+    
+      // Sanity checking:
+      // By now all new mails should be downloaded, which means
+      // that iteration over the folder should yield only UIDs
+      // lower or equal to what we think the highes ist, and the
+      // highest one as well. If not, our notion of the highest
+      // uid we've seen thus far is wrong, which is dangerous, so
+      // don't update the mLastUid, then.
+      bool sane = false;
+
+      for (int i=0;i<count(); i++ ) {
+          ulong uid = getMsgBase(i)->UID();
+          if ( uid > mTentativeHighestUid && uid > lastUid() ) {
+              kdWarning(5006) << "DANGER: Either the server listed a wrong highest uid, "
+                  "or we parsed it wrong. Send email to adam@kde.org, please, and include this log." << endl;
+              kdWarning(5006) << "uid: " << uid << " mTentativeHighestUid: " << mTentativeHighestUid << endl;
+              assert( false );
+              break;
+          } else if ( uid == mTentativeHighestUid || lastUid() ) {
+              // we've found our highest uid, all is well
+              sane = true;
+          } else {
+              // must be smaller, that's ok, let's wait for bigger fish
+          }
+      }
+      if (sane) {
+          kdDebug(5006) << "Tentative highest UID test was sane, writing out: " << mTentativeHighestUid << endl;
+          setLastUid( mTentativeHighestUid );
+      }
+  }
   mTentativeHighestUid = 0;
+  mDeletedUIDsSinceLastSync.clear();
 }
 
 bool KMFolderCachedImap::isMoveable() const
--- kmail/kmfoldercachedimap.h
+++ kmail/kmfoldercachedimap.h
@@ -89,6 +89,9 @@
   KMFolderCachedImap(KMFolder* folder, const char* name=0);
   virtual ~KMFolderCachedImap();
 
+  /**  @reimpl */
+  void reallyDoClose( const char * owner );
+
   /** Initialize this storage from another one. Used when creating a child folder */
   void initializeFrom( KMFolderCachedImap* parent );
 
@@ -384,6 +387,7 @@
 private:
   void setReadOnly( bool readOnly );
   QString state2String( int state ) const;
+  void rememberDeletion( int );
 
   /** State variable for the synchronization mechanism */
   enum {
@@ -489,6 +493,7 @@
   int mNamespacesToCheck;
   bool mPersonalNamespacesCheckDone;
   QString mImapPathCreation;
+  QMap<ulong,void*> mDeletedUIDsSinceLastSync;
 
   QuotaInfo mQuotaInfo;
 };
--- kmail/kmfolderimap.cpp
+++ kmail/kmfolderimap.cpp
@@ -106,21 +106,13 @@
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::close(const char *owner, bool aForced)
+void KMFolderImap::reallyDoClose(const char *owner)
 {
-  if (mOpenCount > 0) mOpenCount--;
-  if (mOpenCount == 0 && isSelected() && !aForced) {
+  if ( isSelected() ) {
       kdWarning(5006) << "Trying to close the selected folder " << label() <<
         " - ignoring! " << kdBacktrace() << endl;
-      mOpenCount++;
       return;
   }
-  if (mOpenCount > 0 && !aForced) {
-    // The inherited close will decrement again, so we have to adjust.
-    mOpenCount++;
-    KMFolderMbox::close(owner, aForced);
-    return;
-  }
 
   // FIXME is this still needed?
   if (account())
@@ -136,9 +128,7 @@
 
   mCheckingValidity = false;
 
-  // The inherited close will decrement again, so we have to adjust.
-  mOpenCount++;
-  KMFolderMbox::close(owner, aForced);
+  KMFolderMbox::reallyDoClose(owner);
 }
 
 KMFolder* KMFolderImap::trashFolder() const
--- kmail/kmfolderimap.h
+++ kmail/kmfolderimap.h
@@ -131,10 +131,8 @@
   /** Remove the IMAP folder on the server and if successful also locally */
   virtual void remove();
 
-  /** Close folder. If force is TRUE the files are closed even if
-    others still use it (e.g. other mail reader windows). This also
-    cancels all pending jobs. */
-  virtual void close(const char *owner, bool force=FALSE);
+  /** Closes and cancels all pending jobs. */
+  virtual void reallyDoClose(const char *owner);
 
   /** Automatically expunge deleted messages when leaving the folder */
   bool autoExpunge();
--- kmail/kmfoldermaildir.cpp
+++ kmail/kmfoldermaildir.cpp
@@ -219,22 +219,8 @@
 
 
 //-----------------------------------------------------------------------------
-void KMFolderMaildir::close(const char *, bool aForced)
+void KMFolderMaildir::reallyDoClose(const char *)
 {
-  if (mOpenCount <= 0) return;
-  if (mOpenCount > 0) mOpenCount--;
-
-  if (mOpenCount > 0 && !aForced) return;
-
-#if 0 // removed hack that prevented closing system folders (see kmail-devel discussion about mail expiring)
-  if ( (folder() != kmkernel->inboxFolder())
-       && folder()->isSystemFolder() && !aForced)
-  {
-     mOpenCount = 1;
-     return;
-  }
-#endif
-
   if (mAutoCreateIndex)
   {
       updateIndex();
--- kmail/kmfoldermaildir.h
+++ kmail/kmfoldermaildir.h
@@ -69,7 +69,7 @@
 
   /** Close folder. If force is TRUE the files are closed even if
     others still use it (e.g. other mail reader windows). */
-  virtual void close(const char *owner, bool force=FALSE);
+  virtual void reallyDoClose(const char *owner);
 
   /** Create the necessary folders for a maildir folder. Usually you will
       want to use create() instead.
--- kmail/kmfoldermbox.h
+++ kmail/kmfoldermbox.h
@@ -79,9 +79,8 @@
     fopen call otherwise (errno). */
   virtual int open(const char *owner);
 
-  /** Close folder. If force is TRUE the files are closed even if
-    others still use it (e.g. other mail reader windows). */
-  virtual void close(const char *owner, bool force=FALSE);
+  /** @reimpl */
+  virtual void reallyDoClose(const char *owner);
 
   virtual int canAccess();
 
--- kmail/kmfoldersearch.cpp
+++ kmail/kmfoldersearch.cpp
@@ -546,12 +546,8 @@
     }
 }
 
-void KMFolderSearch::close(const char *, bool force)
+void KMFolderSearch::reallyDoClose(const char *)
 {
-    if (mOpenCount <= 0) return;
-    if (mOpenCount > 0) mOpenCount--;
-    if (mOpenCount > 0 && !force) return;
-
     if (mAutoCreateIndex) {
         if (mSearch)
             mSearch->write(location());
--- kmail/kmfoldersearch.h
+++ kmail/kmfoldersearch.h
@@ -174,7 +174,7 @@
   virtual int open(const char *owner);
   virtual int canAccess();
   virtual void sync();
-  virtual void close(const char *owner, bool force=FALSE);
+  virtual void reallyDoClose(const char *owner);
   virtual int create();
   virtual int compact( bool );
   virtual bool isReadOnly() const;
--- kmail/kmmainwin.cpp
+++ kmail/kmmainwin.cpp
@@ -40,7 +40,7 @@
 		      actionCollection(), "new_mail_client" );
 
   mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );
-  mKMMainWidget->resize( 450, 600 );
+  mKMMainWidget->resize( 725, 700 );
   setCentralWidget(mKMMainWidget);
   setupStatusBar();
   if (kmkernel->xmlGuiInstance())
--- kmail/kmfoldermbox.cpp
+++ kmail/kmfoldermbox.cpp
@@ -256,24 +256,8 @@ int KMFolderMbox::create()
 
 
 //-----------------------------------------------------------------------------
-void KMFolderMbox::close(const char *owner, bool aForced)
+void KMFolderMbox::reallyDoClose( const char *owner )
 {
-  if (!aForced)
-     assert(mOpenCount >= 0);
-
-  if (mOpenCount <= 0 || !mStream) { mOpenCount = 0; return; }
-  if (mOpenCount > 0) mOpenCount--;
-  if (mOpenCount > 0 && !aForced) { assert(mStream); return; }
-
-#if 0 // removed hack that prevented closing system folders (see kmail-devel discussion about mail expiring)
-  if ( (folder() != kmkernel->inboxFolder())
-        && folder()->isSystemFolder() && !aForced )
-  {
-      mOpenCount = 1;
-      return;
-  }
-#endif
-
   if (mAutoCreateIndex)
   {
       if (KMFolderIndex::IndexOk != indexStatus()) {

Places

File kmail_remember_dimap_deletions.diff of Package kdepim3 (Revision 74c5d35b7e207d5f88ebf4be1cb22451)

Places