Skip to content

Commit

Permalink
Updated interface to match godestone v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@karashiiro
karashiiro committed Mar 13, 2021
1 parent ac12428 commit 8ce0376
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 37 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ go 1.15

require (
github.com/google/flatbuffers v1.12.0
github.com/xivapi/godestone/v2 v2.0.1
github.com/xivapi/godestone/v2 v2.1.0
)
3 changes: 3 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/jawher/mow.cli v1.1.0/go.mod h1:aNaQlc7ozF3vw6IJ2dHjp2ZFiA4ozMIYY6PyuRJwlUg=
github.com/karashiiro/bingode v1.0.0/go.mod h1:s+E5/RJnC5ZdFPUZjMgW5h1RByGfOwoCLgE1QYZSG6g=
github.com/karashiiro/bingode v1.0.1/go.mod h1:lzVTRMIEwNzxD46MOfDskypTi+zBu9QGrklE4cG+tLo=
github.com/karashiiro/bingode v1.1.0/go.mod h1:KvajV1nOhqF6CZyJZzPk3m7Pmt+4loFSdjLrEc/cBXY=
github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
Expand All @@ -54,6 +55,8 @@ github.com/xivapi/godestone/v2 v2.0.0 h1:TMH5q2A8zARdDxkfqFxK5o+Z+9zKIoPTLBRb6bR
github.com/xivapi/godestone/v2 v2.0.0/go.mod h1:U2V2b1c1+NjYbUvy7AwCyJWSaGDJ0U1fJFtxolgWTws=
github.com/xivapi/godestone/v2 v2.0.1 h1:Hinj5TrUDT9u391oiBE7tGqSswGwNdcXh8pcVm3Ifh4=
github.com/xivapi/godestone/v2 v2.0.1/go.mod h1:U2V2b1c1+NjYbUvy7AwCyJWSaGDJ0U1fJFtxolgWTws=
github.com/xivapi/godestone/v2 v2.1.0 h1:gu4oU8lRU4KTLDalKiRKqWLdEzSB+aT0eMyZUQe6gbk=
github.com/xivapi/godestone/v2 v2.1.0/go.mod h1:E8C4D6nzrajxyc44SPC6dRc2ko4JQvC3qHHDc0ol//I=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand Down
75 changes: 39 additions & 36 deletions provider.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package bingode

