Make it possible to work without Nokogiri #107
Merged
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
Nokogiri is not a mandatory dependency for this plugin, so this should
work without it.
Currently, we need to install Nokogiri manually.
Otherwise, the following LoadError occurs:
<internal:/path/to/rubygems/core_ext/kernel_require.rb>:88:in `require': cannot load such file -- nokogiri (LoadError)
from <internal:/path/to/rubygems/core_ext/kernel_require.rb>:88:in `require'
from /path/to/gems/fluent-plugin-windows-eventlog-0.8.3/lib/fluent/plugin/bookmark_sax_parser.rb:1:in `<top (required)>'
...
Signed-off-by: Daijiro Fukuda <[email protected]>
ashie
reviewed
Jun 8, 2024
| def bookmarklist_is_not_empty?(bookmarkXml, channel) | ||
| # Empty example: "<BookmarkList>\r\n</BookmarkList>" | ||
| # Not empty example: "<BookmarkList>\r\n <Bookmark Channel='Setup' RecordId='777' IsCurrent='true'/>\r\n</BookmarkList>" | ||
| bookmarkXml.include?("Channel") |
There was a problem hiding this comment.
Although it's better than depending nokogiri mandatory, it might be better to do more something here.
- Try REXML::Parsers::StreamParser
- Match not only
Channelbut also<BookmarkList>and</BookmarkList>to check the file isn't truncated.
In addition, I've noticed that winevt_c should check GetLastError() when it fails on EvtCreateBookmark(): https://github.com/fluent-plugins-nursery/winevt_c/blob/9dd9c81432b1e0180c7abc19de8415bb42db2e49/ext/winevt/winevt_bookmark.c#L93
There was a problem hiding this comment.
There was a problem hiding this comment.
It's worth to merge even without ↑
We'll tackle on it in another PR.
There was a problem hiding this comment.
Thanks! Sorry I could not make time for this.
Yes, we'll tackle on it in another PR.
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.
Nokogiri is not a mandatory dependency for this plugin, so this plugin should work without it.
Currently, we need to install Nokogiri manually.
Otherwise, the following LoadError occurs:
We can consider making this work with
rexmlifNokogiriis not available.On the other hand, this PR is based on the idea that we don't have to go that far now.
At least, we should be able to judge if the bookmark is empty or not for #40.
We wouldn't necessarily need an XML parser for this.
(Of course it is preferable to parse it properly, but it wouldn't be as much to make Nokogiri a mandatory dependency just for that purpose.)