Skip to content

Commit

Permalink
Add benchmark for adding images to sheet (#367)
Browse files Browse the repository at this point in the history
* Add benchmark for adding images to sheet

This should help track performance regressions in future changes.

* Only transform sheet name if necessary
  • Loading branch information
mlh758 authored and xuri committed Mar 23, 2019
1 parent 677a22d commit 2874d75
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
~$*.xlsx
test/Test*.xlsx
*.out
test/image3.png
*.test
20 changes: 20 additions & 0 deletions picture_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package excelize

import (
"fmt"
_ "image/png"
"io/ioutil"
"testing"
)

func BenchmarkAddPictureFromBytes(b *testing.B) {
f := NewFile()
imgFile, err := ioutil.ReadFile("logo.png")
if err != nil {
panic("unable to load image for benchmark")
}
b.ResetTimer()
for i := 1; i <= b.N; i++ {
f.AddPictureFromBytes("Sheet1", fmt.Sprint("A", i), "", "logo", ".png", imgFile)
}
}
24 changes: 13 additions & 11 deletions sheet.go
Original file line number Diff line number Diff line change
Expand Up @@ -778,18 +778,20 @@ func (f *File) UnprotectSheet(sheet string) {
// trimSheetName provides a function to trim invaild characters by given worksheet
// name.
func trimSheetName(name string) string {
var r []rune
for _, v := range name {
switch v {
case 58, 92, 47, 63, 42, 91, 93: // replace :\/?*[]
continue
default:
r = append(r, v)
if strings.ContainsAny(name, ":\\/?*[]") || utf8.RuneCountInString(name) > 31 {
r := make([]rune, 0, 31)
for _, v := range name {
switch v {
case 58, 92, 47, 63, 42, 91, 93: // replace :\/?*[]
continue
default:
r = append(r, v)
}
if len(r) == 31 {
break
}
}
}
name = string(r)
if utf8.RuneCountInString(name) > 31 {
name = string([]rune(name)[0:31])
name = string(r)
}
return name
}
Expand Down

0 comments on commit 2874d75

Please sign in to comment.