dev: init x package for experiments and porting outside

withsparkle · Nov 20, 2023 · 2fdf85d · 2fdf85d
1 parent a09bb5a
commit 2fdf85d
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 24 deletions.
diff --git a/internal/config/server_test.go b/internal/config/server_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	xtesting "go.octolab.org/ecosystem/sparkle/internal/pkg/testing"
+	xtesting "go.octolab.org/ecosystem/sparkle/internal/pkg/x/testing"
 )
 
 func TestServerSerialization(t *testing.T) {

diff --git a/internal/config/sparkle_test.go b/internal/config/sparkle_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	xtesting "go.octolab.org/ecosystem/sparkle/internal/pkg/testing"
+	xtesting "go.octolab.org/ecosystem/sparkle/internal/pkg/x/testing"
 )
 
 func TestSparkleSerialization(t *testing.T) {

diff --git a/internal/pkg/assert/assert.go → internal/pkg/x/assert/assert.go b/internal/pkg/assert/assert.go → internal/pkg/x/assert/assert.go
diff --git a/internal/pkg/errors/ux.go → internal/pkg/x/errors/ux.go b/internal/pkg/errors/ux.go → internal/pkg/x/errors/ux.go
@@ -1,4 +1,4 @@
-package errors
+package xerrors
 
 // X is a pair of errors, one for a user
 // and one for a developer.

diff --git a/internal/pkg/fs/timestamp.go → internal/pkg/x/fs/timestamp.go b/internal/pkg/fs/timestamp.go → internal/pkg/x/fs/timestamp.go
@@ -1,6 +1,6 @@
 //go:build !linux && !unix && !darwin && !freebsd
 
-package fs
+package xfs
 
 import (
 	"io/fs"

diff --git a/internal/pkg/fs/timestamp_darwin.go → internal/pkg/x/fs/timestamp_darwin.go b/internal/pkg/fs/timestamp_darwin.go → internal/pkg/x/fs/timestamp_darwin.go
@@ -1,6 +1,6 @@
 //go:build darwin || freebsd
 
-package fs
+package xfs
 
 import (
 	"io/fs"

diff --git a/internal/pkg/fs/timestamp_linux.go → internal/pkg/x/fs/timestamp_linux.go b/internal/pkg/fs/timestamp_linux.go → internal/pkg/x/fs/timestamp_linux.go
@@ -1,6 +1,6 @@
 //go:build linux || unix
 
-package fs
+package xfs
 
 import (
 	"io/fs"

diff --git a/internal/pkg/testing/close.go → internal/pkg/x/testing/close.go b/internal/pkg/testing/close.go → internal/pkg/x/testing/close.go
diff --git a/internal/pkg/time/duration.go → internal/pkg/x/time/duration.go b/internal/pkg/time/duration.go → internal/pkg/x/time/duration.go
diff --git a/internal/pkg/time/range.go → internal/pkg/x/time/range.go b/internal/pkg/time/range.go → internal/pkg/x/time/range.go
@@ -3,7 +3,7 @@ package xtime
 import (
 	"time"
 
-	xassert "go.octolab.org/ecosystem/sparkle/internal/pkg/assert"
+	xassert "go.octolab.org/ecosystem/sparkle/internal/pkg/x/assert"
 )
 
 func IsLinear(past, future time.Time, threshold time.Duration) (is bool, shift bool) {

diff --git a/internal/pkg/time/time.go → internal/pkg/x/time/time.go b/internal/pkg/time/time.go → internal/pkg/x/time/time.go
diff --git a/internal/plugins/obsidian/calendar/config.go b/internal/plugins/obsidian/calendar/config.go
@@ -9,7 +9,7 @@ import (
 	"go.octolab.org/safe"
 	"go.octolab.org/unsafe"
 
-	"go.octolab.org/ecosystem/sparkle/internal/pkg/errors"
+	xerrors "go.octolab.org/ecosystem/sparkle/internal/pkg/x/errors"
 )
 
 const config = ".obsidian/plugins/calendar/data.json"
@@ -33,15 +33,15 @@ func LoadConfig(fs afero.Fs) (Config, error) {
 		return cnf, nil
 	}
 	if err != nil {
-		return cnf, errors.X{
+		return cnf, xerrors.X{
 			User:   errConfig,
 			System: fmt.Errorf("cannot load config %w", err),
 		}
 	}
 	defer safe.Close(f, unsafe.Ignore)
 
 	if err := json.NewDecoder(f).Decode(&cnf); err != nil {
-		return cnf, errors.X{
+		return cnf, xerrors.X{
 			User:   errConfig,
 			System: fmt.Errorf("cannot decode config %w", err),
 		}

diff --git a/internal/plugins/obsidian/daily-notes/config.go b/internal/plugins/obsidian/daily-notes/config.go
@@ -9,7 +9,7 @@ import (
 	"go.octolab.org/safe"
 	"go.octolab.org/unsafe"
 
-	"go.octolab.org/ecosystem/sparkle/internal/pkg/errors"
+	xerrors "go.octolab.org/ecosystem/sparkle/internal/pkg/x/errors"
 )
 
 const config = ".obsidian/daily-notes.json"
@@ -29,15 +29,15 @@ func LoadConfig(fs afero.Fs) (Config, error) {
 		return cnf, nil
 	}
 	if err != nil {
-		return cnf, errors.X{
+		return cnf, xerrors.X{
 			User:   errConfig,
 			System: fmt.Errorf("cannot load config %w", err),
 		}
 	}
 	defer safe.Close(f, unsafe.Ignore)
 
 	if err := json.NewDecoder(f).Decode(&cnf); err != nil {
-		return cnf, errors.X{
+		return cnf, xerrors.X{
 			User:   errConfig,
 			System: fmt.Errorf("cannot decode config %w", err),
 		}

diff --git a/internal/plugins/obsidian/daily-notes/diary.go b/internal/plugins/obsidian/daily-notes/diary.go
@@ -12,8 +12,8 @@ import (
 	"go.octolab.org/safe"
 	"go.octolab.org/unsafe"
 
-	"go.octolab.org/ecosystem/sparkle/internal/pkg/errors"
 	"go.octolab.org/ecosystem/sparkle/internal/pkg/markdown"
+	xerrors "go.octolab.org/ecosystem/sparkle/internal/pkg/x/errors"
 )
 
 const ext = ".md"
@@ -57,7 +57,7 @@ func (d *Diary) Create(
 	}
 	file, err := d.fs.OpenFile(record.Path, flag, 0644)
 	if err != nil {
-		return record, errors.X{
+		return record, xerrors.X{
 			User:   errFolder,
 			System: fmt.Errorf("cannot open file %q: %w", record.Path, err),
 		}
@@ -85,7 +85,7 @@ func (d *Diary) Create(
 	)
 
 	if err := note.SaveTo(file); err != nil {
-		return record, errors.X{
+		return record, xerrors.X{
 			User:   errFolder,
 			System: fmt.Errorf("cannot save file %q: %w", record.Path, err),
 		}
@@ -155,7 +155,7 @@ func (d *Diary) template() (markdown.Document, error) {
 
 	file, err := d.fs.Open(d.cnf.Template)
 	if err != nil {
-		return empty, errors.X{
+		return empty, xerrors.X{
 			User:   errTemplate,
 			System: fmt.Errorf("cannot load template %q: %w", d.cnf.Template, err),
 		}
@@ -164,7 +164,7 @@ func (d *Diary) template() (markdown.Document, error) {
 
 	var doc markdown.Document
 	if err := markdown.LoadFrom(file, &doc); err != nil {
-		return empty, errors.X{
+		return empty, xerrors.X{
 			User:   errTemplate,
 			System: fmt.Errorf("cannot parse template %q: %w", d.cnf.Template, err),
 		}

diff --git a/internal/plugins/obsidian/periodic-notes/config.go b/internal/plugins/obsidian/periodic-notes/config.go
@@ -9,7 +9,7 @@ import (
 	"go.octolab.org/safe"
 	"go.octolab.org/unsafe"
 
-	"go.octolab.org/ecosystem/sparkle/internal/pkg/errors"
+	xerrors "go.octolab.org/ecosystem/sparkle/internal/pkg/x/errors"
 )
 
 const config = ".obsidian/plugins/periodic-notes/data.json"
@@ -48,15 +48,15 @@ func LoadConfig(fs afero.Fs) (Config, error) {
 		return cnf, nil
 	}
 	if err != nil {
-		return cnf, errors.X{
+		return cnf, xerrors.X{
 			User:   errConfig,
 			System: fmt.Errorf("cannot load config %w", err),
 		}
 	}
 	defer safe.Close(f, unsafe.Ignore)
 
 	if err := json.NewDecoder(f).Decode(&cnf); err != nil {
-		return cnf, errors.X{
+		return cnf, xerrors.X{
 			User:   errConfig,
 			System: fmt.Errorf("cannot decode config %w", err),
 		}

diff --git a/internal/service/playbook/service.go b/internal/service/playbook/service.go
@@ -8,8 +8,8 @@ import (
 	"go.octolab.org/safe"
 	"go.octolab.org/unsafe"
 
-	"go.octolab.org/ecosystem/sparkle/internal/pkg/fs"
 	"go.octolab.org/ecosystem/sparkle/internal/pkg/markdown"
+	xfs "go.octolab.org/ecosystem/sparkle/internal/pkg/x/fs"
 )
 
 const (
@@ -52,7 +52,7 @@ func (service *Service) Notes(root string) ([]Note, error) {
 			notes = append(notes, Note{
 				Document:  doc,
 				Path:      path,
-				CreatedAt: fs.CreatedAt(info),
+				CreatedAt: xfs.CreatedAt(info),
 				UpdatedAt: info.ModTime(),
 			})
 		}

diff --git a/internal/service/tact/logbook.go b/internal/service/tact/logbook.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"time"
 
-	xtime "go.octolab.org/ecosystem/sparkle/internal/pkg/time"
+	xtime "go.octolab.org/ecosystem/sparkle/internal/pkg/x/time"
 )
 
 type Logbook interface {