Browse Source

Fixes #211: Update mod paths (#221)

Co-authored-by: Michael Leow <mleow@moneylion.com>
pull/217/head
leowmjw 5 years ago committed by GitHub
parent
commit
769fc3a561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      config/config.go
  2. 4
      controllers/admin/changeStreamKey.go
  3. 6
      controllers/admin/disconnect.go
  4. 2
      controllers/admin/hardware.go
  5. 6
      controllers/admin/inboundBroadcasterDetails.go
  6. 2
      controllers/admin/serverConfig.go
  7. 2
      controllers/admin/viewers.go
  8. 6
      controllers/chat.go
  9. 4
      controllers/config.go
  10. 2
      controllers/controllers.go
  11. 4
      controllers/emoji.go
  12. 8
      controllers/index.go
  13. 4
      controllers/status.go
  14. 2
      core/chat/chat.go
  15. 4
      core/chat/client.go
  16. 6
      core/chat/persistence.go
  17. 4
      core/chat/server.go
  18. 4
      core/chatListener.go
  19. 12
      core/core.go
  20. 2
      core/ffmpeg/ffmpeg.go
  21. 2
      core/ffmpeg/thumbnailGenerator.go
  22. 4
      core/ffmpeg/transcoder.go
  23. 6
      core/playlist/monitor.go
  24. 10
      core/rtmp/rtmp.go
  25. 2
      core/rtmp/utils.go
  26. 6
      core/stats.go
  27. 8
      core/status.go
  28. 6
      core/storage.go
  29. 4
      core/storageproviders/s3Storage.go
  30. 2
      go.mod
  31. 8
      main.go
  32. 2
      metrics/viewers.go
  33. 2
      models/stats.go
  34. 2
      models/status.go
  35. 2
      router/middleware/auth.go
  36. 16
      router/router.go
  37. 8
      scripts/build.sh
  38. 4
      yp/api.go
  39. 4
      yp/yp.go

2
config/config.go

