Added revisions plugin in support of paged database revisions.

src/osgDB/DatabaseRevisions.cpp

@@ -19,6 +19,24 @@
 
 using namespace osgDB;
 
+////////////////////////////////////////////////////////////////////////////////////////////
+//
+// FilelList
+//
+FileList::FileList()
+{
+}
+
+FileList::FileList(const FileList& fileList, const osg::CopyOp):
+    _files(fileList._files)
+{
+}
+
+FileList::~FileList()
+{
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////////////////
 //
 // DatabaseRevision
@@ -40,7 +58,8 @@ DatabaseRevision::~DatabaseRevision()
 
 bool DatabaseRevision::isFileBlackListed(const std::string& filename) const
 {
-    return _filesRemoved.count(filename)!=0 || _filesModified.count(filename)!=0;
+    return (_filesRemoved.valid() && _filesRemoved->contains(filename)) ||
+           (_filesAdded.valid() && _filesAdded->contains(filename));
 }
 
 
@@ -61,6 +80,39 @@ DatabaseRevisions::~DatabaseRevisions()
 {
 }
 
+void DatabaseRevisions::addRevision(DatabaseRevision* revision)
+{
+    if (!revision) return;
+
+    for(DatabaseRevisionList::iterator itr = _revisionList.begin();
+        itr != _revisionList.end();
+        ++itr)
+    {
+        if (*itr == revision) return;
+        if ((*itr)->getName()==revision->getName())
+        {
+            (*itr) = revision;
+            return;
+        }
+    }
+
+    _revisionList.push_back(revision);
+}
+
+void DatabaseRevisions::removeRevision(DatabaseRevision* revision)
+{
+    for(DatabaseRevisionList::iterator itr = _revisionList.begin();
+        itr != _revisionList.end();
+        ++itr)
+    {
+        if (*itr == revision)
+        {
+            _revisionList.erase(itr);
+            return;
+        }
+    }
+}
+
 bool DatabaseRevisions::isFileBlackListed(const std::string& filename) const
 {
     for(DatabaseRevisionList::const_iterator itr = _revisionList.begin();

src/osgPlugins/CMakeLists.txt

@@ -51,6 +51,7 @@ ADD_SUBDIRECTORY(rot)
 ADD_SUBDIRECTORY(scale)
 ADD_SUBDIRECTORY(trans)
 ADD_SUBDIRECTORY(normals)
+ADD_SUBDIRECTORY(revisions)
 
 ############################################################
 #

src/osgPlugins/revisions/CMakeLists.txt

@@ -0,0 +1,4 @@
+SET(TARGET_SRC ReaderWriterRevisions.cpp )
+
+#### end var setup  ###
+SETUP_PLUGIN(revisions)

src/osgPlugins/revisions/ReaderWriterRevisions.cpp

@@ -0,0 +1,189 @@
+#include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
+#include <osgDB/ReadFile>
+#include <osgDB/Registry>
+#include <osgDB/DatabaseRevisions>
+#include <osg/Notify>
+
+class ReaderWriterFreeType : public osgDB::ReaderWriter
+{
+    public:
+        ReaderWriterFreeType()
+        {
+            supportsExtension("revisions","list of revision files");
+            supportsExtension("added","revision file containing list of added files");
+            supportsExtension("removed","revision file containing list of removed files");
+            supportsExtension("modified","revision file containing list of modified files");
+        }
+
+        virtual const char* className() const { return "FreeType Font Reader/Writer"; }
+
+        virtual ReadResult readObject(const std::string& file, const osgDB::ReaderWriter::Options* options) const
+        {
+            std::string ext = osgDB::getLowerCaseFileExtension(file);
+            if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
+
+            std::string fileName = osgDB::findDataFile( file, options );
+            if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
+
+            std::ifstream fin(fileName.c_str());
+
+            if (ext=="revisions") return readRevisions(fin, file, options);
+            else return readFileList(fin, file, options);
+        }
+
+        virtual ReadResult readObject(std::istream& fin, const osgDB::ReaderWriter::Options* options) const
+        {
+            std::string fileName = options->getPluginStringData("filename");
+            if (fileName.empty())
+            {
+                osg::notify(osg::NOTICE)<<"Error: ReaderWriterRevision unable to determine stream type, cannot not read file."<<std::endl;
+                return ReadResult::FILE_NOT_HANDLED;
+            }
+
+            std::string ext = osgDB::getLowerCaseFileExtension(fileName);
+            if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
+
+            if (ext=="revisions") return readRevisions(fin, fileName, options);
+            else return readFileList(fin, fileName, options);
+        }
+
+        ReadResult readFileList(std::istream& fin, const std::string& name, const osgDB::ReaderWriter::Options* options) const
+        {
+            osg::ref_ptr<osgDB::FileList> fileList = new osgDB::FileList;
+            fileList->setName(name);
+
+            while(fin)
+            {
+                std::string filename;
+                fin >> filename;
+                if (!filename.empty()) fileList->getFileNames().insert(filename);
+            }
+
+            return fileList.get();
+        }
+
+        ReadResult readRevisions(std::istream& fin, const std::string& name, const osgDB::ReaderWriter::Options* options) const
+        {
+            osg::ref_ptr<osgDB::DatabaseRevisions> revisions = new osgDB::DatabaseRevisions;
+            revisions->setName(name);
+
+            typedef std::map<std::string, osg::ref_ptr<osgDB::DatabaseRevision> > RevisionMap;
+            RevisionMap revisionMap;
+
+            std::string revisions_path;
+            if (options && !(options->getDatabasePathList().empty())) revisions_path = options->getDatabasePathList().front();
+
+            while(fin)
+            {
+                std::string filename;
+                fin >> filename;
+                if (!filename.empty())
+                {
+                    std::string ext = osgDB::getLowerCaseFileExtension(filename);
+                    std::string revisionName = osgDB::getNameLessExtension(filename);
+                    if (revisionName.empty())
+                    {
+                        osg::ref_ptr<osgDB::DatabaseRevision>& dbRevision = revisionMap[revisionName];
+                        if (!dbRevision)
+                        {
+                            dbRevision = new osgDB::DatabaseRevision;
+                            dbRevision->setName(revisionName);
+                        }
+
+                        std::string complete_path = osgDB::concatPaths(revisions_path, filename);
+                        osg::ref_ptr<osg::Object> object = osgDB::readObjectFile(complete_path, options);
+                        osgDB::FileList* fileList = dynamic_cast<osgDB::FileList*>(object.get());
+
+                        if (fileList)
+                        {
+                            if (ext=="added")
+                            {
+                                dbRevision->setFilesAdded(fileList);
+                            }
+                            else if (ext=="removed")
+                            {
+                                dbRevision->setFilesRemoved(fileList);
+                            }
+                            else if (ext=="modified")
+                            {
+                                dbRevision->setFilesModified(fileList);
+                            }
+                        }
+                    }
+                }
+            }
+
+            for(RevisionMap::iterator itr = revisionMap.begin();
+                itr != revisionMap.end();
+                ++itr)
+            {
+                revisions->addRevision(itr->second);
+            }
+
+            return revisions.get();
+        }
+
+        virtual WriteResult writeObject(const osg::Object& object, std::ostream& fout,const osgDB::ReaderWriter::Options*) const
+        {
+            const osgDB::FileList* fileList = dynamic_cast<const osgDB::FileList*>(&object);
+            if (fileList)
+            {
+                const osgDB::FileList::FileNames& fileNames = fileList->getFileNames();
+                for(osgDB::FileList::FileNames::const_iterator itr = fileNames.begin();
+                    itr != fileNames.end();
+                    ++itr)
+                {
+                    fout<<*itr<<std::endl;
+                }
+                return WriteResult::FILE_SAVED;
+            }
+
+            const osgDB::DatabaseRevisions* revisions = dynamic_cast<const osgDB::DatabaseRevisions*>(&object);
+            if (revisions)
+            {
+                typedef osgDB::DatabaseRevisions::DatabaseRevisionList RevisionList;
+                const RevisionList& revisionList  = revisions->getDatabaseRevisionList();
+                for(RevisionList::const_iterator itr = revisionList.begin();
+                    itr != revisionList.end();
+                    ++itr)
+                {
+                    const osgDB::DatabaseRevision* revision = itr->get();
+                    if (revision->getFilesAdded())
+                    {
+                        if (!(revision->getFilesAdded()->getName().empty())) fout<<revision->getFilesAdded()->getName()<<std::endl;
+                        else fout<<"FilesAdded entry had no name assigned."<<std::endl;
+                    }
+
+                    if (revision->getFilesRemoved())
+                    {
+                        if (!(revision->getFilesRemoved()->getName().empty())) fout<<revision->getFilesRemoved()->getName()<<std::endl;
+                        else fout<<"FilesAdded entry had no name assigned."<<std::endl;
+                    }
+
+                    if (revision->getFilesModified())
+                    {
+                        if (!(revision->getFilesModified()->getName().empty())) fout<<revision->getFilesModified()->getName()<<std::endl;
+                        else fout<<"FilesAdded entry had no name assigned."<<std::endl;
+                    }
+                }
+            }
+
+            return WriteResult::FILE_NOT_HANDLED;
+        }
+
+        virtual WriteResult writeObject(const osg::Object& object,const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
+        {
+            std::string ext = osgDB::getFileExtension(fileName);
+            if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED;
+
+            osgDB::ofstream fout(fileName.c_str());
+            if(!fout) return WriteResult::ERROR_IN_WRITING_FILE;
+
+            return writeObject(object, fout, options);
+        }
+};
+
+// now register with Registry to instantiate the above
+// reader/writer.
+REGISTER_OSGPLUGIN(freetype, ReaderWriterFreeType)