diff --git a/Taskfile.yml b/Taskfile.yml index 29b95a6..50c0b63 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -36,22 +36,6 @@ tasks: cmds: - go build -o build/ ./cmd/{{.CMD}} - build-mkflex: - desc: Builds the mkflex command - sources: - - cmd/mkflex/**/*.go - - cli/**/*.go - - convids/**/*.go - - internal/cli/mkflex/**/*.go - - mkflex/**/*.go - - types/**/*.go - generates: - - builds/mkflex - cmds: - - task: cmd-build - vars: - CMD: mkflex - build-convids: desc: Builds the convids command sources: @@ -93,7 +77,6 @@ tasks: desc: Installs the mkflex command source: - cmd/mkflex/**/*.go - - cli/**/*.go - convids/**/*.go - internal/cli/mkflex/**/*.go - mkflex/**/*.go diff --git a/convids/models.go b/convids/models.go index 779fbfa..5473ffd 100644 --- a/convids/models.go +++ b/convids/models.go @@ -38,7 +38,6 @@ type Show struct { AlternateName []string `yaml:"alternate_name"` Exact bool Skip bool - Quality string } re *regexp.Regexp diff --git a/mkflex/logic.go b/mkflex/logic.go index 5c64b3f..963a4d4 100644 --- a/mkflex/logic.go +++ b/mkflex/logic.go @@ -90,9 +90,6 @@ func getShow(show conutils.Show, sh Series) SeriesGroups { if !show.Flexget.Begin.IsZero() { sh.Begin = show.Flexget.Begin } - if show.Flexget.Quality != "" { - sh.Quality = show.Flexget.Quality - } sh.AlternameName = show.Flexget.AlternateName sh.Exact = show.Flexget.Exact name := cmp.Or(show.Flexget.Name, show.Name, show.Pattern) diff --git a/types/int_string.go b/types/int_string.go deleted file mode 100644 index 780644d..0000000 --- a/types/int_string.go +++ /dev/null @@ -1,51 +0,0 @@ -package types - -import "fmt" - -type IntOrString struct { - intVal int - strVal string - isInt bool -} - -func (is *IntOrString) Set(val any) error { - switch v := val.(type) { - case int: - case int8: - case int16: - case int32: - case int64: - case uint: - case uint8: - case uint16: - case uint32: - is.isInt = true - is.intVal = int(v) - return nil - case string: - is.isInt = false - is.strVal = v - return nil - case []byte: - is.isInt = false - is.strVal = string(v) - return nil - } - - //nolint:err113 // Temp skip - return fmt.Errorf("invalid type: %T", val) -} - -func (is IntOrString) IsZero() bool { - if is.isInt { - return is.intVal == 0 - } - return is.strVal == "" -} - -func (is IntOrString) Value() any { - if is.isInt { - return is.intVal - } - return is.strVal -} diff --git a/types/toml.go b/types/toml.go deleted file mode 100644 index cc50593..0000000 --- a/types/toml.go +++ /dev/null @@ -1,25 +0,0 @@ -package types - -import "fmt" - -type TomlTypeError struct { - Value any -} - -func (te *TomlTypeError) Error() string { - return fmt.Sprintf("unsupported type: %T", te.Value) -} - -func (is *IntOrString) UnmarshalTOML(val any) error { - switch v := val.(type) { - case string: - is.isInt = false - is.strVal = v - return nil - case int64: - is.isInt = true - is.intVal = int(v) - return nil - } - return &TomlTypeError{Value: val} -} diff --git a/types/yaml.go b/types/yaml.go index d0b7d6d..4fa1d1b 100644 --- a/types/yaml.go +++ b/types/yaml.go @@ -10,8 +10,17 @@ func (ye *YamlTypeError) Error() string { return ye.Node.Tag + " is not a valid type for this field" } +type IntOrString struct { + intVal int + strVal string + isInt bool +} + func (is IntOrString) MarshalYAML() (any, error) { - return is.Value(), nil + if is.isInt { + return is.intVal, nil + } + return is.strVal, nil } func (is *IntOrString) UnmarshalYAML(value *yaml.Node) error { @@ -27,3 +36,10 @@ func (is *IntOrString) UnmarshalYAML(value *yaml.Node) error { return &YamlTypeError{Node: value} } + +func (is IntOrString) IsZero() bool { + if is.isInt { + return is.intVal == 0 + } + return is.strVal == "" +}