heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor(scanner): remove unused genreIDs arg

Browse Source
This commit is contained in:
sentriz
2022-05-19 00:46:17 +01:00
parent 53a4247dfd
commit d6d1fe26ba
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scanner/scanner.go
View File

@@ -17,9 +17,9 @@ import (
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"github.com/rainycape/unidecode" "github.com/rainycape/unidecode"
"go.senan.xyz/gonic/multierr"
"go.senan.xyz/gonic/db" "go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/mime" "go.senan.xyz/gonic/mime"
"go.senan.xyz/gonic/multierr"
"go.senan.xyz/gonic/scanner/tags" "go.senan.xyz/gonic/scanner/tags"
) )
@@ -224,7 +224,7 @@ func (s *Scanner) populateTrackAndAlbumArtists(tx *db.DB, c *Context, i int, par
if err != nil { if err != nil {
return fmt.Errorf("populate album artist: %w", err) return fmt.Errorf("populate album artist: %w", err)
} }
if err := populateAlbum(tx, album, albumArtist, trags, genreIDs, stat.ModTime(), statCreateTime(stat)); err != nil { if err := populateAlbum(tx, album, albumArtist, trags, stat.ModTime(), statCreateTime(stat)); err != nil {
return fmt.Errorf("populate album: %w", err) return fmt.Errorf("populate album: %w", err)
} }
if err := populateAlbumGenres(tx, album, genreIDs); err != nil { if err := populateAlbumGenres(tx, album, genreIDs); err != nil {
@@ -235,7 +235,6 @@ func (s *Scanner) populateTrackAndAlbumArtists(tx *db.DB, c *Context, i int, par
if err := populateTrack(tx, album, track, trags, basename, int(stat.Size())); err != nil { if err := populateTrack(tx, album, track, trags, basename, int(stat.Size())); err != nil {
return fmt.Errorf("process %q: %w", basename, err) return fmt.Errorf("process %q: %w", basename, err)
} }
if err := populateTrackGenres(tx, track, genreIDs); err != nil { if err := populateTrackGenres(tx, track, genreIDs); err != nil {
return fmt.Errorf("populate track genres: %w", err) return fmt.Errorf("populate track genres: %w", err)
} }
@@ -246,7 +245,7 @@ func (s *Scanner) populateTrackAndAlbumArtists(tx *db.DB, c *Context, i int, par
return nil return nil
} }
func populateAlbum(tx *db.DB, album *db.Album, albumArtist *db.Artist, trags tags.Parser, genreIDs []int, modTime, createTime time.Time) error { func populateAlbum(tx *db.DB, album *db.Album, albumArtist *db.Artist, trags tags.Parser, modTime, createTime time.Time) error {
albumName := trags.SomeAlbum() albumName := trags.SomeAlbum()
album.TagTitle = albumName album.TagTitle = albumName
album.TagTitleUDec = decoded(albumName) album.TagTitleUDec = decoded(albumName)

2
scanner/scanner_test.go
View File

@@ -13,9 +13,9 @@ import (
_ "github.com/jinzhu/gorm/dialects/sqlite" _ "github.com/jinzhu/gorm/dialects/sqlite"
"github.com/matryer/is" "github.com/matryer/is"
"go.senan.xyz/gonic/multierr"
"go.senan.xyz/gonic/db" "go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/mockfs" "go.senan.xyz/gonic/mockfs"
"go.senan.xyz/gonic/multierr"
"go.senan.xyz/gonic/scanner" "go.senan.xyz/gonic/scanner"
) )