Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix package paths #38

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Fix package paths #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ TRANSCODER_VERSION ?= $(shell git describe --tags --match 'transcoder-v*'|sed 's
transcoder: $(BUILD_DIR)/$(GOOS)_$(GOARCH)/transcoder
GOARCH=$(GOARCH) GOOS=$(GOOS) CGO_ENABLED=0 \
$(GO_BUILD) -o $(BUILD_DIR)/$(GOOS)_$(GOARCH)/transcoder \
-ldflags "-s -w -X github.com/lbryio/transcoder/internal/version.Version=$(TRANSCODER_VERSION)" \
-ldflags "-s -w -X github.com/odyseeteam/transcoder/internal/version.Version=$(TRANSCODER_VERSION)" \
./pkg/conductor/cmd/

conductor_image:
Expand All @@ -39,7 +39,7 @@ towerz:
tccli:
GOARCH=$(GOARCH) GOOS=$(GOOS) CGO_ENABLED=0 \
$(GO_BUILD) -o $(BUILD_DIR)/$(GOOS)_$(GOARCH)/tccli \
-ldflags "-s -w -X github.com/lbryio/transcoder/internal/version.Version=$(TRANSCODER_VERSION)" \
-ldflags "-s -w -X github.com/odyseeteam/transcoder/internal/version.Version=$(TRANSCODER_VERSION)" \
./tccli/

tccli_mac:
Expand Down
8 changes: 4 additions & 4 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"sync"
"time"

"github.com/lbryio/transcoder/library"
"github.com/lbryio/transcoder/pkg/logging"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/lbryio/transcoder/pkg/timer"
"github.com/odyseeteam/transcoder/library"
"github.com/odyseeteam/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/pkg/timer"

"github.com/karlseguin/ccache/v2"
"github.com/karrick/godirwalk"
Expand Down
4 changes: 2 additions & 2 deletions client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"time"

"github.com/Pallinder/go-randomdata"
"github.com/lbryio/transcoder/library"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/library"
"github.com/odyseeteam/transcoder/pkg/resolve"

"github.com/karrick/godirwalk"
"github.com/stretchr/testify/suite"
Expand Down
6 changes: 3 additions & 3 deletions encoder/encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"

"github.com/karrick/godirwalk"
"github.com/lbryio/transcoder/internal/metrics"
"github.com/lbryio/transcoder/ladder"
"github.com/lbryio/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/internal/metrics"
"github.com/odyseeteam/transcoder/ladder"
"github.com/odyseeteam/transcoder/pkg/logging"

ffmpegt "github.com/floostack/transcoder"
"github.com/floostack/transcoder/ffmpeg"
Expand Down
6 changes: 3 additions & 3 deletions encoder/encoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"testing"

"github.com/lbryio/transcoder/ladder"
"github.com/lbryio/transcoder/pkg/logging/zapadapter"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/ladder"
"github.com/odyseeteam/transcoder/pkg/logging/zapadapter"
"github.com/odyseeteam/transcoder/pkg/resolve"

"github.com/shopspring/decimal"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion encoder/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package encoder

import (
"github.com/lbryio/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/logging"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion encoder/pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package encoder

import "github.com/lbryio/transcoder/pkg/dispatcher"
import "github.com/odyseeteam/transcoder/pkg/dispatcher"

type encodeTask [2]string

Expand Down
6 changes: 3 additions & 3 deletions encoder/pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strings"
"testing"

"github.com/lbryio/transcoder/ladder"
"github.com/lbryio/transcoder/pkg/logging/zapadapter"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/ladder"
"github.com/odyseeteam/transcoder/pkg/logging/zapadapter"
"github.com/odyseeteam/transcoder/pkg/resolve"

"github.com/stretchr/testify/suite"
)
Expand Down
2 changes: 1 addition & 1 deletion encoder/spritegen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os/exec"
"strings"

"github.com/lbryio/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/logging"
)

type SpriteGenerator struct {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/lbryio/transcoder
module github.com/odyseeteam/transcoder

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion ladder/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ladder

import (
"github.com/lbryio/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/logging"
"go.uber.org/zap"
)

Expand Down
6 changes: 3 additions & 3 deletions library/library.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"fmt"
"sync"

"github.com/lbryio/transcoder/library/db"
"github.com/lbryio/transcoder/pkg/logging"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/library/db"
"github.com/odyseeteam/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/resolve"

"github.com/c2h5oh/datasize"
"github.com/panjf2000/ants/v2"
Expand Down
4 changes: 2 additions & 2 deletions library/library_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"
"time"

"github.com/lbryio/transcoder/library/db"
"github.com/lbryio/transcoder/pkg/logging/zapadapter"
"github.com/odyseeteam/transcoder/library/db"
"github.com/odyseeteam/transcoder/pkg/logging/zapadapter"

"github.com/stretchr/testify/suite"
)
Expand Down
2 changes: 1 addition & 1 deletion library/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package library

