diff options
| -rw-r--r-- | bufferpool/bufpool.go | 3 | ||||
| -rw-r--r-- | commands/convert.go | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/bufferpool/bufpool.go b/bufferpool/bufpool.go index 0b7829b2c..5a550e0e7 100644 --- a/bufferpool/bufpool.go +++ b/bufferpool/bufpool.go @@ -24,10 +24,13 @@ var bufferPool = &sync.Pool{ }, } +// GetBuffer returns a buffer from the pool. func GetBuffer() (buf *bytes.Buffer) { return bufferPool.Get().(*bytes.Buffer) } +// PutBuffer returns a buffer to the pool. +// The buffer is reset before it is put back into circulation. func PutBuffer(buf *bytes.Buffer) { buf.Reset() bufferPool.Put(buf) diff --git a/commands/convert.go b/commands/convert.go index ec6e2e551..6268fb2a2 100644 --- a/commands/convert.go +++ b/commands/convert.go @@ -27,8 +27,8 @@ import ( "github.com/spf13/viper" ) -var OutputDir string -var Unsafe bool +var outputDir string +var unsafe bool var convertCmd = &cobra.Command{ Use: "convert", @@ -80,8 +80,8 @@ func init() { convertCmd.AddCommand(toJSONCmd) convertCmd.AddCommand(toTOMLCmd) convertCmd.AddCommand(toYAMLCmd) - convertCmd.PersistentFlags().StringVarP(&OutputDir, "output", "o", "", "filesystem path to write files to") - convertCmd.PersistentFlags().BoolVar(&Unsafe, "unsafe", false, "enable less safe operations, please backup first") + convertCmd.PersistentFlags().StringVarP(&outputDir, "output", "o", "", "filesystem path to write files to") + convertCmd.PersistentFlags().BoolVar(&unsafe, "unsafe", false, "enable less safe operations, please backup first") } func convertContents(mark rune) (err error) { @@ -134,10 +134,10 @@ func convertContents(mark rune) (err error) { page.SetSourceContent(psr.Content()) page.SetSourceMetaData(metadata, mark) - if OutputDir != "" { - page.SaveSourceAs(filepath.Join(OutputDir, page.FullFilePath())) + if outputDir != "" { + page.SaveSourceAs(filepath.Join(outputDir, page.FullFilePath())) } else { - if Unsafe { + if unsafe { page.SaveSource() } else { jww.FEEDBACK.Println("Unsafe operation not allowed, use --unsafe or set a different output path") |