refactoring

Author: markus621

files.go renamed to fs/files.go

@@ -3,7 +3,7 @@
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
-package ioutils
+package fs
 
 import (
 	"io"
@@ -21,12 +21,18 @@ func CurrentDir() string {
 	return dir
 }
 
-func Exist(filename string) bool {
+func ParentFolder(filename string) string {
+	dir := filepath.Dir(filename)
+	tree := strings.Split(dir, string(os.PathSeparator))
+	return tree[len(tree)-1]
+}
+
+func FileExist(filename string) bool {
 	_, err := os.Stat(filename)
 	return err == nil
 }
 
-func Search(dir, filename string) ([]string, error) {
+func SearchFiles(dir, filename string) ([]string, error) {
 	files := make([]string, 0, 2)
 	err := filepath.Walk(dir, func(path string, info fs.FileInfo, err error) error {
 		if err != nil {
@@ -41,7 +47,7 @@ func Search(dir, filename string) ([]string, error) {
 	return files, err
 }
 
-func SearchByExt(dir, ext string) ([]string, error) {
+func SearchFilesByExt(dir, ext string) ([]string, error) {
 	files := make([]string, 0, 2)
 	err := filepath.Walk(dir, func(path string, info fs.FileInfo, err error) error {
 		if err != nil {
@@ -56,8 +62,8 @@ func SearchByExt(dir, ext string) ([]string, error) {
 	return files, err
 }
 
-func Rewrite(filename string, call func([]byte) ([]byte, error)) error {
-	if !Exist(filename) {
+func RewriteFile(filename string, call func([]byte) ([]byte, error)) error {
+	if !FileExist(filename) {
 		if err := os.WriteFile(filename, []byte(""), 0755); err != nil {
 			return err
 		}
@@ -72,7 +78,7 @@ func Rewrite(filename string, call func([]byte) ([]byte, error)) error {
 	return os.WriteFile(filename, b, 0755)
 }
 
-func Copy(dst, src string, mode os.FileMode) error {
+func CopyFile(dst, src string, mode os.FileMode) error {
 	source, err := os.OpenFile(src, os.O_RDONLY, 0)
 	if err != nil {
 		return err
@@ -96,9 +102,3 @@ func Copy(dst, src string, mode os.FileMode) error {
 	_, err = io.Copy(dist, source)
 	return err
 }
-
-func Folder(filename string) string {
-	dir := filepath.Dir(filename)
-	tree := strings.Split(dir, string(os.PathSeparator))
-	return tree[len(tree)-1]
-}

hash.go renamed to hash/hash.go

@@ -3,7 +3,7 @@
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
-package ioutils
+package hash
 
 import (
 	"encoding/hex"
@@ -15,7 +15,7 @@ import (
 	"go.osspkg.com/errors"
 )
 
-func IsValidFileHash(filename string, h hash.Hash, valid string) error {
+func ValidateFile(filename string, h hash.Hash, valid string) error {
 	r, err := os.Open(filename)
 	if err != nil {
 		return err
@@ -32,7 +32,7 @@ func IsValidFileHash(filename string, h hash.Hash, valid string) error {
 	return nil
 }
 
-func FileHash(filename string, h hash.Hash) (string, error) {
+func CreateFromFile(filename string, h hash.Hash) (string, error) {
 	r, err := os.Open(filename)
 	if err != nil {
 		return "", err

pool.go renamed to pool/pool.go

@@ -3,7 +3,7 @@
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
-package ioutils
+package pool
 
 import "sync"
 
@@ -16,7 +16,7 @@ type Pool[T TPool] struct {
 	pool    sync.Pool
 }
 
-func NewPool[T TPool](callNew func() T) *Pool[T] {
+func New[T TPool](callNew func() T) *Pool[T] {
 	return &Pool[T]{
 		pool: sync.Pool{New: func() any { return callNew() }},
 	}
@@ -42,9 +42,3 @@ type SlicePool[T any] struct {
 func (v *SlicePool[T]) Reset() {
 	v.B = v.B[:0]
 }
-
-func NewSlicePool[T any](l, c int) *Pool[*SlicePool[T]] {
-	return NewPool(func() *SlicePool[T] {
-		return &SlicePool[T]{B: make([]T, l, c)}
-	})
-}

pool_test.go renamed to pool/pool_test.go

@@ -3,7 +3,7 @@
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
-package ioutils
+package pool
 
 import (
 	"testing"

pool/slice.go

@@ -0,0 +1,7 @@
+package pool
+
+func NewSlicePool[T any](l, c int) *Pool[*SlicePool[T]] {
+	return New(func() *SlicePool[T] {
+		return &SlicePool[T]{B: make([]T, l, c)}
+	})
+}