Ailur-Archives
/
captcha
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #7

This commit is contained in:
Weilin Shi 2022-06-27 13:00:35 +08:00
parent 20014aab1b
commit f6fd454518
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
captcha.go
View File

@ -136,11 +136,7 @@ func New(width int, height int, option ...SetOption) (*Data, error) {
text := randomText(options) text := randomText(options)
img := image.NewNRGBA(image.Rect(0, 0, width, height)) img := image.NewNRGBA(image.Rect(0, 0, width, height))
draw.Draw(img, img.Bounds(), &image.Uniform{options.BackgroundColor}, image.Point{}, draw.Src) if err := drawWithOption(text, img, options); err != nil {
drawNoise(img, options)
drawCurves(img, options)
err := drawText(text, img, options)
if err != nil {
return nil, err return nil, err
} }
@ -157,11 +153,7 @@ func NewMathExpr(width int, height int, option ...SetOption) (*Data, error) {
text, equation := randomEquation() text, equation := randomEquation()
img := image.NewNRGBA(image.Rect(0, 0, width, height)) img := image.NewNRGBA(image.Rect(0, 0, width, height))
draw.Draw(img, img.Bounds(), &image.Uniform{options.BackgroundColor}, image.Point{}, draw.Src) if err := drawWithOption(equation, img, options); err != nil {
drawNoise(img, options)
drawCurves(img, options)
err := drawText(equation, img, options)
if err != nil {
return nil, err return nil, err
} }
@ -179,17 +171,20 @@ func NewCustomGenerator(
answer, question := generator() answer, question := generator()
img := image.NewNRGBA(image.Rect(0, 0, width, height)) img := image.NewNRGBA(image.Rect(0, 0, width, height))
draw.Draw(img, img.Bounds(), &image.Uniform{options.BackgroundColor}, image.Point{}, draw.Src) if err := drawWithOption(question, img, options); err != nil {
drawNoise(img, options)
drawCurves(img, options)
err := drawText(question, img, options)
if err != nil {
return nil, err return nil, err
} }
return &Data{Text: answer, img: img}, nil return &Data{Text: answer, img: img}, nil
} }
func drawWithOption(text string, img *image.NRGBA, options *Options) error {
draw.Draw(img, img.Bounds(), &image.Uniform{options.BackgroundColor}, image.Point{}, draw.Src)
drawNoise(img, options)
drawCurves(img, options)
return drawText(text, img, options)
}
func randomText(opts *Options) (text string) { func randomText(opts *Options) (text string) {
n := len(opts.CharPreset) n := len(opts.CharPreset)
for i := 0; i < opts.TextLength; i++ { for i := 0; i < opts.TextLength; i++ {

13
captcha_test.go
View File

@ -69,6 +69,12 @@ func TestNewCaptchaOptions(t *testing.T) {
NewMathExpr(100, 34, func(options *Options) { NewMathExpr(100, 34, func(options *Options) {
options.BackgroundColor = color.Black options.BackgroundColor = color.Black
}) })
NewCustomGenerator(100, 34, func() (anwser string, question string) {
return "4", "2x2?"
}, func(o *Options) {
o.BackgroundColor = color.Black
})
} }
func TestNewMathExpr(t *testing.T) { func TestNewMathExpr(t *testing.T) {
@ -101,6 +107,13 @@ func TestNilFontError(t *testing.T) {
t.Fatal("Expect to get nil font error") t.Fatal("Expect to get nil font error")
} }
_, err = NewCustomGenerator(150, 50, func() (anwser string, question string) {
return "1", "2"
})
if err == nil {
t.Fatal("Expect to get nil font error")
}
ttfFont = temp ttfFont = temp
} }