Solved https://github.com/asticode/go-astisub/issues/59 #60
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
asticode
requested changes
Nov 17, 2021
ssa.go
Outdated
| @@ -1268,3 +1274,14 @@ func (s Subtitles) WriteToSSA(o io.Writer) (err error) { | |||
| } | |||
| return | |||
| } | |||
|
|
|||
| // SSAOptions | |||
| type SSAOptions struct{} | |||
There was a problem hiding this comment.
OnUnknownSectionName and OnInvalidLine need to be fields of SSAOptions.
You also need to create a defaultSSAOptions func() SSAOptions that would return SSAOptions with callbacks properly set for logging
ssa.go
Outdated
| @@ -175,7 +181,7 @@ func ReadFromSSA(i io.Reader) (o *Subtitles, err error) { | |||
| format = make(map[int]string) | |||
| continue | |||
| default: | |||
| log.Printf("astisub: unknown section: %s", line) | |||
| opts.OnUnknownSectionName(line) | |||
There was a problem hiding this comment.
Once OnUnknownSectionName is a field, you'll need to wrap this with if opts.OnUnknownSectionName != nil
ssa.go
Outdated
| @@ -195,7 +201,7 @@ func ReadFromSSA(i io.Reader) (o *Subtitles, err error) { | |||
| // Split on ":" | |||
| var split = strings.Split(line, ":") | |||
| if len(split) < 2 || split[0] == "" { | |||
| log.Printf("astisub: not understood: '%s', ignoring", line) | |||
| opts.OnInvalidLine(line) | |||
There was a problem hiding this comment.
Once OnInvalidLine is a field, you'll need to wrap this with if opts.OnInvalidLine != nil
ssa.go
Outdated
| @@ -134,6 +134,12 @@ var ssaRegexpEffect = regexp.MustCompile(`\{[^\{]+\}`) | |||
|
|
|||
| // ReadFromSSA parses an .ssa content | |||
| func ReadFromSSA(i io.Reader) (o *Subtitles, err error) { | |||
| o, err = ReadFromSSAWithOptions(i, SSAOptions{}) | |||
There was a problem hiding this comment.
You need to replace SSAOptions{} with defaultSSAOptions()
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.
Originated from #59