Skip to content

Commit

Permalink
Rewrite taglib integration, now with TCMP
Browse files Browse the repository at this point in the history
  • Loading branch information
deluan committed Sep 8, 2020
1 parent 2d0031f commit e70ec53
Show file tree
Hide file tree
Showing 11 changed files with 166 additions and 868 deletions.
2 changes: 1 addition & 1 deletion reflex.conf
@@ -1 +1 @@
-s -r "(\.go$$|navidrome.toml|resources)" -R "(^ui|^data|^db/migration)" -- go run .
-s -r "(\.go$$|\.cpp$$|\.h$$|navidrome.toml|resources)" -R "(^ui|^data|^db/migration)" -- go run .
8 changes: 8 additions & 0 deletions scanner/metadata/metadata.go
Expand Up @@ -105,6 +105,14 @@ func (m *baseMetadata) parseInt(tagName string) int {
return 0
}

func (m *baseMetadata) parseFloat(tagName string) float32 {
if v, ok := m.tags[tagName]; ok {
f, _ := strconv.ParseFloat(v, 32)
return float32(f)
}
return 0
}

var dateRegex = regexp.MustCompile(`([12]\d\d\d)`)

func (m *baseMetadata) parseYear(tagName string) int {
Expand Down
9 changes: 4 additions & 5 deletions scanner/metadata/taglib.go
Expand Up @@ -11,12 +11,11 @@ import (

type taglibMetadata struct {
baseMetadata
props *taglib.AudioProperties
hasPicture bool
}

func (m *taglibMetadata) Duration() float32 { return float32(m.props.Length) }
func (m *taglibMetadata) BitRate() int { return m.props.Bitrate }
func (m *taglibMetadata) Duration() float32 { return m.parseFloat("length") }
func (m *taglibMetadata) BitRate() int { return m.parseInt("bitrate") }
func (m *taglibMetadata) HasPicture() bool { return m.hasPicture }

type taglibExtractor struct{}
Expand All @@ -42,7 +41,7 @@ func (e *taglibExtractor) extractMetadata(filePath string) (*taglibMetadata, err
log.Warn("Error stating file. Skipping", "filePath", filePath, err)
return nil, errors.New("error stating file")
}
md.tags, md.props, err = taglib.Read(filePath)
md.tags, err = taglib.Read(filePath)
if err != nil {
log.Warn("Error reading metadata from file. Skipping", "filePath", filePath, err)
return nil, errors.New("error reading tags")
Expand All @@ -61,7 +60,7 @@ func hasEmbeddedImage(path string) bool {

m, err := tag.ReadFrom(f)
if err != nil {
log.Warn("Error reading tags from file", "filePath", path, err)
log.Warn("Error reading picture tag from file", "filePath", path, err)
return false
}

Expand Down
505 changes: 0 additions & 505 deletions scanner/metadata/taglib/LICENSE

This file was deleted.

84 changes: 0 additions & 84 deletions scanner/metadata/taglib/README.md

This file was deleted.

106 changes: 0 additions & 106 deletions scanner/metadata/taglib/audiotags.cpp

This file was deleted.

118 changes: 0 additions & 118 deletions scanner/metadata/taglib/audiotags.go

This file was deleted.

0 comments on commit e70ec53

Please sign in to comment.