Skip to content
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.

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

issue 129: add .lblx #137

Merged
merged 1 commit into from
Oct 24, 2023
Merged

issue 129: add .lblx #137

merged 1 commit into from
Oct 24, 2023

Conversation

al-niessner
Copy link
Contributor

🗒️ Summary

Minimal changes required to process .xml and .lblx files but may not what was desired nor the most optimal for future expansion beyond these two extensions.

⚙️ Test Data and/or Report

Not sure how to show a DB was populated in a meaningful way.

♻️ Related Issues

Closes #129
Closes #130

@al-niessner
Copy link
Contributor Author

@jordanpadams @tloubrieu-jpl

harvest is still broken. While making these changes noticed two things:

  1. no schema for configuration so could not add an attribute with default value of ".xml,.lblx" such that a user could continue to expand on that attribute as desired.
  2. harvest code clearly is old school and conflicts with NASA-PDS/validate in that validate uses the Product_Class for determining bundle/collection/product not filename.

Copy link
Member

@tloubrieu-jpl tloubrieu-jpl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @al-niessner

@tloubrieu-jpl tloubrieu-jpl merged commit b0a617a into main Oct 24, 2023
@tloubrieu-jpl tloubrieu-jpl deleted the issue_129 branch October 24, 2023 16:50
@@ -69,7 +69,7 @@ private static class BundleMatcher implements BiPredicate<Path, BasicFileAttribu
public boolean test(Path path, BasicFileAttributes attrs)
{
String fileName = path.getFileName().toString().toLowerCase();
return (fileName.endsWith(".xml") && fileName.contains("bundle"));
return ((fileName.endsWith(".xml") || fileName.endsWith(".lbxl"))&& fileName.contains("bundle"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@al-niessner sorry for the confusion. This is incorrect. This should be .lblx not .lblxl

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants