Changeset 2934

Timestamp:

04/25/06 10:47:37 (3 years ago)

Author:

madcat

Message:

No longer loses custom metadata after file rehash.

Files:

• hydranode/hncore/metadata.cpp (modified) (1 diff)
• hydranode/hncore/metadata.h (modified) (1 diff)
• hydranode/hncore/sharedfile.cpp (modified) (1 diff)

hydranode/hncore/metadata.cpp

@@ -1029 +1029 @@
-        getEventTable().postEvent(this, MD_ADDED_IMAGE);
-}
+
+void MetaData::mergeCustom(MetaData *other) {
+        CHECK_THROW(other);
+
+        m_fileNames  = other->m_fileNames;
+        m_customData = other->m_customData;
+        m_comments   = other->m_comments;
+}

hydranode/hncore/metadata.h

@@ -584 +584 @@
-        //@}
-
+        /**
+         * Merges names, comments and custom fields from other metadata to
+         * this metadata.
+         *
+         * \note All existing names, comments and custom fields in this object
+         *       are destroyed.
+         */
+        void mergeCustom(MetaData *other);
-private:
-        MetaData(const MetaData &md);             //!< Copy construct forbidden

hydranode/hncore/sharedfile.cpp

@@ -449 +449 @@
-                ) % hw->getFileName().native_file_string());
-                destroy();
-        } else if (m_metaData) {
-                logDebug("TODO! Implement MetaData combining.");
-        } else {
-                CHECK_THROW(hw->getMetaData());
-                CHECK_THROW(hw->getMetaData()->getHashSetCount());
+                MetaData *nmd = hw->getMetaData();
+                MetaData *found = 0;
+                for (uint32_t i = 0; i < nmd->getHashSetCount(); ++i) {
+                        found = MetaDb::instance().find(
+                                nmd->getHashSet(i)->getFileHash()
+                        );
+                        if (found) {
+                                break;
+                        }
+                }
+                if (found) {
+                        logDebug(
+                                boost::format(
+                                        "Found existing MetaData for file "
+                                        "%s, merging custom data."
+                                ) % getName()
+                        );
+                        nmd->mergeCustom(found);
+                        // TODO: remove the found entry from MetaDb
+                }
+
-                m_metaData = hw->getMetaData();
-                m_metaData->setName(getName());