Compare commits

...

2 Commits

Author SHA1 Message Date
ac01362ae5 refactored AnalyzeFile 2023-01-16 09:58:33 +01:00
344221ce50 fixed filepath pattern problems 2023-01-16 00:45:58 +01:00
4 changed files with 57 additions and 8 deletions

53
analyze_file.go Normal file
View File

@ -0,0 +1,53 @@
package logic
import (
"context"
"os"
"git.milar.in/nyaanime/model"
"git.milar.in/nyaanime/parsers"
"gopkg.in/vansante/go-ffprobe.v2"
)
// TODO cache
func AnalyzeFile(path string) (*model.ParsedFile, error) {
props := &model.ParsedFile{File: path}
file, err := os.Open(path)
if err != nil {
return nil, err
}
defer file.Close()
data, err := ffprobe.ProbeReader(context.Background(), file)
if err != nil {
return nil, err
}
defaultVideoLang := ""
for _, s := range data.StreamType(ffprobe.StreamVideo) {
if s.Disposition.Default > 0 {
props.Resolution = model.Resolution(s.Height)
defaultVideoLang = parsers.ParseLanguage(s.Tags.Language)
break
}
}
for _, s := range data.StreamType(ffprobe.StreamAudio) {
if s.Tags.Language != "" {
props.Languages = append(props.Languages, parsers.ParseLanguage(s.Tags.Language))
} else if s.Disposition.Default > 0 {
props.Languages = append(props.Languages, defaultVideoLang)
}
}
for _, s := range data.StreamType(ffprobe.StreamSubtitle) {
if s.Tags.Language != "" {
props.Subtitles = append(props.Subtitles, parsers.ParseLanguage(s.Tags.Language))
} else if s.Disposition.Default > 0 {
props.Subtitles = append(props.Subtitles, defaultVideoLang)
}
}
return props, nil
}

View File

@ -19,11 +19,8 @@ var (
AnimePath = envvars.String("ANIME_PATH", "") AnimePath = envvars.String("ANIME_PATH", "")
AnimeEpFilepathPattern = envvars.Object( AnimeEpFilepathPatternStr = envvars.String("EPISODE_FILEPATH_PATTERN", `{{.Anime.Title.UserPreferred}}/{{.Anime.Title.UserPreferred}} Episode {{.Episode}}.{{.Ext}}`)
"EPISODE_FILEPATH_PATTERN", AnimeEpFilepathPattern = template.Must(template.New("EPISODE_FILEPATH_PATTERN").Parse(AnimeEpFilepathPatternStr))
template.Must(template.New("anime-episode-filepath-pattern").Parse(`{{.Anime.Title.UserPreferred}}/{{.Anime.Title.UserPreferred}} Episode {{.Episode}}.{{.Ext}}`)),
template.New("anime-episode-filepath-pattern").Parse,
)
// essential torrent properties // essential torrent properties

View File

@ -5,7 +5,6 @@ import (
"git.milar.in/milarin/slices" "git.milar.in/milarin/slices"
"git.milar.in/nyaanime/model" "git.milar.in/nyaanime/model"
"git.milar.in/nyaanime/parsers"
) )
func GetAnimeEpProps(animeEp model.AnimeEpisode) (*FilePriority, bool) { func GetAnimeEpProps(animeEp model.AnimeEpisode) (*FilePriority, bool) {
@ -18,7 +17,7 @@ func GetAnimeEpProps(animeEp model.AnimeEpisode) (*FilePriority, bool) {
var mostPrio *FilePriority var mostPrio *FilePriority
for _, file := range files { for _, file := range files {
props, err := parsers.AnalyzeFile(file) props, err := AnalyzeFile(file)
if err != nil { if err != nil {
continue continue
} }

2
go.mod
View File

@ -12,10 +12,10 @@ require (
git.milar.in/milarin/tprint v0.0.7 git.milar.in/milarin/tprint v0.0.7
git.milar.in/nyaanime/model v0.0.0-20230113095840-5eb2822653c3 git.milar.in/nyaanime/model v0.0.0-20230113095840-5eb2822653c3
git.milar.in/nyaanime/parsers v0.0.0-20221207192513-e7bce7c418d8 git.milar.in/nyaanime/parsers v0.0.0-20221207192513-e7bce7c418d8
gopkg.in/vansante/go-ffprobe.v2 v2.1.1
) )
require ( require (
github.com/mattn/go-runewidth v0.0.13 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/rivo/uniseg v0.3.4 // indirect github.com/rivo/uniseg v0.3.4 // indirect
gopkg.in/vansante/go-ffprobe.v2 v2.1.1 // indirect
) )