Export package instead of URDF #187
Conversation
| let context = tera::Context::from_serialize(context)?; | ||
| let mut tera = Tera::default(); | ||
| for template in templates.iter() { | ||
| let content = std::fs::read_to_string(&template.path)?; |
There was a problem hiding this comment.
This seems to fail when users do cargo run from a folder that is not the root of the workspace, since the path is in the form of rmf_site_editor/[...], which is only valid from the root.
There was a problem hiding this comment.
I would expect that this solves this. Any ideas?
| if let AssetSource::Package(_) = asset_source { | ||
| let path = String::from(asset_source); | ||
| Ok((*urdf_rs::utils::expand_package_path(&path, None)).to_owned()) | ||
| } else if let AssetSource::Remote(asset_name) = asset_source { | ||
| let mut asset_path = cache_path(); | ||
| asset_path.push(PathBuf::from(&asset_name)); | ||
| Ok(asset_path | ||
| .to_str() | ||
| .ok_or(IoError::new( | ||
| IoErrorKind::InvalidInput, | ||
| "Unable to convert asset_path to str", | ||
| ))? | ||
| .to_string()) | ||
| } else if let AssetSource::Local(path) = asset_source { | ||
| Ok(path.clone()) | ||
| } else { | ||
| Err(IoError::new( | ||
| IoErrorKind::Unsupported, | ||
| "Not a supported asset type for exporting a workcell to a package", | ||
| ))? |
There was a problem hiding this comment.
This would be a bit more idiomatic written as a match statement rather than an if let chain, the unimplemented branch should probably also have all the variants written explicitly so we can make it a compile error if in the future a variant is added, i.e.:
match asset_source {
AssetSource::Package(_) => [...],
AssetSource::Remote(asset_name => [...],
AssetSource::Local(path) => [...],
AssetSource::Search(_) | AssetSource::OSMTile(_) | [...] => return the error
}
There was a problem hiding this comment.
Should be fixed in ee15eac.
|
Another note, I'm a bit worried about the GPG signing since this repo requires all commits to be verified, can you check if there is any issue with your GPG key then force-push? It shows |
audrow
force-pushed
the
audrow/add-package-export
branch
from
29c9307
to
c98bd87
Compare
Signed-off-by: Audrow Nash <audrow@intrinsic.ai>
Signed-off-by: Audrow Nash <audrow@intrinsic.ai>
Signed-off-by: Audrow Nash <audrow@intrinsic.ai>
Signed-off-by: Audrow Nash <audrow@intrinsic.ai>
Signed-off-by: Audrow Nash <audrow@intrinsic.ai>
Signed-off-by: Audrow Nash <audrow@intrinsic.ai>
audrow
force-pushed
the
audrow/add-package-export
branch
from
c98bd87
to
02b694a
Compare
All verified now! |
|
I can't push changes to the branch so I'll just merge this in and push directly to the feature branch. For reference this is the commit that fixed the file issue (using the |
This PR adds the business logic from #186 into
rmf_site_editor.