Skip to content
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

Jump to bottom

⚡ Improve ctx.Is performance #657

Merged
merged 3 commits into from
Jul 21, 2020
Merged

⚡ Improve ctx.Is performance #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88b4da6
⚡Improve ctx.Is performance
ReneWerner87 Jul 21, 2020
aafa784
⚡Improve ctx.Is performance
ReneWerner87 Jul 21, 2020
1211b15
⚡Improve ctx.Is performance
ReneWerner87 Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions ctx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,12 +522,11 @@ func (ctx *Ctx) Is(extension string) bool {
if extensionHeader == "" {
return false
}
header := ctx.Get(HeaderContentType)
if factorSign := strings.IndexByte(header, ';'); factorSign != -1 {
header = header[:factorSign]
}

return utils.Trim(header, ' ') == extensionHeader
return strings.HasPrefix(
utils.TrimLeft(utils.GetString(ctx.Fasthttp.Request.Header.ContentType()), ' '),
extensionHeader,
)
}

// JSON converts any interface or string to JSON.
Expand Down
20 changes: 20 additions & 0 deletions ctx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,26 @@ func Test_Ctx_Is(t *testing.T) {
utils.AssertEqual(t, false, ctx.Is(".json"))
utils.AssertEqual(t, false, ctx.Is(""))
utils.AssertEqual(t, false, ctx.Is(".foooo"))

ctx.Fasthttp.Request.Header.Set(HeaderContentType, MIMEApplicationJSONCharsetUTF8)
utils.AssertEqual(t, false, ctx.Is("html"))
utils.AssertEqual(t, true, ctx.Is("json"))
utils.AssertEqual(t, true, ctx.Is(".json"))

ctx.Fasthttp.Request.Header.Set(HeaderContentType, " application/json;charset=UTF-8")
utils.AssertEqual(t, false, ctx.Is("html"))
utils.AssertEqual(t, true, ctx.Is("json"))
utils.AssertEqual(t, true, ctx.Is(".json"))

ctx.Fasthttp.Request.Header.Set(HeaderContentType, MIMEApplicationXMLCharsetUTF8)
utils.AssertEqual(t, false, ctx.Is("html"))
utils.AssertEqual(t, true, ctx.Is("xml"))
utils.AssertEqual(t, true, ctx.Is(".xml"))

ctx.Fasthttp.Request.Header.Set(HeaderContentType, MIMETextPlain)
utils.AssertEqual(t, false, ctx.Is("html"))
utils.AssertEqual(t, true, ctx.Is("txt"))
utils.AssertEqual(t, true, ctx.Is(".txt"))
}

// go test -v -run=^$ -bench=Benchmark_Ctx_Is -benchmem -count=4
Expand Down