mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-13 11:40:33 +00:00
Code Issues Releases Wiki Activity

Treat data file paths as relative to the metadata file

Browse Source 
The data file paths are actually not native paths but URLs, this covers most cases but not all of them.
This commit is contained in:
Victor Castillo 2024-06-24 18:08:40 +02:00
parent 5c442c8aae
commit 598fa283b8
No known key found for this signature in database
GPG Key ID: 8EF1FC8B7182F608
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/algorithms/signal_source/libs/ion_gnss_sdr_metadata_standard.cc
View File

@ -54,28 +54,29 @@ std::vector<IONMetadataStdFileSource::sptr> GnssMetadataHandler::make_stream_sou
{ {
for (const auto& chunk : block.Chunks()) for (const auto& chunk : block.Chunks())
{ {
for (const auto& lump : chunk.Lumps()) for (const auto& lump : chunk.Lumps())
{
for (const auto& stream : lump.Streams())
{
if (std::ranges::any_of(stream_ids.begin(), stream_ids.end(), [&](const std::string& it) {
return stream.Id() == it;
}))
{ {
auto source = gnss_make_shared<IONMetadataStdFileSource>( for (const auto& stream : lump.Streams())
file, {
block, if (std::ranges::any_of(stream_ids.begin(), stream_ids.end(), [&](const std::string& it) {
stream_ids); return stream.Id() == it;
}))
{
auto source = gnss_make_shared<IONMetadataStdFileSource>(
metadata_filepath_,
file,
block,
stream_ids);
sources.push_back(source); sources.push_back(source);
// This file source will take care of any other matching streams in this block // This file source will take care of any other matching streams in this block
// We can skip the rest of this block // We can skip the rest of this block
goto next_block; goto next_block;
}
}
} }
} }
}
}
next_block: next_block:
} }
break; break;
@ -88,6 +89,7 @@ std::vector<IONMetadataStdFileSource::sptr> GnssMetadataHandler::make_stream_sou
IONMetadataStdFileSource::IONMetadataStdFileSource( IONMetadataStdFileSource::IONMetadataStdFileSource(
const std::filesystem::path& metadata_filepath,
const GnssMetadata::File& file, const GnssMetadata::File& file,
const GnssMetadata::Block& block, const GnssMetadata::Block& block,
const std::vector<std::string>& stream_ids) const std::vector<std::string>& stream_ids)
@ -98,7 +100,8 @@ IONMetadataStdFileSource::IONMetadataStdFileSource(
file_metadata_(file), file_metadata_(file),
block_metadata_(block) block_metadata_(block)
{ {
fd_ = std::fopen(file.Url().Value().c_str(), "rb"); std::filesystem::path data_filepath = metadata_filepath.parent_path() / file.Url().Value();
fd_ = std::fopen(data_filepath.c_str(), "rb");
std::size_t block_offset = file.Offset(); std::size_t block_offset = file.Offset();
std::fseek(fd_, file.Offset() + block_offset + block.SizeHeader(), SEEK_SET); std::fseek(fd_, file.Offset() + block_offset + block.SizeHeader(), SEEK_SET);

2
src/algorithms/signal_source/libs/ion_gnss_sdr_metadata_standard.h
View File

@ -9,6 +9,7 @@
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
#include <gnuradio/sync_block.h> #include <gnuradio/sync_block.h>
#include <string> #include <string>
#include <filesystem>
class chunk_data_t class chunk_data_t
{ {
@ -268,6 +269,7 @@ public:
using sptr = gnss_shared_ptr<IONMetadataStdFileSource>; using sptr = gnss_shared_ptr<IONMetadataStdFileSource>;
IONMetadataStdFileSource( IONMetadataStdFileSource(
const std::filesystem::path& metadata_filepath,
const GnssMetadata::File& file, const GnssMetadata::File& file,
const GnssMetadata::Block& block, const GnssMetadata::Block& block,
const std::vector<std::string>& stream_ids); const std::vector<std::string>& stream_ids);