NPI-3653 - Fix errors in parsing IGS log updates #68
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I've run this on a whole directory of log files using the |
treefern
previously approved these changes
Jan 9, 2025
…g. add: Unit-tests to test parsing and gathering of files
treefern
reviewed
Jan 9, 2025
Comment on lines
+156
to
159
| result_v1 = _REGEX_LOG_VERSION_1.search(data) | ||
| if result_v1: | ||
| return "v1.0" | ||
|
|
There was a problem hiding this comment.
For efficiency and robustness, I'd suggest trimming the binary string to the first line, before running the regex over it.
Suggested change
| result_v1 = _REGEX_LOG_VERSION_1.search(data) | |
| if result_v1: | |
| return "v1.0" | |
| # Remove leading newline if present (can show up when reading from a file), truncate to first line | |
| first_line_bytes = data.lstrip(b"\n").split(b"\n")[0] | |
| result_v1 = _REGEX_LOG_VERSION_1.search(first_line_bytes) | |
| if result_v1: | |
| return "v1.0" |
treefern
reviewed
Jan 9, 2025
| if result_v1: | ||
| return "v1.0" | ||
|
|
||
| result_v2 = _REGEX_VERSION_2.search(data) | ||
| result_v2 = _REGEX_LOG_VERSION_2.search(data) |
There was a problem hiding this comment.
Suggested change
| result_v2 = _REGEX_LOG_VERSION_2.search(data) | |
| result_v2 = _REGEX_LOG_VERSION_2.search(first_line_bytes) |
treefern
reviewed
Jan 9, 2025
treefern
reviewed
Jan 9, 2025
treefern
reviewed
Jan 9, 2025
treefern
reviewed
Jan 9, 2025
treefern
reviewed
Jan 9, 2025
treefern
reviewed
Jan 9, 2025
|
|
||
| _REGEX_LOG_VERSION_1 = _re.compile(rb"""(site log\))""") | ||
| _REGEX_LOG_VERSION_2 = _re.compile(rb"""(site log v2.0)""") | ||
|
|
||
| _REGEX_ID_V1 = _re.compile( | ||
| rb""" | ||
| (?:Four\sCharacter\sID|Site\sID)\s+\:\s*(\w{4}).*\W+ |
There was a problem hiding this comment.
This named capture group might read more clearly with underscores rather than escaped spaces(?)
Fixing various type hints and adding helpful comments Co-authored-by: Nathan <95725385+treefern@users.noreply.github.com>
treefern
approved these changes
Jan 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The previous PR on this branch had a couple errors that meant the
write_meta_gather_master()function (andgather_metadata()function) were not working correctly.Ultimately, the arguments were being fed in the wrong order to the new
extract_...functions, and therefore an "incorrect version" flag was being shown (because a station Code was being fed in instead).This PR fixes my initial oversight - arguments are explicitly passed in