Skip to content

Sort plugins by package name #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DLu merged 1 commit into from
Jan 13, 2025
Merged

Sort plugins by package name #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 28 additions & 23 deletions src/ros_glint/glinters/plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def lookup_library(rel_fn):
if rel_fn in deps:
return library

all_plugin_info = []
for source_file in package.source_code:
plugin_info = source_file.search_lines_for_pattern(PLUGIN_RE)
if not plugin_info:
Expand All @@ -97,29 +98,33 @@ def lookup_library(rel_fn):
if library is None:
continue
for pkg1, name1, pkg2, name2 in plugin_info:
# Create file if needed
if pkg2 not in existing_plugins:
xml_filename = f'{pkg2}_plugins.xml'
full_path = package.root / xml_filename
p_xml = PluginXML(full_path, package)
package.plugin_xml.append(p_xml)
existing_plugins[pkg2] = [p_xml]

# Make sure plugins are properly exported
for plugin_xml in existing_plugins[pkg2]:
if package.ros_version == 1:
if plugin_xml.rel_fn not in defined_plugins[pkg2]:
add_to_package_xml(package.package_xml, plugin_xml, pkg2)
else:
section_check(package.cmake, [pkg2, str(plugin_xml.rel_fn)],
'pluginlib_export_plugin_description_file',
'')

# Make sure the class is in the files
if not contains_library(existing_plugins[pkg2], library, pkg1, name1):
# insert into first
xml = existing_plugins[pkg2][0]
xml.insert_new_class(library, pkg1, name1, pkg2, name2)
all_plugin_info.append((pkg1, name1, pkg2, name2, library))

# Sort by parent package name
for pkg1, name1, pkg2, name2, library in sorted(all_plugin_info):
# Create file if needed
if pkg2 not in existing_plugins:
xml_filename = f'{pkg2}_plugins.xml'
full_path = package.root / xml_filename
p_xml = PluginXML(full_path, package)
package.plugin_xml.append(p_xml)
existing_plugins[pkg2] = [p_xml]

# Make sure plugins are properly exported
for plugin_xml in existing_plugins[pkg2]:
if package.ros_version == 1:
if plugin_xml.rel_fn not in defined_plugins[pkg2]:
add_to_package_xml(package.package_xml, plugin_xml, pkg2)
else:
section_check(package.cmake, [pkg2, str(plugin_xml.rel_fn)],
'pluginlib_export_plugin_description_file',
'')

# Make sure the class is in the files
if not contains_library(existing_plugins[pkg2], library, pkg1, name1):
# insert into first
xml = existing_plugins[pkg2][0]
xml.insert_new_class(library, pkg1, name1, pkg2, name2)

if package.ros_version > 1:
install_cmake_dependencies(package, {'ament_cmake_ros'})
Loading