diff options
author | Max Magorsch <arzano@gentoo.org> | 2020-06-10 18:04:53 +0200 |
---|---|---|
committer | Max Magorsch <arzano@gentoo.org> | 2020-06-10 18:04:53 +0200 |
commit | bb584471018b5f5d66198d0d23f3320e9c86e097 (patch) | |
tree | 0a209fec7942ba5264f7b395da069b6b0690105e | |
parent | Run the go tests using gitlab ci (diff) | |
download | soko-bb584471018b5f5d66198d0d23f3320e9c86e097.tar.gz soko-bb584471018b5f5d66198d0d23f3320e9c86e097.tar.bz2 soko-bb584471018b5f5d66198d0d23f3320e9c86e097.zip |
Run go fmt for the whole project
Signed-off-by: Max Magorsch <arzano@gentoo.org>
-rw-r--r-- | pkg/api/graphql/graphiql/graphiql.go | 4 | ||||
-rw-r--r-- | pkg/models/package.go | 6 | ||||
-rw-r--r-- | pkg/models/version.go | 10 | ||||
-rw-r--r-- | pkg/portage/repository/mask.go | 12 |
4 files changed, 16 insertions, 16 deletions
diff --git a/pkg/api/graphql/graphiql/graphiql.go b/pkg/api/graphql/graphiql/graphiql.go index 16e930a..afc58df 100644 --- a/pkg/api/graphql/graphiql/graphiql.go +++ b/pkg/api/graphql/graphiql/graphiql.go @@ -10,8 +10,8 @@ func Show(w http.ResponseWriter, r *http.Request) { w.Header().Add("Content-Type", "text/html") templates := template.Must( - template.New("graphiql"). - ParseGlob("web/templates/api/explore/*.tmpl")) + template.New("graphiql"). + ParseGlob("web/templates/api/explore/*.tmpl")) templates.ExecuteTemplate(w, "graphiql.tmpl", template.URL(config.GraphiqlEndpoint())) } diff --git a/pkg/models/package.go b/pkg/models/package.go index bb916e3..5c34aad 100644 --- a/pkg/models/package.go +++ b/pkg/models/package.go @@ -9,9 +9,9 @@ type Package struct { Versions []*Version `pg:",fk:atom"` Longdescription string Maintainers []*Maintainer - Commits []*Commit `pg:"many2many:commit_to_packages,joinFK:commit_id"` - PrecedingCommits int `pg:",use_zero"` - PkgCheckResults []*PkgCheckResult `pg:",fk:atom"` + Commits []*Commit `pg:"many2many:commit_to_packages,joinFK:commit_id"` + PrecedingCommits int `pg:",use_zero"` + PkgCheckResults []*PkgCheckResult `pg:",fk:atom"` Outdated []*OutdatedPackages `pg:",fk:atom"` } diff --git a/pkg/models/version.go b/pkg/models/version.go index 0a5c625..d3cb4e0 100644 --- a/pkg/models/version.go +++ b/pkg/models/version.go @@ -40,9 +40,9 @@ func (v *Version) GreaterThan(other Version) bool { // compare the numeric part numericPartsA := strings.Split(versionIdentifierA.NumericPart, ".") numericPartsB := strings.Split(versionIdentifierB.NumericPart, ".") - if numberGreaterThan(numericPartsA[0],numericPartsB[0]){ + if numberGreaterThan(numericPartsA[0], numericPartsB[0]) { return true - }else if numberGreaterThan(numericPartsB[0],numericPartsA[0]){ + } else if numberGreaterThan(numericPartsB[0], numericPartsA[0]) { return false } for i := 1; i < min(len(numericPartsA), len(numericPartsB)); i++ { @@ -59,12 +59,12 @@ func (v *Version) GreaterThan(other Version) bool { if numberGreaterThan(numericPartsA[i], numericPartsB[i]) { return true - } else if numberGreaterThan(numericPartsB[i], numericPartsA[i]) { + } else if numberGreaterThan(numericPartsB[i], numericPartsA[i]) { return false } } } - if len(numericPartsA) > len(numericPartsB){ + if len(numericPartsA) > len(numericPartsB) { return true } else if len(numericPartsA) < len(numericPartsB) { return false @@ -89,7 +89,7 @@ func (v *Version) GreaterThan(other Version) bool { } else { return false } - }else if len(versionIdentifierA.Suffixes) < len(versionIdentifierB.Suffixes) { + } else if len(versionIdentifierA.Suffixes) < len(versionIdentifierB.Suffixes) { if versionIdentifierB.Suffixes[len(versionIdentifierA.Suffixes)].Name == "p" { return false } else { diff --git a/pkg/portage/repository/mask.go b/pkg/portage/repository/mask.go index a722d54..beaef38 100644 --- a/pkg/portage/repository/mask.go +++ b/pkg/portage/repository/mask.go @@ -211,20 +211,20 @@ func comparedVersions(operator string, versionSpecifier string, packageAtom stri Select() for _, v := range versions { - givenVersion := models.Version{ Version: versionSpecifier } + givenVersion := models.Version{Version: versionSpecifier} if operator == ">" { - if v.GreaterThan(givenVersion){ + if v.GreaterThan(givenVersion) { results = append(results, v) } - }else if operator == ">=" { + } else if operator == ">=" { if v.GreaterThan(givenVersion) == v.EqualTo(givenVersion) { results = append(results, v) } - }else if operator == "<" { - if (&givenVersion).SmallerThan(*v){ + } else if operator == "<" { + if (&givenVersion).SmallerThan(*v) { results = append(results, v) } - }else if operator == "<=" { + } else if operator == "<=" { if (&givenVersion).SmallerThan(*v) || (&givenVersion).EqualTo(*v) { results = append(results, v) } |