Rooba
/
stash
mirror of https://github.com/stashapp/stash.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix xpath comment element parsing (#759)

This commit is contained in:
WithoutPants 2020-08-23 17:39:15 +10:00 committed by GitHub
parent 165a0d4398
commit 9a84726128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/scraper/xpath.go
View File

@ -189,8 +189,9 @@ func (q *xpathQuery) nodeText(n *html.Node) string {
var ret string
if n != nil && n.Type == html.CommentNode {
ret = htmlquery.OutputHTML(n, true)
} else {
ret = htmlquery.InnerText(n)
}
ret = htmlquery.InnerText(n)
// trim all leading and trailing whitespace
ret = strings.TrimSpace(ret)

11
pkg/scraper/xpath_test.go
View File

@ -138,7 +138,7 @@ const htmlDoc1 = `
<b>Piercings:</b>
</td>
<td class="paramvalue">
None&nbsp;
<!-- None -->;
</td>
</tr>
<tr>
@ -193,7 +193,7 @@ func makeXPathConfig() mappedPerformerScraperConfig {
config.mappedConfig["Measurements"] = makeSimpleAttrConfig(makeCommonXPath("Measurements:"))
config.mappedConfig["FakeTits"] = makeSimpleAttrConfig(makeCommonXPath("Fake boobs:"))
config.mappedConfig["Tattoos"] = makeSimpleAttrConfig(makeCommonXPath("Tattoos:"))
config.mappedConfig["Piercings"] = makeSimpleAttrConfig(makeCommonXPath("Piercings:"))
config.mappedConfig["Piercings"] = makeSimpleAttrConfig(makeCommonXPath("Piercings:") + "/comment()")
// special handling for birthdate
birthdateAttrConfig := makeSimpleAttrConfig(makeCommonXPath("Date of Birth:"))
@ -295,7 +295,8 @@ func TestScrapePerformerXPath(t *testing.T) {
const measurements = "34C-26-36"
const fakeTits = "No"
const careerLength = "2012 - 2019"
const tattoosPiercings = "None"
const tattoos = "None"
const piercings = "<!-- None -->"
const gender = "Female"
const height = "170"
@ -313,8 +314,8 @@ func TestScrapePerformerXPath(t *testing.T) {
verifyField(t, careerLength, performer.CareerLength, "CareerLength")
verifyField(t, tattoosPiercings, performer.Tattoos, "Tattoos")
verifyField(t, tattoosPiercings, performer.Piercings, "Piercings")
verifyField(t, tattoos, performer.Tattoos, "Tattoos")
verifyField(t, piercings, performer.Piercings, "Piercings")
verifyField(t, height, performer.Height, "Height")
}