trimmed down metadata & own extractor for vobis(flac)
This commit is contained in:
@@ -61,33 +61,33 @@ func sortSong(src, dst string, updateMeta bool) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func sanitizeName(name string) *string {
|
||||
if name == "" {
|
||||
func sanitizeName(name *string) *string {
|
||||
if name == nil || *name == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
re := regexp.MustCompile(`[<>:"/\\|?*\x00-\x1F]`)
|
||||
name = re.ReplaceAllString(name, "_")
|
||||
dName := re.ReplaceAllString(*name, "_")
|
||||
|
||||
name = strings.Trim(name, " .")
|
||||
dName = strings.Trim(dName, " .")
|
||||
|
||||
if name == "" {
|
||||
if dName == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
return &name
|
||||
return &dName
|
||||
}
|
||||
|
||||
func getArtistName(m metadata.Metadata) string {
|
||||
var artist *string
|
||||
|
||||
if len(m.Artist) > 0 {
|
||||
artist = sanitizeName(m.Artist[0])
|
||||
artist = sanitizeName(&m.Artist[0])
|
||||
}
|
||||
|
||||
if artist == nil && len(m.AlbumArtist) > 0 {
|
||||
if aa := m.AlbumArtist[0]; aa != "" {
|
||||
artist = sanitizeName(aa)
|
||||
artist = sanitizeName(&aa)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,7 +109,8 @@ func getAlbumName(m metadata.Metadata) string {
|
||||
func getTitle(src string, m metadata.Metadata) string {
|
||||
title := sanitizeName(m.Title)
|
||||
if title == nil {
|
||||
return *sanitizeName(strings.TrimSuffix(filepath.Base(src), filepath.Ext(src)))
|
||||
filename := strings.TrimSuffix(filepath.Base(src), filepath.Ext(src))
|
||||
return *sanitizeName(&filename)
|
||||
}
|
||||
return *title
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user