Fix import paths

This commit is contained in:
James Mills 2021-07-13 08:34:56 +10:00
parent e743a9a425
commit 5c2b402a8a
No known key found for this signature in database
GPG key ID: AC4C014F1440EBD6
11 changed files with 21 additions and 21 deletions

View file

@ -2,7 +2,7 @@
builds: builds:
- -
flags: -tags "static_build" 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: env:
- CGO_ENABLED=0 - CGO_ENABLED=0
goos: goos:

View file

@ -36,7 +36,7 @@ Open http://127.0.0.1:8000/ in your Browser!
### Using a Binary ### Using a Binary
1. Go grab the latest binary from the 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. platform / operating system.
2. Extract the archive. 2. Extract the archive.
3. Run `./tube` 3. Run `./tube`
@ -57,7 +57,7 @@ Where `DOCKER_MACHINE_IP` is the IP Address of your Docker Node.
### From Source ### From Source
```#!sh ```#!sh
$ git clone https://github.com/prologic/tube $ git clone https://git.mills.io/prologic/tube
$ cd tube $ cd tube
$ make $ make
$ ./tube $ ./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 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 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! or advice or contact the author directly!
## Configuration ## 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 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. 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/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) [![](https://sourcerer.io/fame/prologic/prologic/tube/images/1)](https://sourcerer.io/fame/prologic/prologic/tube/links/1)

View file

@ -20,9 +20,9 @@ import (
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/gorilla/mux" "github.com/gorilla/mux"
shortuuid "github.com/lithammer/shortuuid/v3" shortuuid "github.com/lithammer/shortuuid/v3"
"github.com/prologic/tube/importers" "git.mills.io/prologic/tube/importers"
"github.com/prologic/tube/media" "git.mills.io/prologic/tube/media"
"github.com/prologic/tube/utils" "git.mills.io/prologic/tube/utils"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

View file

@ -6,7 +6,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/prologic/bitcask" "git.mills.io/prologic/bitcask"
) )
// BitcaskStore ... // BitcaskStore ...

View file