@ -4,7 +4,7 @@ import ( @@ -4,7 +4,7 @@ import (
"errors"
"io/ioutil"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/utils"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
)

4
controllers/admin/changeStreamKey.go

@ -4,8 +4,8 @@ import ( @@ -4,8 +4,8 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/controllers"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/controllers"
log "github.com/sirupsen/logrus"
)

6
controllers/admin/disconnect.go

@ -3,10 +3,10 @@ package admin @@ -3,10 +3,10 @@ package admin
import (
"net/http"
"github.com/gabek/owncast/controllers"
"github.com/gabek/owncast/core"
"github.com/owncast/owncast/controllers"
"github.com/owncast/owncast/core"
"github.com/gabek/owncast/core/rtmp"
"github.com/owncast/owncast/core/rtmp"
)
// DisconnectInboundConnection will force-disconnect an inbound stream

2
controllers/admin/hardware.go

@ -4,7 +4,7 @@ import ( @@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/metrics"
"github.com/owncast/owncast/metrics"
)
// GetHardwareStats will return hardware utilization over time

6
controllers/admin/inboundBroadcasterDetails.go

@ -4,9 +4,9 @@ import ( @@ -4,9 +4,9 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/controllers"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/controllers"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/models"
)
// GetInboundBroadasterDetails gets the details of the inbound broadcaster

2
controllers/admin/serverConfig.go

@ -4,7 +4,7 @@ import ( @@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/config"
"github.com/owncast/owncast/config"
)
// GetServerConfig gets the config details of the server

2
controllers/admin/viewers.go

@ -4,7 +4,7 @@ import ( @@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/metrics"
"github.com/owncast/owncast/metrics"
)
// GetViewersOverTime will return the number of viewers at points in time

6
controllers/chat.go

@ -4,9 +4,9 @@ import ( @@ -4,9 +4,9 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/router/middleware"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/router/middleware"
)
//GetChatMessages gets all of the chat messages

4
controllers/config.go

@ -4,8 +4,8 @@ import ( @@ -4,8 +4,8 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/router/middleware"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/router/middleware"
)
//GetWebConfig gets the status of the server

2
controllers/controllers.go

@ -4,7 +4,7 @@ import ( @@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/models"
)
type j map[string]interface{}

4
controllers/emoji.go

@ -8,8 +8,8 @@ import ( @@ -8,8 +8,8 @@ import (
"path/filepath"
"strings"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
log "github.com/sirupsen/logrus"
)

8
controllers/index.go

@ -11,10 +11,10 @@ import ( @@ -11,10 +11,10 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/router/middleware"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/router/middleware"
"github.com/owncast/owncast/utils"
)
type MetadataPage struct {

4
controllers/status.go

@ -4,8 +4,8 @@ import ( @@ -4,8 +4,8 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/router/middleware"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/router/middleware"
)
//GetStatus gets the status of the server

2
core/chat/chat.go

@ -4,7 +4,7 @@ import ( @@ -4,7 +4,7 @@ import (
"errors"
"time"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/models"
)
//Setup sets up the chat server

4
core/chat/client.go

@ -9,8 +9,8 @@ import ( @@ -9,8 +9,8 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/net/websocket"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
"github.com/teris-io/shortid"
)

6
core/chat/persistence.go

@ -5,9 +5,9 @@ import ( @@ -5,9 +5,9 @@ import (
"os"
"time"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
_ "github.com/mattn/go-sqlite3"
log "github.com/sirupsen/logrus"
)

4
core/chat/server.go

@ -8,8 +8,8 @@ import ( @@ -8,8 +8,8 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/net/websocket"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
)
var (

4
core/chatListener.go

@ -3,8 +3,8 @@ package core @@ -3,8 +3,8 @@ package core
import (
"errors"
"github.com/gabek/owncast/core/chat"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/core/chat"
"github.com/owncast/owncast/models"
)
//ChatListenerImpl the implementation of the chat client

12
core/core.go

@ -9,12 +9,12 @@ import ( @@ -9,12 +9,12 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core/chat"
"github.com/gabek/owncast/core/ffmpeg"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/gabek/owncast/yp"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core/chat"
"github.com/owncast/owncast/core/ffmpeg"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
"github.com/owncast/owncast/yp"
)
var (

2
core/ffmpeg/ffmpeg.go

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
package ffmpeg
import (
"github.com/gabek/owncast/config"
"github.com/owncast/owncast/config"
)
//ShowStreamOfflineState generates and shows the stream's offline state

2
core/ffmpeg/thumbnailGenerator.go

@ -10,7 +10,7 @@ import ( @@ -10,7 +10,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/owncast/owncast/config"
)
//StartThumbnailGenerator starts generating thumbnails

4
core/ffmpeg/transcoder.go

@ -10,8 +10,8 @@ import ( @@ -10,8 +10,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/teris-io/shortid"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/utils"
)
var _commandExec *exec.Cmd

6
core/playlist/monitor.go

@ -12,9 +12,9 @@ import ( @@ -12,9 +12,9 @@ import (
"github.com/radovskyb/watcher"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
)
var (

10
core/rtmp/rtmp.go

@ -14,11 +14,11 @@ import ( @@ -14,11 +14,11 @@ import (
"github.com/nareix/joy5/format/flv/flvio"
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/core/ffmpeg"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/core/ffmpeg"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
"github.com/nareix/joy5/format/rtmp"
)

2
core/rtmp/utils.go

@ -6,7 +6,7 @@ import ( @@ -6,7 +6,7 @@ import (
"fmt"
"regexp"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/models"
"github.com/nareix/joy5/format/flv/flvio"
)

6
core/stats.go

@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
)
const (

8
core/status.go

@ -3,10 +3,10 @@ package core @@ -3,10 +3,10 @@ package core
import (
"time"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core/ffmpeg"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core/ffmpeg"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
)
//GetStatus gets the status of the system

6
core/storage.go

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package core
import (
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core/playlist"
"github.com/gabek/owncast/core/storageproviders"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core/playlist"
"github.com/owncast/owncast/core/storageproviders"
)
var (

4
core/storageproviders/s3Storage.go

@ -13,8 +13,8 @@ import ( @@ -13,8 +13,8 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
)
//S3Storage is the s3 implementation of the ChunkStorageProvider

2
go.mod

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
module github.com/gabek/owncast
module github.com/owncast/owncast
go 1.14

8
main.go

@ -7,10 +7,10 @@ import ( @@ -7,10 +7,10 @@ import (
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/metrics"
"github.com/gabek/owncast/router"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/metrics"
"github.com/owncast/owncast/router"
)
// the following are injected at build-time

2
metrics/viewers.go

@ -3,7 +3,7 @@ package metrics @@ -3,7 +3,7 @@ package metrics
import (
"time"
"github.com/gabek/owncast/core"
"github.com/owncast/owncast/core"
)
// How often we poll for updates

2
models/stats.go

@ -3,7 +3,7 @@ package models @@ -3,7 +3,7 @@ package models
import (
"time"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/utils"
)
//Stats holds the stats for the system

2
models/status.go

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package models
import "github.com/gabek/owncast/utils"
import "github.com/owncast/owncast/utils"
//Status represents the status of the system
type Status struct {

2
router/middleware/auth.go

@ -4,7 +4,7 @@ import ( @@ -4,7 +4,7 @@ import (
"crypto/subtle"
"net/http"
"github.com/gabek/owncast/config"
"github.com/owncast/owncast/config"
log "github.com/sirupsen/logrus"
)

16
router/router.go

@ -6,14 +6,14 @@ import ( @@ -6,14 +6,14 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/controllers"
"github.com/gabek/owncast/controllers/admin"
"github.com/gabek/owncast/core/chat"
"github.com/gabek/owncast/core/rtmp"
"github.com/gabek/owncast/router/middleware"
"github.com/gabek/owncast/yp"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/controllers"
"github.com/owncast/owncast/controllers/admin"
"github.com/owncast/owncast/core/chat"
"github.com/owncast/owncast/core/rtmp"
"github.com/owncast/owncast/router/middleware"
"github.com/owncast/owncast/yp"
)
//Start starts the router for the http, ws, and rtmp

8
scripts/build.sh

@ -52,7 +52,7 @@ build() { @@ -52,7 +52,7 @@ build() {
pushd dist/${NAME} >> /dev/null
CGO_ENABLED=1 ~/go/bin/xgo --branch ${GIT_BRANCH} -ldflags "-s -w -X main.GitCommit=${GIT_COMMIT} -X main.BuildVersion=${VERSION} -X main.BuildType=${NAME}" -targets "${OS}/${ARCH}" github.com/gabek/owncast
CGO_ENABLED=1 ~/go/bin/xgo --branch ${GIT_BRANCH} -ldflags "-s -w -X main.GitCommit=${GIT_COMMIT} -X main.BuildVersion=${VERSION} -X main.BuildType=${NAME}" -targets "${OS}/${ARCH}" github.com/owncast/owncast
mv owncast-*-${ARCH} owncast
zip -r -q -8 ../owncast-$NAME-$VERSION.zip .
@ -76,7 +76,7 @@ git tag -a "v${VERSION}" -m "Release build v${VERSION}" @@ -76,7 +76,7 @@ git tag -a "v${VERSION}" -m "Release build v${VERSION}"
# On macOS open the Github page for new releases so they can be uploaded
if test -f "/usr/bin/open"; then
open "https://github.com/gabek/owncast/releases/new"
open "https://github.com/owncast/owncast/releases/new"
open dist
fi
@ -90,8 +90,8 @@ cd $(git rev-parse --show-toplevel) @@ -90,8 +90,8 @@ cd $(git rev-parse --show-toplevel)
# Github Packages
docker build --build-arg NAME=docker --build-arg VERSION=${VERSION} --build-arg GIT_COMMIT=$GIT_COMMIT -t owncast . -f scripts/Dockerfile-build
docker tag $DOCKER_IMAGE docker.pkg.github.com/gabek/owncast/$DOCKER_IMAGE:$VERSION
docker push docker.pkg.github.com/gabek/owncast/$DOCKER_IMAGE:$VERSION
docker tag $DOCKER_IMAGE docker.pkg.github.com/owncast/owncast/$DOCKER_IMAGE:$VERSION
docker push docker.pkg.github.com/owncast/owncast/$DOCKER_IMAGE:$VERSION
#
# Dockerhub
# You must be authenticated via `docker login` with your Dockerhub credentials first.

4
yp/api.go

@ -4,8 +4,8 @@ import ( @@ -4,8 +4,8 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/utils"
)
type ypDetailsResponse struct {

4
yp/yp.go

@ -9,8 +9,8 @@ import ( @@ -9,8 +9,8 @@ import (
"encoding/json"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
log "github.com/sirupsen/logrus"
)

Loading…
Cancel
Save