Skip to content

fix: character-death parsing when only being assisted #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 3, 2025
Merged

fix: character-death parsing when only being assisted #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb34e81
test: add deaths with assist only
tobiasehlert Mar 3, 2025
5c01ec1
fix: omit level if int is 0
tobiasehlert Mar 3, 2025
788b11e
fix: update ReplaceAll with double space to single
tobiasehlert Mar 3, 2025
bd74ce2
test: fix test-case with missing Killers
tobiasehlert Mar 3, 2025
07c1a86
chore: fix assisted death-parsing logic
tobiasehlert Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
232 changes: 128 additions & 104 deletions src/TibiaCharactersCharacter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ type Killers struct {

// Child of Character
type Deaths struct {
Time string `json:"time"` // The timestamp when the death occurred.
Level int `json:"level"` // The level when the death occurred.
Killers []Killers `json:"killers"` // List of killers involved.
Assists []Killers `json:"assists"` // List of assists involved.
Reason string `json:"reason"` // The plain text reason of death.
Time string `json:"time"` // The timestamp when the death occurred.
Level int `json:"level,omitempty"` // The level when the death occurred.
Killers []Killers `json:"killers"` // List of killers involved.
Assists []Killers `json:"assists"` // List of assists involved.
Reason string `json:"reason"` // The plain text reason of death.
}

// Child of Character
Expand Down Expand Up @@ -383,9 +383,9 @@ func TibiaCharactersCharacterImpl(BoxContentHTML string, url string) (CharacterR
return false
}

// Removing line breaks
// Removing line breaks and sanitizing string
CharacterListHTML = TibiaDataHTMLRemoveLinebreaks(CharacterListHTML)
CharacterListHTML = strings.ReplaceAll(CharacterListHTML, ".<br/>Assisted by", ". Assisted by")
CharacterListHTML = strings.ReplaceAll(strings.ReplaceAll(CharacterListHTML, "<br/>", " "), " ", " ")
CharacterListHTML = TibiaDataSanitizeStrings(CharacterListHTML)

dataNoTags := RemoveHtmlTag(CharacterListHTML)
Expand All @@ -404,6 +404,7 @@ func TibiaCharactersCharacterImpl(BoxContentHTML string, url string) (CharacterR
initCestIndexer = `CEST`
levelIndexer = `at Level `
killersIndexer = `by `
assistedIndexer = `Assisted by `
)

var initIndexer string
Expand Down Expand Up @@ -444,6 +445,11 @@ func TibiaCharactersCharacterImpl(BoxContentHTML string, url string) (CharacterR

level := TibiaDataStringToInteger(dataNoTags[levelIdx:endLevelIdx])

// if kill is with assist only (and level is set to 25), then we reset level
if reasonStart == assistedIndexer && level == 25 {
level = 0
}

killersIdx := strings.Index(
CharacterListHTML, killersIndexer,
) + len(killersIndexer)
Expand All @@ -453,10 +459,17 @@ func TibiaCharactersCharacterImpl(BoxContentHTML string, url string) (CharacterR

rawListofKillers := CharacterListHTML[killersIdx:endKillersIdx]

// if kill is with assist..
if strings.Contains(dataNoTags, ". Assisted by ") {
TmpListOfDeath := strings.Split(CharacterListHTML, ". Assisted by ")
rawListofKillers = TmpListOfDeath[0][killersIdx:]
// A death with assist (or with assist only)
if strings.Contains(dataNoTags, assistedIndexer) {
TmpListOfDeath := strings.Split(CharacterListHTML, assistedIndexer)

// get a list of killers
if reasonStart != assistedIndexer {
rawListofKillers = TmpListOfDeath[0][killersIdx:]
rawListofKillers = strings.TrimSpace(strings.TrimSuffix(rawListofKillers, "."))
} else {
rawListofKillers = ""
}
TmpAssist := TmpListOfDeath[1]

// get a list of killers
Expand All @@ -473,120 +486,128 @@ func TibiaCharactersCharacterImpl(BoxContentHTML string, url string) (CharacterR

for i := range ListOfAssists {
name, isPlayer, isTraded, theSummon := TibiaDataParseKiller(ListOfAssists[i])
DeathAssists = append(DeathAssists, Killers{
Name: strings.TrimSuffix(strings.TrimSuffix(name, ".</td>"), "."),
Player: isPlayer,
Traded: isTraded,
Summon: theSummon,
})
if name != "" { // Ensure we don't append empty names
DeathAssists = append(DeathAssists, Killers{
Name: name,
Player: isPlayer,
Traded: isTraded,
Summon: theSummon,
})
}
}
}

// get a list of killers
ListOfKillers := strings.Split(rawListofKillers, ", ")
// A death with killers
if rawListofKillers != "" {

const andStr = " and "
lastItem := ListOfKillers[len(ListOfKillers)-1]
lastAndIdx := strings.LastIndex(lastItem, andStr)
// get a list of killers
ListOfKillers := strings.Split(rawListofKillers, ", ")

if lastAndIdx > -1 {
if !strings.Contains(lastItem, "<a href=") {
ListOfKillers[len(ListOfKillers)-1] = lastItem[:lastAndIdx]
ListOfKillers = append(ListOfKillers, lastItem[lastAndIdx+len(andStr):])
} else {
ListOfKillers = ListOfKillers[:len(ListOfKillers)-1]

const (
nonTag = iota // outside of a tag
openAnchorTag // inside a <a>
closeAchorTag // inside a </a>
)

var (
buffer bytes.Buffer
state = nonTag
)
buffer.Grow(200) // arbitrary number to avoid allocations

for i := range lastItem {
cur := lastItem[i]
switch state {
case nonTag:
if cur == '<' {
switch lastItem[i+1] {
case '/':
state = closeAchorTag
default:
state = openAnchorTag
if buffer.Len() > 0 {
str := buffer.String()

str = strings.TrimPrefix(str, " and ")
str = strings.TrimSuffix(str, " and ")

if str == "" {
buffer.Reset()
buffer.WriteByte(cur)
continue
}
const andStr = " and "
lastItem := ListOfKillers[len(ListOfKillers)-1]
lastAndIdx := strings.LastIndex(lastItem, andStr)

if strings.Contains(str, "of") && !containsCreaturesWithOf(str) {
// this is a summon
buffer.WriteByte(cur)
continue
}
if lastAndIdx > -1 {
if !strings.Contains(lastItem, "<a href=") {
ListOfKillers[len(ListOfKillers)-1] = lastItem[:lastAndIdx]
ListOfKillers = append(ListOfKillers, lastItem[lastAndIdx+len(andStr):])
} else {
ListOfKillers = ListOfKillers[:len(ListOfKillers)-1]

const (
nonTag = iota // outside of a tag
openAnchorTag // inside a <a>
closeAchorTag // inside a </a>
)

var (
buffer bytes.Buffer
state = nonTag
)
buffer.Grow(200) // arbitrary number to avoid allocations

for i := range lastItem {
cur := lastItem[i]
switch state {
case nonTag:
if cur == '<' {
switch lastItem[i+1] {
case '/':
state = closeAchorTag
default:
state = openAnchorTag
if buffer.Len() > 0 {
str := buffer.String()

str = strings.TrimPrefix(str, " and ")
str = strings.TrimSuffix(str, " and ")

if str == "" {
buffer.Reset()
buffer.WriteByte(cur)
continue
}

if strings.Contains(str, "of") && !containsCreaturesWithOf(str) {
// this is a summon
buffer.WriteByte(cur)
continue
}

buffer.Reset()
ListOfKillers = append(ListOfKillers, str)
buffer.Reset()
ListOfKillers = append(ListOfKillers, str)
}
}
}
buffer.WriteByte(cur)
case openAnchorTag:
if cur == '>' {
state = nonTag
}
buffer.WriteByte(cur)
case closeAchorTag:
buffer.WriteByte(cur)
if cur == '>' {
str := buffer.String()

str = strings.TrimPrefix(str, " and ")
str = strings.TrimSuffix(str, " and ")

ListOfKillers = append(ListOfKillers, str)
buffer.Reset()
state = nonTag
}
}
buffer.WriteByte(cur)
case openAnchorTag:
if cur == '>' {
state = nonTag
}
buffer.WriteByte(cur)
case closeAchorTag:
buffer.WriteByte(cur)
if cur == '>' {
str := buffer.String()
}

if buffer.Len() > 0 {
str := buffer.String()
buffer.Reset()

str = strings.TrimPrefix(str, " and ")
str = strings.TrimSuffix(str, " and ")
str = strings.TrimPrefix(str, " and ")
str = strings.TrimSuffix(str, " and ")

if str != "" {
ListOfKillers = append(ListOfKillers, str)
buffer.Reset()
state = nonTag
}
}
}
}

if buffer.Len() > 0 {
str := buffer.String()
buffer.Reset()

str = strings.TrimPrefix(str, " and ")
str = strings.TrimSuffix(str, " and ")

if str != "" {
ListOfKillers = append(ListOfKillers, str)
}
// loop through all killers and append to result
for i := range ListOfKillers {
name, isPlayer, isTraded, theSummon := TibiaDataParseKiller(ListOfKillers[i])
if name != "" { // Ensure we don't append empty names
DeathKillers = append(DeathKillers, Killers{
Name: name,
Player: isPlayer,
Traded: isTraded,
Summon: theSummon,
})
}
}
}

// loop through all killers and append to result
for i := range ListOfKillers {
name, isPlayer, isTraded, theSummon := TibiaDataParseKiller(ListOfKillers[i])
DeathKillers = append(DeathKillers, Killers{
Name: strings.TrimSuffix(strings.TrimSuffix(name, ".</td>"), "."),
Player: isPlayer,
Traded: isTraded,
Summon: theSummon,
})
}

// append deadentry to death list
DeathsData = append(DeathsData, Deaths{
Time: time,
Expand Down Expand Up @@ -756,6 +777,9 @@ func TibiaDataParseKiller(data string) (string, bool, bool, string) {
data = RemoveHtmlTag(data)
}

// remove htlm, spaces and dots from data-string
data = strings.TrimSpace(strings.TrimSuffix(strings.TrimSuffix(data, "</td>"), "."))

// get summon information
if strings.HasPrefix(data, "a ") || strings.HasPrefix(data, "an ") {
if containsCreaturesWithOf(data) {
Expand Down
Loading