Skip to content

Commit a00c0d8

Browse files
committed
Move setCopyright to tracks.go
1 parent b005ed4 commit a00c0d8

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

main.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,6 @@ func dump(s string, x interface{}) {
187187
log.Trace(string(b))
188188
}
189189

190-
// @TODO move to track.go
191-
func setCopyright(track *Track, copyright string, copyrightMask string, year int) {
192-
if copyright != "" {
193-
// track.Copyright := html.EscapeString(copyright)
194-
track.Copyright = copyright
195-
} else {
196-
// track.Copyright = fmt.Sprintf(html.EscapeString(copyrightMask), year, track.Artist)
197-
track.Copyright = fmt.Sprintf(copyrightMask, year, track.Artist)
198-
}
199-
}
200-
201190
// @TODO move to track.go
202191
func getDurationViaExiftool(track *Track, exiftool string) (durationMilliseconds int64, err error) {
203192
if exiftool == "" {
@@ -397,7 +386,7 @@ func setTrackDefaults(track *Track, lastTrack *Track) bool {
397386
track.Year = strconv.Itoa(year)
398387
}
399388

400-
setCopyright(track, defaults.Copyright, defaults.CopyrightMask, year)
389+
track.SetCopyright(defaults.Copyright, defaults.CopyrightMask, year)
401390

402391
track.DurationMilliseconds, err = getDurationViaExiftool(track, defaults.Exiftool)
403392
var err2 error

track.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,14 @@ func (f *Track) NormalizeFilename() {
172172
f.OriginalFilename = f.Filename
173173
f.Filename = normalizeFilename(f.Filename)
174174
}
175+
176+
// SetCopyright sets the copyright string
177+
func (f *Track) SetCopyright(copyright string, copyrightMask string, year int) {
178+
if copyright != "" {
179+
// f.Copyright := html.EscapeString(copyright)
180+
f.Copyright = copyright
181+
} else {
182+
// f.Copyright = fmt.Sprintf(html.EscapeString(copyrightMask), year, f.Artist)
183+
f.Copyright = fmt.Sprintf(copyrightMask, year, f.Artist)
184+
}
185+
}

0 commit comments

Comments
 (0)