Skip to content

Commit

Permalink
removed version from encode
Browse files Browse the repository at this point in the history
Signed-off-by: Wojciech Jaworski <wojciech.jaworski@robotec.ai>
  • Loading branch information
WJaworskiRobotec committed Sep 12, 2021
1 parent 5aec610 commit c1a4cb2
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions rosbag2_storage/src/rosbag2_storage/metadata_io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,11 @@ struct convert<rosbag2_storage::BagMetadata>
node["starting_time"] = metadata.starting_time;
node["message_count"] = metadata.message_count;
node["topics_with_message_count"] = metadata.topics_with_message_count;
node["compression_format"] = metadata.compression_format;
node["compression_mode"] = metadata.compression_mode;
node["relative_file_paths"] = metadata.relative_file_paths;
node["files"] = metadata.files;

if (metadata.version >= 3) { // fields introduced by rosbag2_compression
node["compression_format"] = metadata.compression_format;
node["compression_mode"] = metadata.compression_mode;
}
if (metadata.version < 5) {
node["relative_file_paths"] = metadata.relative_file_paths;
}
if (metadata.version >= 5) {
node["files"] = metadata.files;
}
return node;
}

Expand All @@ -237,13 +231,13 @@ struct convert<rosbag2_storage::BagMetadata>
metadata.compression_format = node["compression_format"].as<std::string>();
metadata.compression_mode = node["compression_mode"].as<std::string>();
}
if (metadata.version < 5) {
metadata.relative_file_paths = node["relative_file_paths"].as<std::vector<std::string>>();
}
if (metadata.version >= 5) {
metadata.files =
node["files"].as<std::vector<rosbag2_storage::FileInformation>>();
} else {
metadata.relative_file_paths = node["relative_file_paths"].as<std::vector<std::string>>();
}

return true;
}
};
Expand Down

0 comments on commit c1a4cb2

Please sign in to comment.