import (
"github.com/lbryio/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/logging"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion library/maintenance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sort"
"time"

"github.com/lbryio/transcoder/library/db"
"github.com/odyseeteam/transcoder/library/db"

"github.com/c2h5oh/datasize"
)
Expand Down
4 changes: 2 additions & 2 deletions library/maintenance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/lbryio/transcoder/library/db"
"github.com/lbryio/transcoder/pkg/logging/zapadapter"
"github.com/odyseeteam/transcoder/library/db"
"github.com/odyseeteam/transcoder/pkg/logging/zapadapter"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions library/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

"github.com/Pallinder/go-randomdata"
"github.com/lbryio/transcoder/library/db"
"github.com/lbryio/transcoder/pkg/migrator"
"github.com/odyseeteam/transcoder/library/db"
"github.com/odyseeteam/transcoder/pkg/migrator"

"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions manager/channels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"sync"
"time"

"github.com/lbryio/transcoder/library"
db "github.com/lbryio/transcoder/library/db"
"github.com/odyseeteam/transcoder/library"
db "github.com/odyseeteam/transcoder/library/db"
)

type channelList struct {
Expand Down
12 changes: 6 additions & 6 deletions manager/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"net/url"
"strings"

"github.com/lbryio/transcoder/internal/metrics"
"github.com/lbryio/transcoder/library/db"
"github.com/lbryio/transcoder/pkg/dispatcher"
"github.com/lbryio/transcoder/pkg/logging"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/lbryio/transcoder/pkg/timer"
"github.com/odyseeteam/transcoder/internal/metrics"
"github.com/odyseeteam/transcoder/library/db"
"github.com/odyseeteam/transcoder/pkg/dispatcher"
"github.com/odyseeteam/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/pkg/timer"

"github.com/fasthttp/router"
"github.com/prometheus/client_golang/prometheus/promhttp"
Expand Down
4 changes: 2 additions & 2 deletions manager/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"testing"

randomdata "github.com/Pallinder/go-randomdata"
"github.com/lbryio/transcoder/library"
"github.com/lbryio/transcoder/pkg/logging/zapadapter"
"github.com/odyseeteam/transcoder/library"
"github.com/odyseeteam/transcoder/pkg/logging/zapadapter"

"github.com/fasthttp/router"
"github.com/prometheus/client_golang/prometheus"
Expand Down
2 changes: 1 addition & 1 deletion manager/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package manager

import (
"github.com/lbryio/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/logging"
"go.uber.org/zap"
)

Expand Down
12 changes: 6 additions & 6 deletions manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"time"

"github.com/fasthttp/router"
"github.com/lbryio/transcoder/library"
db "github.com/lbryio/transcoder/library/db"
"github.com/lbryio/transcoder/pkg/conductor/metrics"
"github.com/lbryio/transcoder/pkg/logging/zapadapter"
"github.com/lbryio/transcoder/pkg/mfr"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/library"
db "github.com/odyseeteam/transcoder/library/db"
"github.com/odyseeteam/transcoder/pkg/conductor/metrics"
"github.com/odyseeteam/transcoder/pkg/logging/zapadapter"
"github.com/odyseeteam/transcoder/pkg/mfr"
"github.com/odyseeteam/transcoder/pkg/resolve"
"github.com/valyala/fasthttp"
"github.com/valyala/fasthttp/pprofhandler"

Expand Down
12 changes: 6 additions & 6 deletions manager/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"testing"

"github.com/Pallinder/go-randomdata"
"github.com/lbryio/transcoder/library"
"github.com/lbryio/transcoder/library/db"
"github.com/lbryio/transcoder/pkg/logging"
"github.com/lbryio/transcoder/pkg/logging/zapadapter"
"github.com/lbryio/transcoder/pkg/mfr"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/library"
"github.com/odyseeteam/transcoder/library/db"
"github.com/odyseeteam/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/logging/zapadapter"
"github.com/odyseeteam/transcoder/pkg/mfr"
"github.com/odyseeteam/transcoder/pkg/resolve"
"github.com/stretchr/testify/suite"
)

Expand Down
4 changes: 2 additions & 2 deletions manager/pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"container/ring"
"time"

