libdeng2|ArchiveFeed: Prune items based on entry status info

Implemented a @todo in ArchiveFeed.
skyjake · May 4, 2013 · d590642 · d590642
1 parent 4f0233a
commit d590642
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/doomsday/libdeng2/include/de/filesys/archiveentryfile.h b/doomsday/libdeng2/include/de/filesys/archiveentryfile.h
@@ -46,6 +46,7 @@ class ArchiveEntryFile : public ByteArrayFile
     ~ArchiveEntryFile();
 
     String describe() const;
+    String entryPath() const;
 
     void clear();
 

diff --git a/doomsday/libdeng2/src/filesys/archiveentryfile.cpp b/doomsday/libdeng2/src/filesys/archiveentryfile.cpp
@@ -38,6 +38,11 @@ ArchiveEntryFile::~ArchiveEntryFile()
     deindex();
 }
 
+String ArchiveEntryFile::entryPath() const
+{
+    return _entryPath;
+}
+
 String ArchiveEntryFile::describe() const
 {
     DENG2_GUARD(this);

diff --git a/doomsday/libdeng2/src/filesys/archivefeed.cpp b/doomsday/libdeng2/src/filesys/archivefeed.cpp
@@ -194,10 +194,19 @@ void ArchiveFeed::populate(Folder &folder)
     d->populate(folder);
 }
 
-bool ArchiveFeed::prune(File &/*file*/) const
+bool ArchiveFeed::prune(File &file) const
 {
-    /// @todo  Prune based on entry status.
-    return true;
+    ArchiveEntryFile *entryFile = dynamic_cast<ArchiveEntryFile *>(&file);
+    if(entryFile && &entryFile->archive() == &archive())
+    {
+        if(!archive().hasEntry(entryFile->entryPath()))
+            return true; // It's gone...
+
+        // Prune based on entry status.
+        return archive().entryStatus(entryFile->entryPath()).modifiedAt !=
+               file.status().modifiedAt;
+    }
+    return false;
 }
 
 File *ArchiveFeed::newFile(String const &name)