From 5c2b402a8aaa2d1693f64f2ca6576597bf28b339 Mon Sep 17 00:00:00 2001 From: James Mills Date: Tue, 13 Jul 2021 08:34:56 +1000 Subject: [PATCH] Fix import paths --- .goreleaser.yml | 2 +- README.md | 8 ++++---- app/app.go | 6 +++--- app/bitcask_store.go | 2 +- app/rice-box.go | 2 +- go.mod | 6 +++--- go.sum | 8 ++++---- importers/vimeo_importer.go | 2 +- main.go | 2 +- media/video.go | 2 +- templates/base.html | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index edb1170..0e54a2f 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -2,7 +2,7 @@ builds: - flags: -tags "static_build" - ldflags: -w -X github.com/prologic/tube/.Version={{.Version}} -X github.com/prologic/tube/.Commit={{.Commit}} + ldflags: -w -X git.mills.io/prologic/tube/.Version={{.Version}} -X git.mills.io/prologic/tube/.Commit={{.Commit}} env: - CGO_ENABLED=0 goos: diff --git a/README.md b/README.md index 3f48ebf..862087f 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Open http://127.0.0.1:8000/ in your Browser! ### Using a Binary 1. Go grab the latest binary from the - [Releases](https://github.com/prologic/tube/releases) page for your + [Releases](https://git.mills.io/prologic/tube/releases) page for your platform / operating system. 2. Extract the archive. 3. Run `./tube` @@ -57,7 +57,7 @@ Where `DOCKER_MACHINE_IP` is the IP Address of your Docker Node. ### From Source ```#!sh -$ git clone https://github.com/prologic/tube +$ git clone https://git.mills.io/prologic/tube $ cd tube $ make $ ./tube @@ -73,7 +73,7 @@ similiar to the one you can find in the repo: [docker-compose.yml](docker-compos Beyond this a "Production Deployment" is out-of-scope at this time for the documentation being provided here. Please don't hesitate to file an -[Issue](https://github.com/prologic/tube/issues/new) however for ask for help +[Issue](https://git.mills.io/prologic/tube/issues/new) however for ask for help or advice or contact the author directly! ## Configuration @@ -232,7 +232,7 @@ and even fix tiny typos in documentation! Thank you and keep contributing! You can find an [AUTHORS](/AUTHORS) file where we keep a list of contributors to the project. If you contriibute a PR please consider adding your name there. -There is also Github's own [Contributors](https://github.com/prologic/tube/graphs/contributors) statistics. +There is also Github's own [Contributors](https://git.mills.io/prologic/tube/graphs/contributors) statistics. [![](https://sourcerer.io/fame/prologic/prologic/tube/images/0)](https://sourcerer.io/fame/prologic/prologic/tube/links/0) [![](https://sourcerer.io/fame/prologic/prologic/tube/images/1)](https://sourcerer.io/fame/prologic/prologic/tube/links/1) diff --git a/app/app.go b/app/app.go index 783cd7f..26a6405 100644 --- a/app/app.go +++ b/app/app.go @@ -20,9 +20,9 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" shortuuid "github.com/lithammer/shortuuid/v3" - "github.com/prologic/tube/importers" - "github.com/prologic/tube/media" - "github.com/prologic/tube/utils" + "git.mills.io/prologic/tube/importers" + "git.mills.io/prologic/tube/media" + "git.mills.io/prologic/tube/utils" log "github.com/sirupsen/logrus" ) diff --git a/app/bitcask_store.go b/app/bitcask_store.go index 0c6e897..2c957c7 100644 --- a/app/bitcask_store.go +++ b/app/bitcask_store.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/prologic/bitcask" + "git.mills.io/prologic/bitcask" ) // BitcaskStore ... diff --git a/app/rice-box.go b/app/rice-box.go index 68b6491..4920996 100644 --- a/app/rice-box.go +++ b/app/rice-box.go @@ -14,7 +14,7 @@ func init() { Filename: "base.html", FileModTime: time.Unix(1623157014, 0), - Content: string("{{define \"base\"}}\r\n{{ $playing := .Playing }}\r\n{{ $config := .Config }}\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n {{if $playing.ID}}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {{end}}\r\n\r\n {{ template \"stylesheets\" . }}\r\n {{ template \"css\" . }}\r\n Tube\r\n \r\n\r\n \r\n
\r\n {{template \"content\" .}}\r\n
\r\n \r\n\r\n{{ template \"scripts\" . }}\r\n\r\n{{end}}\r\n{{ define \"css\" }}{{ end }}\r\n{{ define \"scripts\" }}{{ end }}\r\n{{ define \"stylesheets\" }}{{ end }}\r\n"), + Content: string("{{define \"base\"}}\r\n{{ $playing := .Playing }}\r\n{{ $config := .Config }}\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n {{if $playing.ID}}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {{end}}\r\n\r\n {{ template \"stylesheets\" . }}\r\n {{ template \"css\" . }}\r\n Tube\r\n \r\n\r\n \r\n
\r\n {{template \"content\" .}}\r\n
\r\n \r\n\r\n{{ template \"scripts\" . }}\r\n\r\n{{end}}\r\n{{ define \"css\" }}{{ end }}\r\n{{ define \"scripts\" }}{{ end }}\r\n{{ define \"stylesheets\" }}{{ end }}\r\n"), } file3 := &embedded.EmbeddedFile{ Filename: "import.html", diff --git a/go.mod b/go.mod index 3a84cab..7aed13b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/prologic/tube +module git.mills.io/prologic/tube go 1.16 @@ -11,8 +11,8 @@ require ( github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.8.0 github.com/lithammer/shortuuid/v3 v3.0.7 - github.com/prologic/bitcask v0.3.10 - github.com/prologic/vimeodl v0.0.0-20200328030915-d2b0e6272c23 + git.mills.io/prologic/bitcask v0.3.10 + git.mills.io/prologic/vimeodl v0.0.0-20200328030915-d2b0e6272c23 github.com/sirupsen/logrus v1.8.1 github.com/spf13/pflag v1.0.5 github.com/wybiral/feeds v1.1.1 diff --git a/go.sum b/go.sum index fb6790e..c0c5791 100644 --- a/go.sum +++ b/go.sum @@ -175,10 +175,10 @@ github.com/plar/go-adaptive-radix-tree v1.0.4/go.mod h1:Ot8d28EII3i7Lv4PSvBlF8ej github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prologic/bitcask v0.3.10 h1:HXygU8zCvW5gLpZ8aQECPk5iV/YQ3hcqdg/zVeES6s0= -github.com/prologic/bitcask v0.3.10/go.mod h1:8RKJdbHLE7HFGLYSGu9slnYXSV7DMIucwVkaIYOk9GY= -github.com/prologic/vimeodl v0.0.0-20200328030915-d2b0e6272c23 h1:2iUEG1ZXpjBoq11gFdlWOJStBN/3aW3MlY0V5QONZas= -github.com/prologic/vimeodl v0.0.0-20200328030915-d2b0e6272c23/go.mod h1:uG4Pdd9lZNNkvQHFr70+Qi7im3/YYnBOtUCrqyZKwlw= +git.mills.io/prologic/bitcask v0.3.10 h1:HXygU8zCvW5gLpZ8aQECPk5iV/YQ3hcqdg/zVeES6s0= +git.mills.io/prologic/bitcask v0.3.10/go.mod h1:8RKJdbHLE7HFGLYSGu9slnYXSV7DMIucwVkaIYOk9GY= +git.mills.io/prologic/vimeodl v0.0.0-20200328030915-d2b0e6272c23 h1:2iUEG1ZXpjBoq11gFdlWOJStBN/3aW3MlY0V5QONZas= +git.mills.io/prologic/vimeodl v0.0.0-20200328030915-d2b0e6272c23/go.mod h1:uG4Pdd9lZNNkvQHFr70+Qi7im3/YYnBOtUCrqyZKwlw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= diff --git a/importers/vimeo_importer.go b/importers/vimeo_importer.go index ad21bcc..0efec7f 100644 --- a/importers/vimeo_importer.go +++ b/importers/vimeo_importer.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/prologic/vimeodl" + "git.mills.io/prologic/vimeodl" ) type VimeoImporter struct{} diff --git a/main.go b/main.go index 8500645..ae23f86 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/prologic/tube/app" + "git.mills.io/prologic/tube/app" log "github.com/sirupsen/logrus" flag "github.com/spf13/pflag" ) diff --git a/media/video.go b/media/video.go index 4a24eef..8bf1a05 100644 --- a/media/video.go +++ b/media/video.go @@ -10,7 +10,7 @@ import ( "time" "github.com/dhowden/tag" - "github.com/prologic/tube/utils" + "git.mills.io/prologic/tube/utils" ) // Video represents metadata for a single video. diff --git a/templates/base.html b/templates/base.html index 8f30aad..d0ba6ef 100644 --- a/templates/base.html +++ b/templates/base.html @@ -37,7 +37,7 @@ {{template "content" .}}