Fix LocalCache
so that models/worlds downloaded via fuel.ignitionrobotics.org can be found in the cache
#406
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🦟 Bug fix
Fixes gazebosim/gz-sim#2281
Summary
LocalCache::MatchingModel
andLocalCache::MatchingWorld
are used to determine if a given Fuel URL is in the local cache. These functions usedLocalCache::AllModels
to get a list of all known models/worlds and compare them to the requested Fuel URL. The problem is thatLocalCache::AllModel
would only look for models/worlds in a predetermined directory,<cache location>/fuel.gazebosim.org
:gz-fuel-tools/src/LocalCache.cc
Lines 232 to 235 in a59c107
However, since the argument to
MatchingModel
/MatchingWorld
would already have the server URL, we shouldn't have to look throughAllModels
. This patch uses the pathcommon::joinPaths( this->dataPtr->config->CacheLocation(), uriToPath(_id.Server().Url()));
to look for models/worlds. The side effect of this is that Fuel URLs that usefuel.ignitionrobotics.org
now work.Checklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.