go/bindata
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #59 from jwforres/sort_sooner

Browse Source 
Sort before generating unique function names to get stable output
This commit is contained in:
Jim Teeuwen 2014-11-25 11:17:39 +01:00
commit f94581bd91
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asset.go
View File

@ -10,10 +10,3 @@ type Asset struct {
Name string // Key used in TOC -- name by which asset is referenced. Name string // Key used in TOC -- name by which asset is referenced.
Func string // Function name for the procedure returning the asset contents. Func string // Function name for the procedure returning the asset contents.
} }
// Implement sort.Interface for []Asset based on Path field
type ByPath []Asset
func (v ByPath) Len() int { return len(v) }
func (v ByPath) Swap(i, j int) { v[i], v[j] = v[j], v[i] }
func (v ByPath) Less(i, j int) bool { return v[i].Path < v[j].Path }

13
convert.go
View File

@ -35,9 +35,6 @@ func Translate(c *Config) error {
} }
} }
// Sort to make output stable between invocations
sort.Sort(ByPath(toc))
// Create output file. // Create output file.
fd, err := os.Create(c.Output) fd, err := os.Create(c.Output)
if err != nil { if err != nil {
@ -83,6 +80,13 @@ func Translate(c *Config) error {
return writeTOCTree(bfd, toc) return writeTOCTree(bfd, toc)
} }
// Implement sort.Interface for []os.FileInfo based on Name()
type ByName []os.FileInfo
func (v ByName) Len() int { return len(v) }
func (v ByName) Swap(i, j int) { v[i], v[j] = v[j], v[i] }
func (v ByName) Less(i, j int) bool { return v[i].Name() < v[j].Name() }
// findFiles recursively finds all the file paths in the given directory tree. // findFiles recursively finds all the file paths in the given directory tree.
// They are added to the given map as keys. Values will be safe function names // They are added to the given map as keys. Values will be safe function names
// for each file, which will be used when generating the output code. // for each file, which will be used when generating the output code.
@ -115,6 +119,9 @@ func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regex
if err != nil { if err != nil {
return err return err
} }
// Sort to make output stable between invocations
sort.Sort(ByName(list))
} }
knownFuncs := make(map[string]int) knownFuncs := make(map[string]int)