all: Remove lib/util package (#9049)
Grab-bag packages are nasty, this cleans it up a little by splitting it into topical packages sempahore, netutil, stringutil, structutil.
This commit is contained in:
@@ -0,0 +1,46 @@
|
||||
// Copyright (C) 2016 The Syncthing Authors.
|
||||
//
|
||||
// This Source Code Form is subject to the terms of the Mozilla Public
|
||||
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
|
||||
package stringutil
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// UniqueTrimmedStrings returns a list of all unique strings in ss,
|
||||
// in the order in which they first appear in ss, after trimming away
|
||||
// leading and trailing spaces.
|
||||
func UniqueTrimmedStrings(ss []string) []string {
|
||||
m := make(map[string]struct{}, len(ss))
|
||||
us := make([]string, 0, len(ss))
|
||||
for _, v := range ss {
|
||||
v = strings.Trim(v, " ")
|
||||
if _, ok := m[v]; ok {
|
||||
continue
|
||||
}
|
||||
m[v] = struct{}{}
|
||||
us = append(us, v)
|
||||
}
|
||||
|
||||
return us
|
||||
}
|
||||
|
||||
func NiceDurationString(d time.Duration) string {
|
||||
switch {
|
||||
case d > 24*time.Hour:
|
||||
d = d.Round(time.Hour)
|
||||
case d > time.Hour:
|
||||
d = d.Round(time.Minute)
|
||||
case d > time.Minute:
|
||||
d = d.Round(time.Second)
|
||||
case d > time.Second:
|
||||
d = d.Round(time.Millisecond)
|
||||
case d > time.Millisecond:
|
||||
d = d.Round(time.Microsecond)
|
||||
}
|
||||
return d.String()
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
// Copyright (C) 2016 The Syncthing Authors.
|
||||
//
|
||||
// This Source Code Form is subject to the terms of the Mozilla Public
|
||||
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
|
||||
package stringutil
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestUniqueStrings(t *testing.T) {
|
||||
tests := []struct {
|
||||
input []string
|
||||
expected []string
|
||||
}{
|
||||
{
|
||||
[]string{"a", "b"},
|
||||
[]string{"a", "b"},
|
||||
},
|
||||
{
|
||||
[]string{"a", "a"},
|
||||
[]string{"a"},
|
||||
},
|
||||
{
|
||||
[]string{"a", "a", "a", "a"},
|
||||
[]string{"a"},
|
||||
},
|
||||
{
|
||||
nil,
|
||||
nil,
|
||||
},
|
||||
{
|
||||
[]string{" a ", " a ", "b ", " b"},
|
||||
[]string{"a", "b"},
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
result := UniqueTrimmedStrings(test.input)
|
||||
if len(result) != len(test.expected) {
|
||||
t.Errorf("%s != %s", result, test.expected)
|
||||
}
|
||||
for i := range result {
|
||||
if test.expected[i] != result[i] {
|
||||
t.Errorf("%s != %s", result, test.expected)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user