diff options
| author | Eng Zer Jun <engzerjun@gmail.com> | 2022-06-12 00:19:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-12 00:19:12 +0800 |
| commit | 6bcf5e4ede160af2ad04f5e69636211a5ced132d (patch) | |
| tree | 836568f4c83f24d87acbd26f172f967c7a6a1118 /picture.go | |
| parent | f5d3d59d8c65d9396893ae0156fef21592f6f425 (diff) | |
refactor: replace strings.Replace with strings.ReplaceAll (#1250)
strings.ReplaceAll(s, old, new) is a wrapper function for
strings.Replace(s, old, new, -1). But strings.ReplaceAll is more
readable and removes the hardcoded -1.
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Diffstat (limited to 'picture.go')
| -rw-r--r-- | picture.go | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -508,12 +508,12 @@ func (f *File) GetPicture(sheet, cell string) (string, []byte, error) { return "", nil, err } target := f.getSheetRelationshipsTargetByID(sheet, ws.Drawing.RID) - drawingXML := strings.Replace(target, "..", "xl", -1) + drawingXML := strings.ReplaceAll(target, "..", "xl") if _, ok := f.Pkg.Load(drawingXML); !ok { return "", nil, err } - drawingRelationships := strings.Replace( - strings.Replace(target, "../drawings", "xl/drawings/_rels", -1), ".xml", ".xml.rels", -1) + drawingRelationships := strings.ReplaceAll( + strings.ReplaceAll(target, "../drawings", "xl/drawings/_rels"), ".xml", ".xml.rels") return f.getPicture(row, col, drawingXML, drawingRelationships) } @@ -535,7 +535,7 @@ func (f *File) DeletePicture(sheet, cell string) (err error) { if ws.Drawing == nil { return } - drawingXML := strings.Replace(f.getSheetRelationshipsTargetByID(sheet, ws.Drawing.RID), "..", "xl", -1) + drawingXML := strings.ReplaceAll(f.getSheetRelationshipsTargetByID(sheet, ws.Drawing.RID), "..", "xl") return f.deleteDrawing(col, row, drawingXML, "Pic") } @@ -573,7 +573,7 @@ func (f *File) getPicture(row, col int, drawingXML, drawingRelationships string) drawRel = f.getDrawingRelationships(drawingRelationships, deTwoCellAnchor.Pic.BlipFill.Blip.Embed) if _, ok = supportedImageTypes[filepath.Ext(drawRel.Target)]; ok { ret = filepath.Base(drawRel.Target) - if buffer, _ := f.Pkg.Load(strings.Replace(drawRel.Target, "..", "xl", -1)); buffer != nil { + if buffer, _ := f.Pkg.Load(strings.ReplaceAll(drawRel.Target, "..", "xl")); buffer != nil { buf = buffer.([]byte) } return @@ -602,7 +602,7 @@ func (f *File) getPictureFromWsDr(row, col int, drawingRelationships string, wsD anchor.Pic.BlipFill.Blip.Embed); drawRel != nil { if _, ok = supportedImageTypes[filepath.Ext(drawRel.Target)]; ok { ret = filepath.Base(drawRel.Target) - if buffer, _ := f.Pkg.Load(strings.Replace(drawRel.Target, "..", "xl", -1)); buffer != nil { + if buffer, _ := f.Pkg.Load(strings.ReplaceAll(drawRel.Target, "..", "xl")); buffer != nil { buf = buffer.([]byte) } return |