import (
"errors"
"strings"

"github.com/karashiiro/bingode/internal/pack/exports"
Expand All @@ -9,6 +10,8 @@ import (
"github.com/xivapi/godestone/v2/provider/models"
)

const notFound = "no entity matching the criteria was found"

type bingodeProvider struct {
achievementTable *exports.AchievementTable
classJobTable *exports.ClassJobTable
Expand Down Expand Up @@ -147,7 +150,7 @@ func (b *bingodeProvider) getTribeTable() *exports.TribeTable {
return b.tribeTable
}

func (b *bingodeProvider) Achievement(name string) *models.NamedEntity {
func (b *bingodeProvider) Achievement(name string) (*models.NamedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getAchievementTable().AchievementsLength()
Expand Down Expand Up @@ -175,14 +178,14 @@ func (b *bingodeProvider) Achievement(name string) *models.NamedEntity {
NameDE: nameDe,
NameFR: nameFr,
NameJA: nameJa,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) ClassJob(name string) *models.NamedEntity {
func (b *bingodeProvider) ClassJob(name string) (*models.NamedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getClassJobTable().ClassJobsLength()
Expand Down Expand Up @@ -210,14 +213,14 @@ func (b *bingodeProvider) ClassJob(name string) *models.NamedEntity {
NameDE: nameDe,
NameFR: nameFr,
NameJA: nameJa,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) Deity(name string) *models.NamedEntity {
func (b *bingodeProvider) Deity(name string) (*models.NamedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getDeityTable().DeitiesLength()
Expand Down Expand Up @@ -245,14 +248,14 @@ func (b *bingodeProvider) Deity(name string) *models.NamedEntity {
NameDE: nameDe,
NameFR: nameFr,
NameJA: nameJa,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) GrandCompany(name string) *models.NamedEntity {
func (b *bingodeProvider) GrandCompany(name string) (*models.NamedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getGrandCompanyTable().GrandCompaniesLength()
Expand Down Expand Up @@ -280,14 +283,14 @@ func (b *bingodeProvider) GrandCompany(name string) *models.NamedEntity {
NameDE: nameDe,
NameFR: nameFr,
NameJA: nameJa,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) Item(name string) *models.NamedEntity {
func (b *bingodeProvider) Item(name string) (*models.NamedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getItemTable().ItemsLength()
Expand Down Expand Up @@ -315,14 +318,14 @@ func (b *bingodeProvider) Item(name string) *models.NamedEntity {
NameDE: nameDe,
NameFR: nameFr,
NameJA: nameJa,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) Minion(name string) *models.NamedEntity {
func (b *bingodeProvider) Minion(name string) (*models.NamedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getMinionTable().MinionsLength()
Expand Down Expand Up @@ -350,14 +353,14 @@ func (b *bingodeProvider) Minion(name string) *models.NamedEntity {
NameDE: nameDe,
NameFR: nameFr,
NameJA: nameJa,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) Mount(name string) *models.NamedEntity {
func (b *bingodeProvider) Mount(name string) (*models.NamedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getMountTable().MountsLength()
Expand Down Expand Up @@ -385,14 +388,14 @@ func (b *bingodeProvider) Mount(name string) *models.NamedEntity {
NameDE: nameDe,
NameFR: nameFr,
NameJA: nameJa,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) Race(name string) *models.GenderedEntity {
func (b *bingodeProvider) Race(name string) (*models.GenderedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getRaceTable().RacesLength()
Expand Down Expand Up @@ -432,14 +435,14 @@ func (b *bingodeProvider) Race(name string) *models.GenderedEntity {
NameFeminineJA: nameFeminineJa,
NameFeminineDE: nameFeminineDe,
NameFeminineFR: nameFeminineFr,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) Reputation(name string) *models.NamedEntity {
func (b *bingodeProvider) Reputation(name string) (*models.NamedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getReputationTable().ReputationsLength()
Expand Down Expand Up @@ -467,14 +470,14 @@ func (b *bingodeProvider) Reputation(name string) *models.NamedEntity {
NameDE: nameDe,
NameFR: nameFr,
NameJA: nameJa,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) Title(name string) *models.TitleInternal {
func (b *bingodeProvider) Title(name string) (*models.TitleInternal, error) {
nameLower := strings.ToLower(name)

nLength := b.getTitleTable().TitlesLength()
Expand Down Expand Up @@ -519,14 +522,14 @@ func (b *bingodeProvider) Title(name string) *models.TitleInternal {
return &models.TitleInternal{
GenderedEntity: ge,
Prefix: o.IsPrefix(),
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) Town(name string) *models.NamedEntity {
func (b *bingodeProvider) Town(name string) (*models.NamedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getTownTable().TownsLength()
Expand Down Expand Up @@ -554,14 +557,14 @@ func (b *bingodeProvider) Town(name string) *models.NamedEntity {
NameDE: nameDe,
NameFR: nameFr,
NameJA: nameJa,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

func (b *bingodeProvider) Tribe(name string) *models.GenderedEntity {
func (b *bingodeProvider) Tribe(name string) (*models.GenderedEntity, error) {
nameLower := strings.ToLower(name)

nLength := b.getTribeTable().TribesLength()
Expand Down Expand Up @@ -601,9 +604,9 @@ func (b *bingodeProvider) Tribe(name string) *models.GenderedEntity {
NameFeminineJA: nameFeminineJa,
NameFeminineDE: nameFeminineDe,
NameFeminineFR: nameFeminineFr,
}
}, nil
}
}

return nil
return nil, errors.New(notFound)
}

0 comments on commit 8ce0376

Please sign in to comment.