Compare commits

..

No commits in common. "master" and "v0.0.12" have entirely different histories.

1 changed files with 4 additions and 7 deletions

View File

@ -15,7 +15,6 @@ type GuessitConfig struct {
type Guessit struct { type Guessit struct {
GuessitConfig GuessitConfig
DefaultOptions []string
} }
type Match struct { type Match struct {
@ -33,7 +32,6 @@ type Match struct {
// Video // Video
ScreenSize string `json:"screen_size,omitempty"` ScreenSize string `json:"screen_size,omitempty"`
Container string `json:"container,omitempty"` Container string `json:"container,omitempty"`
VideoCodec string `json:"video_codec,omitempty"`
// Audio // Audio
AudioChannels string `json:"audio_channels,omitempty"` AudioChannels string `json:"audio_channels,omitempty"`
@ -64,11 +62,11 @@ func (u *Match) UnmarshalJSON(data []byte) error {
u.AudioCodec = ac u.AudioCodec = ac
} }
switch oth := aux.Other.(type) { switch oth := aux.AudioCodec.(type) {
case string: case string:
u.Other = append(u.Other, oth) u.AudioCodec = append(u.AudioCodec, oth)
case []string: case []string:
u.Other = oth u.AudioCodec = oth
} }
return nil return nil
@ -106,12 +104,11 @@ func New(conf GuessitConfig) (Guessit, error) {
} }
} }
return Guessit{conf, []string{}}, nil return Guessit{conf}, nil
} }
func (g Guessit) Guessit(s string, options ...string) (out Match, err error) { func (g Guessit) Guessit(s string, options ...string) (out Match, err error) {
args := []string{"-m", "guessit", s} args := []string{"-m", "guessit", s}
args = append(args, g.DefaultOptions...)
args = append(args, options...) args = append(args, options...)
args = append(args, "--json") args = append(args, "--json")