Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
number571 committed Nov 4, 2024
2 parents 5edbded + 3ff73ec commit 16fae70
Show file tree
Hide file tree
Showing 185 changed files with 786 additions and 638 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

*??? ??, ????*

### CHANGES

- `cmd/*`: move internal/config -> pkg/app/config

<!-- ... -->

## v1.7.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/number571/go-peer/pkg/storage/cache"
"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/adapters"
"github.com/number571/hidden-lake/internal/adapters/chatingar/internal/config"
"github.com/number571/hidden-lake/internal/adapters/chatingar/internal/consumer/internal/adapted"
"github.com/number571/hidden-lake/internal/adapters/chatingar/pkg/app/config"
hlt_client "github.com/number571/hidden-lake/internal/helpers/traffic/pkg/client"
"github.com/number571/hidden-lake/internal/utils/logger/std"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/number571/go-peer/pkg/state"
"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/adapters"
"github.com/number571/hidden-lake/internal/adapters/chatingar/internal/config"
"github.com/number571/hidden-lake/internal/adapters/chatingar/internal/producer/internal/adapted"
"github.com/number571/hidden-lake/internal/adapters/chatingar/pkg/app/config"
"github.com/number571/hidden-lake/internal/utils/logger/std"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/chatingar/pkg/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/number571/go-peer/pkg/logger"
"github.com/number571/go-peer/pkg/state"
"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/adapters/chatingar/internal/config"
"github.com/number571/hidden-lake/internal/adapters/chatingar/pkg/app/config"

hla_settings "github.com/number571/hidden-lake/internal/adapters/chatingar/pkg/settings"
"github.com/number571/hidden-lake/internal/utils/logger/std"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package config

const (
errPrefix = "internal/adapters/chatingar/internal/config = "
errPrefix = "internal/adapters/chatingar/pkg/app/config = "
)

type SConfigError struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/chatingar/pkg/app/init_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strings"

"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/adapters/chatingar/internal/config"
consumer_app "github.com/number571/hidden-lake/internal/adapters/chatingar/internal/consumer/pkg/app"
producer_app "github.com/number571/hidden-lake/internal/adapters/chatingar/internal/producer/pkg/app"
"github.com/number571/hidden-lake/internal/adapters/chatingar/pkg/app/config"
"github.com/number571/hidden-lake/internal/adapters/chatingar/pkg/settings"
"github.com/number571/hidden-lake/internal/utils/flag"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/common/internal/consumer/pkg/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/number571/go-peer/pkg/state"
"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/adapters"
"github.com/number571/hidden-lake/internal/adapters/common/internal/config"
"github.com/number571/hidden-lake/internal/adapters/common/internal/consumer/internal/adapted"
"github.com/number571/hidden-lake/internal/adapters/common/pkg/app/config"
hlt_client "github.com/number571/hidden-lake/internal/helpers/traffic/pkg/client"
"github.com/number571/hidden-lake/internal/utils/logger/std"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/common/internal/producer/pkg/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/number571/go-peer/pkg/state"
"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/adapters"
"github.com/number571/hidden-lake/internal/adapters/common/internal/config"
"github.com/number571/hidden-lake/internal/adapters/common/internal/producer/internal/adapted"
"github.com/number571/hidden-lake/internal/adapters/common/pkg/app/config"
"github.com/number571/hidden-lake/internal/utils/logger/std"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/common/pkg/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/number571/go-peer/pkg/logger"
"github.com/number571/go-peer/pkg/state"
"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/adapters/common/internal/config"
"github.com/number571/hidden-lake/internal/adapters/common/pkg/app/config"

hla_settings "github.com/number571/hidden-lake/internal/adapters/common/pkg/settings"
"github.com/number571/hidden-lake/internal/utils/logger/std"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package config

const (
errPrefix = "internal/adapters/common/consumer/internal/config = "
errPrefix = "internal/adapters/common/consumer/pkg/app/config = "
)

type SConfigError struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/common/pkg/app/init_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strings"

"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/adapters/common/internal/config"
consumer_app "github.com/number571/hidden-lake/internal/adapters/common/internal/consumer/pkg/app"
producer_app "github.com/number571/hidden-lake/internal/adapters/common/internal/producer/pkg/app"
"github.com/number571/hidden-lake/internal/adapters/common/pkg/app/config"
"github.com/number571/hidden-lake/internal/adapters/common/pkg/settings"
"github.com/number571/hidden-lake/internal/utils/flag"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/applications/filesharer/internal/handler/about.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/web"

hlf_settings "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
std_logger "github.com/number571/hidden-lake/internal/utils/logger/std"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/applications/filesharer/internal/handler/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
hlf_settings "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
"github.com/number571/hidden-lake/internal/applications/filesharer/web"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/number571/go-peer/pkg/crypto/asymmetric"
"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
hlf_settings "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
"github.com/number571/hidden-lake/internal/applications/filesharer/web"
hls_client "github.com/number571/hidden-lake/internal/service/pkg/client"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
std_logger "github.com/number571/hidden-lake/internal/utils/logger/std"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
"github.com/number571/hidden-lake/internal/utils/language"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/number571/go-peer/pkg/encoding"
"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
"github.com/number571/hidden-lake/internal/utils/api"
http_logger "github.com/number571/hidden-lake/internal/utils/logger/http"

