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

fixup! run gofumpt / format comments / comment blocks

Browse Source
This commit is contained in:
sentriz
2020-03-19 18:30:49 +00:00
parent 4b32bc0e4d
commit 22992c9941
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/gonicembed/main.go
View File

@@ -18,9 +18,10 @@ import (
// once i had this written with ~100% text/template but it was very // once i had this written with ~100% text/template but it was very
// slow. now this thing is not nice on the eyes or easy to change // slow. now this thing is not nice on the eyes or easy to change
// but it's pretty fast. which i needed it to for live reloading stuff // but it's pretty fast. which i needed it to for live reloading stuff
const ( const (
byteCols = 24 byteCols = 24
// begin file template // ** begin file template
fileHeader = `// file generated with embed tool fileHeader = `// file generated with embed tool
// do not edit // do not edit
// %s // %s
@@ -33,7 +34,7 @@ type EmbeddedAsset struct {
var %s = map[string]*EmbeddedAsset{` var %s = map[string]*EmbeddedAsset{`
fileFooter = ` fileFooter = `
}` }`
// begin asset template // ** begin asset template
assetHeader = ` assetHeader = `
%q: &EmbeddedAsset{ %q: &EmbeddedAsset{
ModTime: time.Unix(%d, 0), ModTime: time.Unix(%d, 0),
@@ -104,13 +105,11 @@ func processAssets(c *config, files []string) error {
return errors.Wrap(err, "opening asset") return errors.Wrap(err, "opening asset")
} }
defer data.Close() defer data.Close()
processAsset( processAsset(c, &file{
c, data: data,
&file{ path: path,
data: data, modTime: info.ModTime(),
path: path, },
modTime: info.ModTime(),
},
outWriter, outWriter,
) )
} }

1
db/migrations.go
View File

@@ -7,6 +7,7 @@ import (
) )
// $ date '+%Y%m%d%H%M' // $ date '+%Y%m%d%H%M'
// not really a migration // not really a migration
var migrationInitSchema = gormigrate.Migration{ var migrationInitSchema = gormigrate.Migration{
ID: "202002192100", ID: "202002192100",

8
scanner/scanner.go
View File

@@ -126,14 +126,14 @@ func (s *Scanner) Start() error {
s.db.Exec(` s.db.Exec(`
DELETE FROM albums DELETE FROM albums
WHERE tag_artist_id NOT NULL WHERE tag_artist_id NOT NULL
AND NOT EXISTS ( SELECT 1 FROM tracks AND NOT EXISTS ( SELECT 1 FROM tracks
WHERE tracks.album_id=albums.id WHERE tracks.album_id=albums.id
)`) )`)
// delete artists without albums // delete artists without albums
s.db.Exec(` s.db.Exec(`
DELETE FROM artists DELETE FROM artists
WHERE NOT EXISTS ( SELECT 1 from albums WHERE NOT EXISTS ( SELECT 1 from albums
WHERE albums.tag_artist_id=artists.id WHERE albums.tag_artist_id=artists.id
)`) )`)
// finish up // finish up
strNow := strconv.FormatInt(time.Now().Unix(), 10) strNow := strconv.FormatInt(time.Now().Unix(), 10)

2
scanner/tags/tags.go
View File

@@ -32,6 +32,7 @@ func (t *Tags) firstTag(keys ...string) string {
} }
return "" return ""
} }
func (t *Tags) Title() string { return t.firstTag("title") } func (t *Tags) Title() string { return t.firstTag("title") }
func (t *Tags) BrainzID() string { return t.firstTag("musicbrainz_trackid") } func (t *Tags) BrainzID() string { return t.firstTag("musicbrainz_trackid") }
func (t *Tags) Artist() string { return t.firstTag("artist") } func (t *Tags) Artist() string { return t.firstTag("artist") }
@@ -44,6 +45,7 @@ func (t *Tags) TrackNumber() int { return intSep(t.firstTag("tracknumber"),
func (t *Tags) DiscNumber() int { return intSep(t.firstTag("discnumber"), "/") } // eg. 1/2 func (t *Tags) DiscNumber() int { return intSep(t.firstTag("discnumber"), "/") } // eg. 1/2
func (t *Tags) Length() int { return t.props.Length } func (t *Tags) Length() int { return t.props.Length }
func (t *Tags) Bitrate() int { return t.props.Bitrate } func (t *Tags) Bitrate() int { return t.props.Bitrate }
func intSep(in, sep string) int { func intSep(in, sep string) int {
if in == "" { if in == "" {
return 0 return 0