"github.com/lbryio/transcoder/pkg/mfr"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/pkg/mfr"
"github.com/odyseeteam/transcoder/pkg/resolve"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
4 changes: 2 additions & 2 deletions manager/pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

"github.com/Pallinder/go-randomdata"
"github.com/lbryio/transcoder/pkg/logging"
"github.com/lbryio/transcoder/pkg/mfr"
"github.com/odyseeteam/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/mfr"

"github.com/stretchr/testify/suite"
)
Expand Down
32 changes: 16 additions & 16 deletions pkg/conductor/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ import (
"strconv"
"syscall"

"github.com/lbryio/transcoder/encoder"
"github.com/lbryio/transcoder/internal/version"
"github.com/lbryio/transcoder/ladder"
"github.com/lbryio/transcoder/library"
ldb "github.com/lbryio/transcoder/library/db"
"github.com/lbryio/transcoder/manager"
"github.com/lbryio/transcoder/pkg/conductor"
"github.com/lbryio/transcoder/pkg/conductor/metrics"
"github.com/lbryio/transcoder/pkg/conductor/tasks"
"github.com/lbryio/transcoder/pkg/dispatcher"
"github.com/lbryio/transcoder/pkg/logging"
"github.com/lbryio/transcoder/pkg/logging/zapadapter"
"github.com/lbryio/transcoder/pkg/mfr"
"github.com/lbryio/transcoder/pkg/migrator"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/lbryio/transcoder/storage"
"github.com/odyseeteam/transcoder/encoder"
"github.com/odyseeteam/transcoder/internal/version"
"github.com/odyseeteam/transcoder/ladder"
"github.com/odyseeteam/transcoder/library"
ldb "github.com/odyseeteam/transcoder/library/db"
"github.com/odyseeteam/transcoder/manager"
"github.com/odyseeteam/transcoder/pkg/conductor"
"github.com/odyseeteam/transcoder/pkg/conductor/metrics"
"github.com/odyseeteam/transcoder/pkg/conductor/tasks"
"github.com/odyseeteam/transcoder/pkg/dispatcher"
"github.com/odyseeteam/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/logging/zapadapter"
"github.com/odyseeteam/transcoder/pkg/mfr"
"github.com/odyseeteam/transcoder/pkg/migrator"
"github.com/odyseeteam/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/storage"

"github.com/alecthomas/kong"
"github.com/fasthttp/router"
Expand Down
10 changes: 5 additions & 5 deletions pkg/conductor/conductor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"
"time"

"github.com/lbryio/transcoder/library"
"github.com/lbryio/transcoder/manager"
"github.com/lbryio/transcoder/pkg/conductor/metrics"
"github.com/lbryio/transcoder/pkg/conductor/tasks"
"github.com/lbryio/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/library"
"github.com/odyseeteam/transcoder/manager"
"github.com/odyseeteam/transcoder/pkg/conductor/metrics"
"github.com/odyseeteam/transcoder/pkg/conductor/tasks"
"github.com/odyseeteam/transcoder/pkg/logging"

"github.com/hibiken/asynq"
redis "github.com/redis/go-redis/v9"
Expand Down
2 changes: 1 addition & 1 deletion pkg/conductor/tasks/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package tasks
import (
"encoding/json"

"github.com/lbryio/transcoder/library"
"github.com/odyseeteam/transcoder/library"
)

type TranscodingRequest struct {
Expand Down
14 changes: 7 additions & 7 deletions pkg/conductor/tasks/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
"strconv"
"time"

"github.com/lbryio/transcoder/encoder"
"github.com/lbryio/transcoder/library"
"github.com/lbryio/transcoder/pkg/conductor/metrics"
"github.com/lbryio/transcoder/pkg/logging"
"github.com/lbryio/transcoder/pkg/resolve"
"github.com/lbryio/transcoder/pkg/retriever"
"github.com/lbryio/transcoder/storage"
"github.com/odyseeteam/transcoder/encoder"
"github.com/odyseeteam/transcoder/library"
"github.com/odyseeteam/transcoder/pkg/conductor/metrics"
"github.com/odyseeteam/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/resolve"
"github.com/odyseeteam/transcoder/pkg/retriever"
"github.com/odyseeteam/transcoder/storage"
"go.etcd.io/etcd/api/v3/version"

"github.com/hibiken/asynq"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dispatcher/dispatcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

"github.com/lbryio/transcoder/pkg/logging"
"github.com/odyseeteam/transcoder/pkg/logging"

"github.com/Pallinder/go-randomdata"
"github.com/stretchr/testify/suite"
Expand Down
Loading
Loading