Expand Down
2 changes: 1 addition & 1 deletion internal/applications/filesharer/internal/handler/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
hlf_settings "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
http_logger "github.com/number571/hidden-lake/internal/utils/logger/http"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
std_logger "github.com/number571/hidden-lake/internal/utils/logger/std"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/number571/go-peer/pkg/crypto/hashing"
"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
hlf_settings "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
"github.com/number571/hidden-lake/internal/applications/filesharer/web"
"github.com/number571/hidden-lake/internal/utils/language"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
std_logger "github.com/number571/hidden-lake/internal/utils/logger/std"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/stream"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
hlf_client "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/client"
hlf_settings "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
"github.com/number571/hidden-lake/internal/applications/filesharer/web"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
std_logger "github.com/number571/hidden-lake/internal/utils/logger/std"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/applications/filesharer/pkg/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/number571/go-peer/pkg/logger"
"github.com/number571/go-peer/pkg/state"
"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"

pkg_config "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/config"
hlf_settings "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
Expand Down
2 changes: 1 addition & 1 deletion internal/applications/filesharer/pkg/app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
pkg_settings "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
testutils "github.com/number571/hidden-lake/test/utils"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package config

const (
errPrefix = "internal/applications/messenger/internal/config = "
errPrefix = "internal/applications/filesharer/pkg/app/config = "
)

type SConfigError struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/applications/filesharer/pkg/app/init_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

"github.com/number571/go-peer/pkg/types"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
"github.com/number571/hidden-lake/internal/utils/flag"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/applications/filesharer/pkg/app/init_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/handler"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
hlf_settings "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/settings"
"github.com/number571/hidden-lake/internal/applications/filesharer/web"
hls_client "github.com/number571/hidden-lake/internal/service/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion internal/applications/filesharer/pkg/config/config.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package config

import (
"github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
"github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"
"github.com/number571/hidden-lake/internal/utils/language"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/applications/filesharer/pkg/config/types.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package config

import "github.com/number571/hidden-lake/internal/applications/filesharer/internal/config"
import "github.com/number571/hidden-lake/internal/applications/filesharer/pkg/app/config"

type IConfigSettings interface {
config.IConfigSettings
Expand Down
2 changes: 1 addition & 1 deletion internal/applications/messenger/internal/handler/about.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
"github.com/number571/hidden-lake/internal/applications/messenger/web"

hlm_settings "github.com/number571/hidden-lake/internal/applications/messenger/pkg/settings"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
std_logger "github.com/number571/hidden-lake/internal/utils/logger/std"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/applications/messenger/internal/handler/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
hlm_settings "github.com/number571/hidden-lake/internal/applications/messenger/pkg/settings"
"github.com/number571/hidden-lake/internal/applications/messenger/web"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/number571/go-peer/pkg/crypto/asymmetric"
"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
hlm_settings "github.com/number571/hidden-lake/internal/applications/messenger/pkg/settings"
"github.com/number571/hidden-lake/internal/applications/messenger/web"
hls_client "github.com/number571/hidden-lake/internal/service/pkg/client"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

"github.com/number571/go-peer/pkg/crypto/asymmetric"
"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/database"
internal_utils "github.com/number571/hidden-lake/internal/applications/messenger/internal/utils"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
hlm_client "github.com/number571/hidden-lake/internal/applications/messenger/pkg/client"
"github.com/number571/hidden-lake/internal/applications/messenger/web"
hls_client "github.com/number571/hidden-lake/internal/service/pkg/client"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
hls_client "github.com/number571/hidden-lake/internal/service/pkg/client"
std_logger "github.com/number571/hidden-lake/internal/utils/logger/std"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
hls_client "github.com/number571/hidden-lake/internal/service/pkg/client"
std_logger "github.com/number571/hidden-lake/internal/utils/logger/std"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/http"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/utils"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
"github.com/number571/hidden-lake/internal/applications/messenger/web"
hls_client "github.com/number571/hidden-lake/internal/service/pkg/client"
http_logger "github.com/number571/hidden-lake/internal/utils/logger/http"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
hls_client "github.com/number571/hidden-lake/internal/service/pkg/client"
std_logger "github.com/number571/hidden-lake/internal/utils/logger/std"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
"github.com/number571/hidden-lake/internal/utils/language"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/applications/messenger/internal/handler/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"

"github.com/number571/go-peer/pkg/logger"
"github.com/number571/hidden-lake/internal/applications/messenger/internal/config"
"github.com/number571/hidden-lake/internal/applications/messenger/pkg/app/config"
hlm_settings "github.com/number571/hidden-lake/internal/applications/messenger/pkg/settings"
http_logger "github.com/number571/hidden-lake/internal/utils/logger/http"
)
Expand Down
Loading

0 comments on commit 16fae70

Please sign in to comment.