refactor: Rename packages for clarityv0.3.0

12 files changed, 41 insertions, 41 deletions

diff --git a/cmd/gettext/gettext.go b/cmd/gettext/gettext.go
index b753da8..2dbd65e 100644
--- a/cmd/gettext/gettext.go
+++ b/cmd/gettext/gettext.go
@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/martinlehoux/kagamigo/core"
+	"github.com/martinlehoux/kagamigo/kcore"
 	"golang.org/x/exp/slog"
 	"gopkg.in/yaml.v3"
 )
@@ -98,14 +98,14 @@ func extractAllKeys() map[string]int {
 	err := filepath.Walk("templates", func(path string, info fs.FileInfo, err error) error {
 		if !info.IsDir() && filepath.Ext(path) == ".html" {
 			content, err := os.ReadFile(path) // #nosec G304
-			core.Expect(err, "error reading file")
+			kcore.Expect(err, "error reading file")
 			for key, value := range extractKeys(string(content)) {
 				extractedKeys[key] = value
 			}
 		}
 		return nil
 	})
-	core.Expect(err, "error walking templates directory")
+	kcore.Expect(err, "error walking templates directory")
 
 	return extractedKeys
 }
@@ -125,8 +125,8 @@ func main() {
 		newLocales := make(map[string]string, 0)
 
 		locales, err := os.ReadFile(filepath.Join("locales", lang, "index.yml")) // #nosec G304
-		core.Expect(err, "error reading file")
-		core.Expect(yaml.Unmarshal(locales, &currentLocales), "error unmarshalling yaml")
+		kcore.Expect(err, "error reading file")
+		kcore.Expect(yaml.Unmarshal(locales, &currentLocales), "error unmarshalling yaml")
 
 		correctLocales := 0
 		for key, translation := range currentLocales {
@@ -157,8 +157,8 @@ func main() {
 
 		if *write {
 			content, err := yaml.Marshal(newLocales)
-			core.Expect(err, "error marshalling yaml")
-			core.Expect(os.WriteFile(filepath.Join("locales", lang, "index.yml"), content, 0600), "error writing file")
+			kcore.Expect(err, "error marshalling yaml")
+			kcore.Expect(os.WriteFile(filepath.Join("locales", lang, "index.yml"), content, 0600), "error writing file")
 		}
 	}
 }
diff --git a/auth/config.go b/kauth/config.go
index 6a55839..777a22d 100644
--- a/auth/config.go
+++ b/kauth/config.go
@@ -1,11 +1,11 @@
-package auth
+package kauth
 
 import (
 	"encoding/hex"
 	"errors"
 	"os"
 
-	"github.com/martinlehoux/kagamigo/core"
+	"github.com/martinlehoux/kagamigo/kcore"
 	"golang.org/x/exp/slog"
 )
 
@@ -21,7 +21,7 @@ type AuthConfig struct {
 func LoadCookieSecret(cookieSecretString string) []byte {
 	cookiesSecret, err := hex.DecodeString(cookieSecretString)
 	if err != nil {
-		err = core.Wrap(err, "error decoding cookie secret")
+		err = kcore.Wrap(err, "error decoding cookie secret")
 		slog.Error(err.Error())
 		os.Exit(1)
 	}
diff --git a/auth/cookie.go b/kauth/cookie.go
index 61349fa..edc30b7 100644
--- a/auth/cookie.go
+++ b/kauth/cookie.go
@@ -1,14 +1,14 @@
-package auth
+package kauth
 
 import (
 	"fmt"
 	"net/http"
 	"time"
 
-	"github.com/martinlehoux/kagamigo/core"
+	"github.com/martinlehoux/kagamigo/kcore"
 )
 
-func CraftCookie(id core.ID, config AuthConfig) http.Cookie {
+func CraftCookie(id kcore.ID, config AuthConfig) http.Cookie {
 	expiresAt := time.Now().Add(24 * time.Hour)
 	cookieValue := encrypt(config.CookieSecret, fmt.Sprintf("%s:%d", id.String(), expiresAt.Unix()))
 	return http.Cookie{
diff --git a/auth/crypto.go b/kauth/crypto.go
index 254539f..702c9a7 100644
--- a/auth/crypto.go
+++ b/kauth/crypto.go
@@ -1,4 +1,4 @@
-package auth
+package kauth
 
 import (
 	"crypto/aes"
@@ -7,7 +7,7 @@ import (
 	"encoding/base64"
 	"errors"
 
-	"github.com/martinlehoux/kagamigo/core"
+	"github.com/martinlehoux/kagamigo/kcore"
 )
 
 var (
@@ -16,14 +16,14 @@ var (
 
 func encrypt(secret []byte, plainText string) string {
 	block, err := aes.NewCipher(secret)
-	core.Expect(err, "error creating AES cipher")
+	kcore.Expect(err, "error creating AES cipher")
 
 	aead, err := cipher.NewGCM(block)
-	core.Expect(err, "error creating AEAD")
+	kcore.Expect(err, "error creating AEAD")
 
 	nonce := make([]byte, aead.NonceSize())
 	_, err = rand.Read(nonce)
-	core.Expect(err, "error generating nonce")
+	kcore.Expect(err, "error generating nonce")
 
 	return base64.URLEncoding.EncodeToString(aead.Seal(nonce, nonce, []byte(plainText), nil))
 }
@@ -31,14 +31,14 @@ func encrypt(secret []byte, plainText string) string {
 func decrypt(secret []byte, encryptedText string) (string, error) {
 	encryptedBytes, err := base64.URLEncoding.DecodeString(encryptedText)
 	if err != nil {
-		err = core.Wrap(err, "error decoding base64")
+		err = kcore.Wrap(err, "error decoding base64")
 		return "", err
 	}
 	block, err := aes.NewCipher(secret)
-	core.Expect(err, "error creating AES cipher")
+	kcore.Expect(err, "error creating AES cipher")
 
 	aead, err := cipher.NewGCM(block)
-	core.Expect(err, "error creating AEAD")
+	kcore.Expect(err, "error creating AEAD")
 
 	nonceSize := aead.NonceSize()
 	if len(encryptedBytes) < nonceSize {
@@ -47,7 +47,7 @@ func decrypt(secret []byte, encryptedText string) (string, error) {
 	nonce, cipherText := encryptedBytes[:nonceSize], encryptedBytes[nonceSize:]
 	plainBytes, err := aead.Open(nil, nonce, cipherText, nil)
 	if err != nil {
-		err = core.Wrap(err, "error decrypting")
+		err = kcore.Wrap(err, "error decrypting")
 		return "", err
 	}
 	return string(plainBytes), nil
diff --git a/auth/middlewares.go b/kauth/middlewares.go
index 1534b16..23e9e71 100644
--- a/auth/middlewares.go
+++ b/kauth/middlewares.go
@@ -1,4 +1,4 @@
-package auth
+package kauth
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/martinlehoux/kagamigo/core"
+	"github.com/martinlehoux/kagamigo/kcore"
 	"golang.org/x/exp/slog"
 )
 
@@ -25,20 +25,20 @@ func UserFromContext[U any](ctx context.Context) (U, bool) {
 	return user, ok
 }
 
-func LoginFromContext[U core.WithLanguage](ctx context.Context) core.Login[U] {
+func LoginFromContext[U kcore.WithLanguage](ctx context.Context) kcore.Login[U] {
 	user, ok := UserFromContext[U](ctx)
-	return core.LoginFromUser(user, ok)
+	return kcore.LoginFromUser(user, ok)
 }
 
 func Unauthorized(w http.ResponseWriter, err error) {
 	w.WriteHeader(http.StatusUnauthorized)
 	if err != nil {
 		_, err = w.Write([]byte(err.Error()))
-		core.Expect(err, "error writing response")
+		kcore.Expect(err, "error writing response")
 	}
 }
 
-func CookieAuthMiddleware(loadUser func(context.Context, core.ID) (any, error), config AuthConfig) func(http.Handler) http.Handler {
+func CookieAuthMiddleware(loadUser func(context.Context, kcore.ID) (any, error), config AuthConfig) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
@@ -47,11 +47,11 @@ func CookieAuthMiddleware(loadUser func(context.Context, core.ID) (any, error),
 				next.ServeHTTP(w, r)
 				return
 			}
-			core.Expect(err, "error reading cookie")
+			kcore.Expect(err, "error reading cookie")
 
 			authentication, err := decrypt(config.CookieSecret, cookie.Value)
 			if err != nil {
-				err = core.Wrap(err, "error decrypting cookie")
+				err = kcore.Wrap(err, "error decrypting cookie")
 				slog.Warn(err.Error())
 				http.Error(w, err.Error(), http.StatusBadRequest)
 				return
@@ -62,16 +62,16 @@ func CookieAuthMiddleware(loadUser func(context.Context, core.ID) (any, error),
 				http.Error(w, ErrBadCookie.Error(), http.StatusBadRequest)
 				return
 			}
-			userId, err := core.ParseID(parts[0])
+			userId, err := kcore.ParseID(parts[0])
 			if err != nil {
-				err = core.Wrap(err, "error parsing user id")
+				err = kcore.Wrap(err, "error parsing user id")
 				slog.Warn(err.Error())
 				http.Error(w, err.Error(), http.StatusBadRequest)
 				return
 			}
 			expiresAtSeconds, err := strconv.Atoi(parts[1])
 			if err != nil {
-				err = core.Wrap(err, "error parsing expires at")
+				err = kcore.Wrap(err, "error parsing expires at")
 				slog.Warn(err.Error())
 				http.Error(w, err.Error(), http.StatusBadRequest)
 				return
@@ -83,7 +83,7 @@ func CookieAuthMiddleware(loadUser func(context.Context, core.ID) (any, error),
 				return
 			}
 			user, err := loadUser(ctx, userId)
-			core.Expect(err, "error loading user")
+			kcore.Expect(err, "error loading user")
 
 			ctx = context.WithValue(ctx, userContext{}, user)
 			next.ServeHTTP(w, r.WithContext(ctx))
diff --git a/core/core.go b/kcore/core.go
index 5cd654d..5e206e1 100644
--- a/core/core.go
+++ b/kcore/core.go
@@ -1,4 +1,4 @@
-package core
+package kcore
 
 import (
 	"encoding/base64"
diff --git a/core/error.go b/kcore/error.go
index 7b1871a..bbacbf6 100644
--- a/core/error.go
+++ b/kcore/error.go
@@ -1,4 +1,4 @@
-package core
+package kcore
 
 import "fmt"
 
diff --git a/core/file.go b/kcore/file.go
index 083d8f7..f7f5e37 100644
--- a/core/file.go
+++ b/kcore/file.go
@@ -1,4 +1,4 @@
-package core
+package kcore
 
 import (
 	"fmt"
diff --git a/core/http.go b/kcore/http.go
index 778c5c9..e5d218b 100644
--- a/core/http.go
+++ b/kcore/http.go
@@ -1,4 +1,4 @@
-package core
+package kcore
 
 import (
 	"bytes"
diff --git a/core/image.go b/kcore/image.go
index c06cbd8..20b3563 100644
--- a/core/image.go
+++ b/kcore/image.go
@@ -1,4 +1,4 @@
-package core
+package kcore
 
 import (
 	"fmt"
diff --git a/core/middleware.go b/kcore/middleware.go
index 55e67fb..1537f55 100644
--- a/core/middleware.go
+++ b/kcore/middleware.go
@@ -1,4 +1,4 @@
-package core
+package kcore
 
 import (
 	"errors"
diff --git a/core/template.go b/kcore/template.go
index a0d0668..33b2f5a 100644
--- a/core/template.go
+++ b/kcore/template.go
@@ -1,4 +1,4 @@
-package core
+package kcore
 
 import (
 	"github.com/kataras/i18n"