Add custom split logic for scanner #125
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
justin-taylor
force-pushed
the
scan-carriage-returns
branch
from
79b8135 to
12a84c9
Compare
asticode
requested changes
Dec 18, 2024
subtitles.go
Outdated
| @@ -927,3 +930,32 @@ func escapeHTML(i string) string { | |||
| func unescapeHTML(i string) string { | |||
| return htmlUnescaper.Replace(i) | |||
| } | |||
|
|
|||
| func NewScanner(i io.Reader) *bufio.Scanner { | |||
There was a problem hiding this comment.
Unless I'm missing something, I don't see the point of exporting this method, therefore could you rename it to newScanner instead?
There was a problem hiding this comment.
Good point. Updated.
subtitles.go
Outdated
| return scanner | ||
| } | ||
|
|
||
| func splitLines(data []byte, atEOF bool) (advance int, token []byte, err error) { |
There was a problem hiding this comment.
I don't really see the point of creating an extra splitLines function, since newScanner is simple enough could you add the split function directly as an anonymous function:
scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
...
})
subtitles_test.go
Outdated
| func TestNewScanner(t *testing.T) { | ||
| exts := []string{"vtt", "srt", "ssa"} | ||
| for _, ext := range exts { | ||
| s, err := astisub.OpenFile("./testdata/example-in-scan-line." + ext) |
There was a problem hiding this comment.
Could you rename the testdata files to example-in-carriage-return.(srt|ssa|vtt) instead?
justin-taylor
force-pushed
the
scan-carriage-returns
branch
from
12a84c9 to
c46e2e6
Compare
|
@asticode all comments have been addressed. Let me know if there is anything else. Otherwise, can I get another tag 🙏 ? |
|
Thanks again for the PR ❤️ I've created the |
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.
This PR provides a custom
bufio.SplitFuncthat works with carriage returns\r, allowing for parsing of files created by windows software.Closes #118