diff --git a/envvars.go b/envvars.go index d30c159..3166500 100644 --- a/envvars.go +++ b/envvars.go @@ -5,7 +5,8 @@ import ( "math" "time" - "git.milar.in/milarin/envvars" + "git.milar.in/milarin/anilist" + "git.milar.in/milarin/envvars/v2" "git.milar.in/nyaanime/model" ) @@ -28,15 +29,18 @@ var ( template.New("anime-episode-filepath-pattern").Parse, ) - AnimeStatus = envvars.ObjectSlice("ANIME_STATUS", ",", ParseMediaListStatus) + AnimeStatus = envvars.ObjectSlice("ANIME_STATUS", ",", []anilist.MediaListStatus{ + anilist.MediaListStatusCurrent, + anilist.MediaListStatusPlanning, + }, ParseMediaListStatus) // essential torrent properties MaxResolution = envvars.Object("MAX_RESOLUTION", model.Resolution4K, model.ParseResolution) MinResolution = envvars.Object("MIN_RESOLUTION", model.ResolutionHD, model.ParseResolution) - EssentialLanguages = envvars.StringSlice("ESSENTIAL_LANGUAGES", "|") - EssentialSubtitles = envvars.StringSlice("ESSENTIAL_SUBTITLES", "|") + EssentialLanguages = envvars.StringSlice("ESSENTIAL_LANGUAGES", "|", []string{}) + EssentialSubtitles = envvars.StringSlice("ESSENTIAL_SUBTITLES", "|", []string{}) MaxSeeders = envvars.Int("MAX_SEEDERS", math.MaxInt) MinSeeders = envvars.Int("MIN_SEEDERS", 0) @@ -51,9 +55,9 @@ var ( // preferred torrent properties - PreferredLanguages = ParsePreferredStringProps(envvars.StringSlice("PREFERRED_LANGUAGES", "|")) - PreferredSubtitles = ParsePreferredStringProps(envvars.StringSlice("PREFERRED_SUBTITLES", "|")) - PreferredResolutions = ParsePreferredProps(envvars.StringSlice("PREFERRED_RESOLUTIONS", "|"), model.ParseResolution) + PreferredLanguages = ParsePreferredStringProps(envvars.StringSlice("PREFERRED_LANGUAGES", "|", []string{})) + PreferredSubtitles = ParsePreferredStringProps(envvars.StringSlice("PREFERRED_SUBTITLES", "|", []string{})) + PreferredResolutions = ParsePreferredProps(envvars.StringSlice("PREFERRED_RESOLUTIONS", "|", []string{}), model.ParseResolution) /* TODO diff --git a/file_properties.go b/file_properties.go index 3745e0d..cf2e766 100644 --- a/file_properties.go +++ b/file_properties.go @@ -2,7 +2,6 @@ package main import ( "context" - "fmt" "os" "git.milar.in/nyaanime/model" @@ -73,7 +72,3 @@ func (fp *FileProperties) GetSubtitles() []string { func (fp *FileProperties) GetResolution() model.Resolution { return fp.Resolution } - -func (fp *FileProperties) String() string { - return fmt.Sprintf("") -} diff --git a/go.mod b/go.mod index e57d899..b3a520f 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( git.milar.in/milarin/adverr v1.0.0 git.milar.in/milarin/anilist v1.5.0 git.milar.in/milarin/channel v0.0.9 - git.milar.in/milarin/envvars v1.0.3 + git.milar.in/milarin/envvars/v2 v2.0.0 git.milar.in/milarin/gmath v0.0.2 git.milar.in/milarin/slices v0.0.2 git.milar.in/nyaanime/model v0.0.0-20220822093541-87208e95e7ac diff --git a/go.sum b/go.sum index 61a5b6b..8eb9866 100644 --- a/go.sum +++ b/go.sum @@ -4,24 +4,20 @@ git.milar.in/milarin/anilist v1.5.0 h1:fSiAXY/topNk4ISEp2QtcG9HHKLJfMc8w05iqc+Pa git.milar.in/milarin/anilist v1.5.0/go.mod h1:8PTHXFMA45JpfRFIpcdrKwDHue8fbT/wwV1BuHFn6c0= git.milar.in/milarin/channel v0.0.9 h1:vYJnXOaIn/+mng1+8CyepQgDfRse2s4FSLNc7zv85To= git.milar.in/milarin/channel v0.0.9/go.mod h1:We83LTI8S7u7II3pD+A2ChCDWJfCkcBUCUqii9HjTtM= -git.milar.in/milarin/envvars v1.0.3 h1:go6pYExUzPx+aLvJ5BKNkaANkBNmcrlRJ8TtWsk4uWY= -git.milar.in/milarin/envvars v1.0.3/go.mod h1:rLh/HN6S254h6m2lklnImcpsy4kHFxaOjM6+Nv9GHKI= +git.milar.in/milarin/envvars/v2 v2.0.0 h1:DWRQCWaHqzDD8NGpSgv5tYLuF9A/dVFPAtTvz3oiIqE= +git.milar.in/milarin/envvars/v2 v2.0.0/go.mod h1:HkdEi+gG2lJSmVq547bTlQV4qQ0hO333bE8IrE0B9yY= git.milar.in/milarin/gmath v0.0.2 h1:avz+75f8XqAYA1wEB6kis0R5xvRuepBKTqBuJBjh6Yw= git.milar.in/milarin/gmath v0.0.2/go.mod h1:HDLftG5RLpiNGKiIWh+O2G1PYkNzyLDADO8Cd/1abiE= git.milar.in/milarin/slices v0.0.2 h1:j92MuP0HWKSaHJMq/FRxDtSDIGiOTvw+KogUTwuulr0= git.milar.in/milarin/slices v0.0.2/go.mod h1:XRNfE99aNKeaPOY1phjOlpIQqeGCW1LOqqh8UHS+vAk= git.milar.in/nyaanime/model v0.0.0-20220822093541-87208e95e7ac h1:rM5Mpo4/OJuZaBNZdylag+gi8giWVwDbqsoPjhDP9+g= git.milar.in/nyaanime/model v0.0.0-20220822093541-87208e95e7ac/go.mod h1:OzhQgj0b/Hf9fg8VXYxYt8ONQOvHm8xC44TmS9kQ150= -git.milar.in/nyaanime/parsers v0.0.0-20220815144327-52de61265e27 h1:0+5j9MMJQS8+Luss19hD6hvNFxcBDRal2XwSUTyq7WU= -git.milar.in/nyaanime/parsers v0.0.0-20220815144327-52de61265e27/go.mod h1:qm6fIFBFs90uz7IJ8RKgDir0K8Fa8isixGLgrtC6kgU= git.milar.in/nyaanime/parsers v0.0.0-20220822100125-2813a7868f6a h1:7vrKOL/vpqJ8YFZ9tmq9iPLoBuLnZgptHWaScyFOFFo= git.milar.in/nyaanime/parsers v0.0.0-20220822100125-2813a7868f6a/go.mod h1:qm6fIFBFs90uz7IJ8RKgDir0K8Fa8isixGLgrtC6kgU= github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI= github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= -github.com/vansante/go-ffprobe v1.1.0 h1:Tz5X+38tF8YYEFVz+PUTrtvlED35IorB7XI0USOqZWU= -github.com/vansante/go-ffprobe v1.1.0/go.mod h1:AEIxsTWYTTeXpel90yu5J/QxuDWNaKCO50xRBN4rdac= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= diff --git a/main.go b/main.go index c828a52..8d75b3f 100644 --- a/main.go +++ b/main.go @@ -3,8 +3,6 @@ package main import ( "fmt" "time" - - "git.milar.in/milarin/anilist" ) func main() { @@ -12,14 +10,6 @@ func main() { fmt.Println("subtitle priorites:", Map2Str(PreferredSubtitles)) fmt.Println("resolution priorites:", Map2Str(PreferredResolutions)) - // TODO ugly code (see issue nyaanime/downloader#1) - if len(AnimeStatus) == 0 { - AnimeStatus = []anilist.MediaListStatus{ - anilist.MediaListStatusCurrent, - anilist.MediaListStatusPlanning, - } - } - // get access token once at startup to be sure that an access token is obtainable at all if _, err := GetAnilistAccessToken(); err != nil { panic(err)