Skip to content

Commit

Permalink
better filename format per @jshas comments
Browse files Browse the repository at this point in the history
  • Loading branch information
rolandshoemaker committed May 6, 2015
1 parent f0b013d commit d796c80
Showing 1 changed file with 6 additions and 17 deletions.
23 changes: 6 additions & 17 deletions cmd/boulder-migrator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,39 +91,28 @@ func createMigrationTable(Sql *sql.DB) (err error) {
return
}

type timeSlice []time.Time

// Order most least recent to most
func (t timeSlice) Len() int {return len(t)}
func (t timeSlice) Less(i, j int) bool {return t[i].Before(t[j])}
func (t timeSlice) Swap(i, j int) {t[i], t[j] = t[j], t[i]}

var timestampFormat string = "02-01-06T15:04"
var timestampFormat string = "20060102-150405"

func orderedMigrationList(migrationDir string) (sortedList []string, err error) {
migrationList, err := ioutil.ReadDir(migrationDir)
if err != nil {
return
}
var timeList timeSlice
for _, file := range migrationList {
if strings.ToLower(filepath.Ext(file.Name())) != ".json" {
continue
}
if file.Name() == "/" {
continue
}
var nameTime time.Time
nameTime, err = time.Parse(timestampFormat, nameFromFile(file.Name()))
migrationName := nameFromFile(file.Name())
_, err := time.Parse(timestampFormat, migrationName)
if err != nil {
return
continue
}
timeList = append(timeList, nameTime)
}
sort.Sort(timeList)
for _, ts := range timeList {
sortedList = append(sortedList, ts.Format(timestampFormat))
sortedList = append(sortedList, migrationName)
}
sort.Strings(sortedList)
return
}

Expand Down

0 comments on commit d796c80

Please sign in to comment.