rob/octoplex
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor: internal package

Browse Source
This commit is contained in:
Rob Watson 2025-03-09 19:58:25 +01:00
parent 223b7fcd83
commit 7dba1768a4
39 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/app.go → internal/app/app.go
View File

@ -6,12 +6,12 @@ import (
"log/slog" "log/slog"
"time" "time"
"git.netflux.io/rob/octoplex/config" "git.netflux.io/rob/octoplex/internal/config"
"git.netflux.io/rob/octoplex/container" "git.netflux.io/rob/octoplex/internal/container"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
"git.netflux.io/rob/octoplex/mediaserver" "git.netflux.io/rob/octoplex/internal/mediaserver"
"git.netflux.io/rob/octoplex/multiplexer" "git.netflux.io/rob/octoplex/internal/multiplexer"
"git.netflux.io/rob/octoplex/terminal" "git.netflux.io/rob/octoplex/internal/terminal"
"github.com/gdamore/tcell/v2" "github.com/gdamore/tcell/v2"
) )

8
app/integration_test.go → internal/app/integration_test.go
View File

@ -7,10 +7,10 @@ import (
"testing" "testing"
"time" "time"
"git.netflux.io/rob/octoplex/app" "git.netflux.io/rob/octoplex/internal/app"
"git.netflux.io/rob/octoplex/config" "git.netflux.io/rob/octoplex/internal/config"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
"git.netflux.io/rob/octoplex/testhelpers" "git.netflux.io/rob/octoplex/internal/testhelpers"
dockerclient "github.com/docker/docker/client" dockerclient "github.com/docker/docker/client"
"github.com/gdamore/tcell/v2" "github.com/gdamore/tcell/v2"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
config/config.go → internal/config/config.go
View File

@ -1,6 +1,6 @@
package config package config
import "git.netflux.io/rob/octoplex/domain" import "git.netflux.io/rob/octoplex/internal/domain"
const defaultLogFile = domain.AppName + ".log" const defaultLogFile = domain.AppName + ".log"

2
config/service.go → internal/config/service.go
View File

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

4
config/service_test.go → internal/config/service_test.go
View File

@ -6,8 +6,8 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"git.netflux.io/rob/octoplex/config" "git.netflux.io/rob/octoplex/internal/config"
"git.netflux.io/rob/octoplex/shortid" "git.netflux.io/rob/octoplex/internal/shortid"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

0
config/testdata/complete.yml → internal/config/testdata/complete.yml vendored
View File

0
config/testdata/invalid-destination-url.yml → internal/config/testdata/invalid-destination-url.yml vendored
View File

0
config/testdata/multiple-invalid-destination-urls.yml → internal/config/testdata/multiple-invalid-destination-urls.yml vendored
View File

0
config/testdata/no-logfile.yml → internal/config/testdata/no-logfile.yml vendored
View File

0
config/testdata/no-name.yml → internal/config/testdata/no-name.yml vendored
View File

4
container/container.go → internal/container/container.go
View File

@ -11,8 +11,8 @@ import (
"sync" "sync"
"time" "time"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
"git.netflux.io/rob/octoplex/shortid" "git.netflux.io/rob/octoplex/internal/shortid"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"

6
container/container_test.go → internal/container/container_test.go
View File

@ -7,9 +7,9 @@ import (
"testing" "testing"
"time" "time"
"git.netflux.io/rob/octoplex/container" "git.netflux.io/rob/octoplex/internal/container"
containermocks "git.netflux.io/rob/octoplex/generated/mocks/container" containermocks "git.netflux.io/rob/octoplex/internal/generated/mocks/container"
"git.netflux.io/rob/octoplex/testhelpers" "git.netflux.io/rob/octoplex/internal/testhelpers"
dockercontainer "github.com/docker/docker/api/types/container" dockercontainer "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"

0
container/events.go → internal/container/events.go
View File

4
container/events_test.go → internal/container/events_test.go
View File

@ -5,8 +5,8 @@ import (
"io" "io"
"testing" "testing"
containermocks "git.netflux.io/rob/octoplex/generated/mocks/container" containermocks "git.netflux.io/rob/octoplex/internal/generated/mocks/container"
"git.netflux.io/rob/octoplex/testhelpers" "git.netflux.io/rob/octoplex/internal/testhelpers"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"

8
container/integration_test.go → internal/container/integration_test.go
View File

@ -8,10 +8,10 @@ import (
"testing" "testing"
"time" "time"
"git.netflux.io/rob/octoplex/container" "git.netflux.io/rob/octoplex/internal/container"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
"git.netflux.io/rob/octoplex/shortid" "git.netflux.io/rob/octoplex/internal/shortid"
"git.netflux.io/rob/octoplex/testhelpers" "git.netflux.io/rob/octoplex/internal/testhelpers"
typescontainer "github.com/docker/docker/api/types/container" typescontainer "github.com/docker/docker/api/types/container"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

0
container/stats.go → internal/container/stats.go
View File

4
container/stats_test.go → internal/container/stats_test.go
View File

@ -7,8 +7,8 @@ import (
"io" "io"
"testing" "testing"
containermocks "git.netflux.io/rob/octoplex/generated/mocks/container" containermocks "git.netflux.io/rob/octoplex/internal/generated/mocks/container"
"git.netflux.io/rob/octoplex/testhelpers" "git.netflux.io/rob/octoplex/internal/testhelpers"
dockercontainer "github.com/docker/docker/api/types/container" dockercontainer "github.com/docker/docker/api/types/container"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

0
container/testdata/stats1.json → internal/container/testdata/stats1.json vendored
View File

0
container/testdata/stats2.json → internal/container/testdata/stats2.json vendored
View File

0
domain/constants.go → internal/domain/constants.go
View File

0
domain/types.go → internal/domain/types.go
View File

2
domain/types_test.go → internal/domain/types_test.go
View File

@ -3,7 +3,7 @@ package domain_test
import ( import (
"testing" "testing"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

0
generated/mocks/container/dockerclient_mock.go → internal/generated/mocks/container/dockerclient_mock.go
View File

0
generated/mocks/mediaserver/httpclient_mock.go → internal/generated/mocks/mediaserver/httpclient_mock.go
View File

4
mediaserver/actor.go → internal/mediaserver/actor.go
View File

@ -12,8 +12,8 @@ import (
typescontainer "github.com/docker/docker/api/types/container" typescontainer "github.com/docker/docker/api/types/container"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"git.netflux.io/rob/octoplex/container" "git.netflux.io/rob/octoplex/internal/container"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
) )
const ( const (

0
mediaserver/api.go → internal/mediaserver/api.go
View File

2
mediaserver/api_test.go → internal/mediaserver/api_test.go
View File

@ -7,7 +7,7 @@ import (
"net/http" "net/http"
"testing" "testing"
mocks "git.netflux.io/rob/octoplex/generated/mocks/mediaserver" mocks "git.netflux.io/rob/octoplex/internal/generated/mocks/mediaserver"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

6
mediaserver/integration_test.go → internal/mediaserver/integration_test.go
View File

@ -7,9 +7,9 @@ import (
"testing" "testing"
"time" "time"
"git.netflux.io/rob/octoplex/container" "git.netflux.io/rob/octoplex/internal/container"
"git.netflux.io/rob/octoplex/mediaserver" "git.netflux.io/rob/octoplex/internal/mediaserver"
"git.netflux.io/rob/octoplex/testhelpers" "git.netflux.io/rob/octoplex/internal/testhelpers"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

8
multiplexer/integration_test.go → internal/multiplexer/integration_test.go
View File

@ -6,10 +6,10 @@ import (
"testing" "testing"
"time" "time"
"git.netflux.io/rob/octoplex/container" "git.netflux.io/rob/octoplex/internal/container"
"git.netflux.io/rob/octoplex/mediaserver" "git.netflux.io/rob/octoplex/internal/mediaserver"
"git.netflux.io/rob/octoplex/multiplexer" "git.netflux.io/rob/octoplex/internal/multiplexer"
"git.netflux.io/rob/octoplex/testhelpers" "git.netflux.io/rob/octoplex/internal/testhelpers"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

4
multiplexer/multiplexer.go → internal/multiplexer/multiplexer.go
View File

@ -11,8 +11,8 @@ import (
typescontainer "github.com/docker/docker/api/types/container" typescontainer "github.com/docker/docker/api/types/container"
"git.netflux.io/rob/octoplex/container" "git.netflux.io/rob/octoplex/internal/container"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
) )
type action func() type action func()

0
shortid/shortid.go → internal/shortid/shortid.go
View File

2
shortid/shortid_test.go → internal/shortid/shortid_test.go
View File

@ -3,7 +3,7 @@ package shortid_test
import ( import (
"testing" "testing"
"git.netflux.io/rob/octoplex/shortid" "git.netflux.io/rob/octoplex/internal/shortid"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

0
terminal/command.go → internal/terminal/command.go
View File

2
terminal/terminal.go → internal/terminal/terminal.go
View File

@ -10,7 +10,7 @@ import (
"sync" "sync"
"time" "time"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
"github.com/gdamore/tcell/v2" "github.com/gdamore/tcell/v2"
"github.com/rivo/tview" "github.com/rivo/tview"
"golang.design/x/clipboard" "golang.design/x/clipboard"

2
terminal/terminal_test.go → internal/terminal/terminal_test.go
View File

@ -3,7 +3,7 @@ package terminal
import ( import (
"testing" "testing"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

0
testhelpers/channel.go → internal/testhelpers/channel.go
View File

0
testhelpers/ffmpeg.go → internal/testhelpers/ffmpeg.go
View File

0
testhelpers/logging.go → internal/testhelpers/logging.go
View File

6
main.go
View File

@ -10,9 +10,9 @@ import (
"runtime/debug" "runtime/debug"
"syscall" "syscall"
"git.netflux.io/rob/octoplex/app" "git.netflux.io/rob/octoplex/internal/app"
"git.netflux.io/rob/octoplex/config" "git.netflux.io/rob/octoplex/internal/config"
"git.netflux.io/rob/octoplex/domain" "git.netflux.io/rob/octoplex/internal/domain"
dockerclient "github.com/docker/docker/client" dockerclient "github.com/docker/docker/client"
"golang.design/x/clipboard" "golang.design/x/clipboard"
) )