@ -14,7 +14,7 @@ func init() {
Filename: "base.html", Filename: "base.html",
FileModTime: time.Unix(1623157014, 0), FileModTime: time.Unix(1623157014, 0),
Content: string("{{define \"base\"}}\r\n{{ $playing := .Playing }}\r\n{{ $config := .Config }}\r\n<!DOCTYPE html>\r\n<html lang=\"en\" prefix=\"og: https://ogp.me/ns#\">\r\n <head>\r\n <meta charset=\"utf-8\">\r\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\r\n <link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/static/favicon.ico\">\r\n <link rel=\"stylesheet\" href=\"https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css\">\r\n <link rel=\"stylesheet\" type=\"text/css\" href=\"/static/theme.css\">\r\n <link rel=\"stylesheet\" type=\"text/css\" href=\"/static/upload.css\">\r\n <link rel=\"stylesheet\" type=\"text/css\" href=\"/static/import.css\">\r\n\r\n {{if $playing.ID}}\r\n <meta property=\"og:title\" content=\"{{$playing.Title}}\"/>\r\n <meta property=\"og:type\" content=\"video.other\"/>\r\n <meta property=\"og:image\" content=\"/t/{{ $playing.ID}}\"/>\r\n <meta property=\"og:video\" content=\"/v/{{ $playing.ID }}.mp4\">\r\n <meta property=\"og:video:url\" content=\"/v/{{ $playing.ID }}.mp4\">\r\n <meta property=\"og:video:secure_url\" content=\"/v/{{ $playing.ID }}.mp4\">\r\n <meta property=\"og:description\" content=\"{{$playing.Description}}\"/>\r\n <meta property=\"og:site_name\" content=\"Tube\"/>\r\n <meta property=\"og:url\" content=\"/v/{{ $playing.ID }}\"/>\r\n {{end}}\r\n\r\n {{ template \"stylesheets\" . }}\r\n {{ template \"css\" . }}\r\n <title>Tube</title>\r\n </head>\r\n<body>\r\n <nav>\r\n <a href=\"/\">Tube</a>\r\n <a class=\"centered\" style=\"text-indent: 0;\" href=\"/upload\">Upload</a>\r\n </nav>\r\n <main>\r\n {{template \"content\" .}}\r\n </main>\r\n <footer>\r\n <p><a href=\"https://github.com/prologic/tube\">Tube</a> is CopyRight © 2020 <a href=\"https://github.com/prologic\">James Mills / prologic</a>. All Rights Reserved.</p>\r\n {{if .Config.Copyright.Content}}<p>{{ $config.Copyright.Content }}</p>{{end}}\r\n </footer>\r\n</body>\r\n{{ template \"scripts\" . }}\r\n</html>\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<!DOCTYPE html>\r\n<html lang=\"en\" prefix=\"og: https://ogp.me/ns#\">\r\n <head>\r\n <meta charset=\"utf-8\">\r\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\r\n <link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/static/favicon.ico\">\r\n <link rel=\"stylesheet\" href=\"https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css\">\r\n <link rel=\"stylesheet\" type=\"text/css\" href=\"/static/theme.css\">\r\n <link rel=\"stylesheet\" type=\"text/css\" href=\"/static/upload.css\">\r\n <link rel=\"stylesheet\" type=\"text/css\" href=\"/static/import.css\">\r\n\r\n {{if $playing.ID}}\r\n <meta property=\"og:title\" content=\"{{$playing.Title}}\"/>\r\n <meta property=\"og:type\" content=\"video.other\"/>\r\n <meta property=\"og:image\" content=\"/t/{{ $playing.ID}}\"/>\r\n <meta property=\"og:video\" content=\"/v/{{ $playing.ID }}.mp4\">\r\n <meta property=\"og:video:url\" content=\"/v/{{ $playing.ID }}.mp4\">\r\n <meta property=\"og:video:secure_url\" content=\"/v/{{ $playing.ID }}.mp4\">\r\n <meta property=\"og:description\" content=\"{{$playing.Description}}\"/>\r\n <meta property=\"og:site_name\" content=\"Tube\"/>\r\n <meta property=\"og:url\" content=\"/v/{{ $playing.ID }}\"/>\r\n {{end}}\r\n\r\n {{ template \"stylesheets\" . }}\r\n {{ template \"css\" . }}\r\n <title>Tube</title>\r\n </head>\r\n<body>\r\n <nav>\r\n <a href=\"/\">Tube</a>\r\n <a class=\"centered\" style=\"text-indent: 0;\" href=\"/upload\">Upload</a>\r\n </nav>\r\n <main>\r\n {{template \"content\" .}}\r\n </main>\r\n <footer>\r\n <p><a href=\"https://git.mills.io/prologic/tube\">Tube</a> is CopyRight © 2020 <a href=\"https://git.mills.io/prologic\">James Mills / prologic</a>. All Rights Reserved.</p>\r\n {{if .Config.Copyright.Content}}<p>{{ $config.Copyright.Content }}</p>{{end}}\r\n </footer>\r\n</body>\r\n{{ template \"scripts\" . }}\r\n</html>\r\n{{end}}\r\n{{ define \"css\" }}{{ end }}\r\n{{ define \"scripts\" }}{{ end }}\r\n{{ define \"stylesheets\" }}{{ end }}\r\n"),
} }
file3 := &embedded.EmbeddedFile{ file3 := &embedded.EmbeddedFile{
Filename: "import.html", Filename: "import.html",

6
go.mod
View file

@ -1,4 +1,4 @@
module github.com/prologic/tube module git.mills.io/prologic/tube
go 1.16 go 1.16
@ -11,8 +11,8 @@ require (
github.com/gorilla/handlers v1.5.1 github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0 github.com/gorilla/mux v1.8.0
github.com/lithammer/shortuuid/v3 v3.0.7 github.com/lithammer/shortuuid/v3 v3.0.7
github.com/prologic/bitcask v0.3.10 git.mills.io/prologic/bitcask v0.3.10
github.com/prologic/vimeodl v0.0.0-20200328030915-d2b0e6272c23 git.mills.io/prologic/vimeodl v0.0.0-20200328030915-d2b0e6272c23
github.com/sirupsen/logrus v1.8.1 github.com/sirupsen/logrus v1.8.1
github.com/spf13/pflag v1.0.5 github.com/spf13/pflag v1.0.5
github.com/wybiral/feeds v1.1.1 github.com/wybiral/feeds v1.1.1

8
go.sum
View file

@ -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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/prologic/bitcask v0.3.10 h1:HXygU8zCvW5gLpZ8aQECPk5iV/YQ3hcqdg/zVeES6s0= git.mills.io/prologic/bitcask v0.3.10 h1:HXygU8zCvW5gLpZ8aQECPk5iV/YQ3hcqdg/zVeES6s0=
github.com/prologic/bitcask v0.3.10/go.mod h1:8RKJdbHLE7HFGLYSGu9slnYXSV7DMIucwVkaIYOk9GY= git.mills.io/prologic/bitcask v0.3.10/go.mod h1:8RKJdbHLE7HFGLYSGu9slnYXSV7DMIucwVkaIYOk9GY=
github.com/prologic/vimeodl v0.0.0-20200328030915-d2b0e6272c23 h1:2iUEG1ZXpjBoq11gFdlWOJStBN/3aW3MlY0V5QONZas= git.mills.io/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/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.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_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=

View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/prologic/vimeodl" "git.mills.io/prologic/vimeodl"
) )
type VimeoImporter struct{} type VimeoImporter struct{}

View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/prologic/tube/app" "git.mills.io/prologic/tube/app"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
flag "github.com/spf13/pflag" flag "github.com/spf13/pflag"
) )

View file

@ -10,7 +10,7 @@ import (
"time" "time"
"github.com/dhowden/tag" "github.com/dhowden/tag"
"github.com/prologic/tube/utils" "git.mills.io/prologic/tube/utils"
) )
// Video represents metadata for a single video. // Video represents metadata for a single video.

View file

@ -37,7 +37,7 @@
{{template "content" .}} {{template "content" .}}
</main> </main>
<footer> <footer>
<p><a href="https://github.com/prologic/tube">Tube</a> is CopyRight © 2020 <a href="https://github.com/prologic">James Mills / prologic</a>. All Rights Reserved.</p> <p><a href="https://git.mills.io/prologic/tube">Tube</a> is CopyRight © 2020 <a href="https://git.mills.io/prologic">James Mills / prologic</a>. All Rights Reserved.</p>
{{if .Config.Copyright.Content}}<p>{{ $config.Copyright.Content }}</p>{{end}} {{if .Config.Copyright.Content}}<p>{{ $config.Copyright.Content }}</p>{{end}}
</footer> </footer>
</body> </body>