From 65a0aa8ae8561ec060114eeabcb7e08558c3fe1e Mon Sep 17 00:00:00 2001 From: garionion Date: Sat, 22 May 2021 11:37:14 +0200 Subject: [PATCH] change repo to git.entr0py.de --- api/PlayoutService.pb.go | 39 +++++++++++++++-------------------- api/PlayoutService.proto | 2 +- api/PlayoutService_grpc.pb.go | 8 +++++-- go.mod | 4 ++-- go.sum | 7 ------- main.go | 6 +++--- playout/playout.go | 2 +- store/store.go | 2 +- 8 files changed, 31 insertions(+), 39 deletions(-) diff --git a/api/PlayoutService.pb.go b/api/PlayoutService.pb.go index 7ad3477..6c3c3bd 100644 --- a/api/PlayoutService.pb.go +++ b/api/PlayoutService.pb.go @@ -1,16 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.12.4 +// protoc-gen-go v1.26.0 +// protoc v3.16.0 // source: api/PlayoutService.proto package api import ( - proto "github.com/golang/protobuf/proto" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -22,20 +21,16 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Job struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - StartAt *timestamp.Timestamp `protobuf:"bytes,1,opt,name=StartAt,proto3" json:"StartAt,omitempty"` - StopAt *timestamp.Timestamp `protobuf:"bytes,2,opt,name=StopAt,proto3" json:"StopAt,omitempty"` - Source string `protobuf:"bytes,3,opt,name=Source,proto3" json:"Source,omitempty"` - ID int64 `protobuf:"varint,4,opt,name=ID,proto3" json:"ID,omitempty"` - Version string `protobuf:"bytes,5,opt,name=Version,proto3" json:"Version,omitempty"` + StartAt *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=StartAt,proto3" json:"StartAt,omitempty"` + StopAt *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=StopAt,proto3" json:"StopAt,omitempty"` + Source string `protobuf:"bytes,3,opt,name=Source,proto3" json:"Source,omitempty"` + ID int64 `protobuf:"varint,4,opt,name=ID,proto3" json:"ID,omitempty"` + Version string `protobuf:"bytes,5,opt,name=Version,proto3" json:"Version,omitempty"` } func (x *Job) Reset() { @@ -70,14 +65,14 @@ func (*Job) Descriptor() ([]byte, []int) { return file_api_PlayoutService_proto_rawDescGZIP(), []int{0} } -func (x *Job) GetStartAt() *timestamp.Timestamp { +func (x *Job) GetStartAt() *timestamppb.Timestamp { if x != nil { return x.StartAt } return nil } -func (x *Job) GetStopAt() *timestamp.Timestamp { +func (x *Job) GetStopAt() *timestamppb.Timestamp { if x != nil { return x.StopAt } @@ -204,10 +199,10 @@ var file_api_PlayoutService_proto_rawDesc = []byte{ 0x74, 0x12, 0x30, 0x0a, 0x0f, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x50, 0x6c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x12, 0x08, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x4a, 0x6f, 0x62, 0x1a, 0x11, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x64, 0x4a, 0x6f, - 0x62, 0x22, 0x00, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x47, 0x61, 0x72, 0x69, 0x6f, 0x6e, 0x69, 0x6f, 0x6e, 0x2f, 0x66, 0x66, 0x6d, 0x70, - 0x65, 0x67, 0x2d, 0x70, 0x6c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x62, 0x22, 0x00, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x2e, 0x65, 0x6e, 0x74, 0x72, 0x30, + 0x70, 0x79, 0x2e, 0x64, 0x65, 0x2f, 0x67, 0x61, 0x72, 0x69, 0x6f, 0x6e, 0x69, 0x6f, 0x6e, 0x2f, + 0x66, 0x66, 0x6d, 0x70, 0x65, 0x67, 0x2d, 0x70, 0x6c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x2f, 0x61, + 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -224,9 +219,9 @@ func file_api_PlayoutService_proto_rawDescGZIP() []byte { var file_api_PlayoutService_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_api_PlayoutService_proto_goTypes = []interface{}{ - (*Job)(nil), // 0: api.Job - (*ScheduledJob)(nil), // 1: api.ScheduledJob - (*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp + (*Job)(nil), // 0: api.Job + (*ScheduledJob)(nil), // 1: api.ScheduledJob + (*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp } var file_api_PlayoutService_proto_depIdxs = []int32{ 2, // 0: api.Job.StartAt:type_name -> google.protobuf.Timestamp diff --git a/api/PlayoutService.proto b/api/PlayoutService.proto index 55841e1..02a6e00 100644 --- a/api/PlayoutService.proto +++ b/api/PlayoutService.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/Garionion/ffmpeg-playout/api"; +option go_package = "git.entr0py.de/garionion/ffmpeg-playout/api"; package api; diff --git a/api/PlayoutService_grpc.pb.go b/api/PlayoutService_grpc.pb.go index 548931d..ef001c4 100644 --- a/api/PlayoutService_grpc.pb.go +++ b/api/PlayoutService_grpc.pb.go @@ -11,6 +11,7 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 // PlayoutClient is the client API for Playout service. @@ -62,7 +63,7 @@ type UnsafePlayoutServer interface { } func RegisterPlayoutServer(s grpc.ServiceRegistrar, srv PlayoutServer) { - s.RegisterService(&_Playout_serviceDesc, srv) + s.RegisterService(&Playout_ServiceDesc, srv) } func _Playout_SchedulePlayout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { @@ -83,7 +84,10 @@ func _Playout_SchedulePlayout_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -var _Playout_serviceDesc = grpc.ServiceDesc{ +// Playout_ServiceDesc is the grpc.ServiceDesc for Playout service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var Playout_ServiceDesc = grpc.ServiceDesc{ ServiceName: "api.Playout", HandlerType: (*PlayoutServer)(nil), Methods: []grpc.MethodDesc{ diff --git a/go.mod b/go.mod index dcda80f..6c6a674 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module github.com/Garionion/ffmpeg-playout +module git.entr0py.de/garionion/ffmpeg-playout go 1.15 require ( github.com/fsnotify/fsnotify v1.4.9 - github.com/golang/protobuf v1.4.3 + github.com/golang/protobuf v1.4.3 // indirect github.com/grafov/bcast v0.0.0-20190217190352-1447f067e08d github.com/ilyakaznacheev/cleanenv v1.2.5 golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect diff --git a/go.sum b/go.sum index fe5fc66..509e793 100644 --- a/go.sum +++ b/go.sum @@ -21,7 +21,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= @@ -38,11 +37,9 @@ github.com/ilyakaznacheev/cleanenv v1.2.5 h1:/SlcF9GaIvefWqFJzsccGG/NJdoaAwb7Mm7 github.com/ilyakaznacheev/cleanenv v1.2.5/go.mod h1:/i3yhzwZ3s7hacNERGFwvlhwXMDcaqwIzmayEhbRplk= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -66,7 +63,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201223074533-0d417f636930 h1:vRgIt+nup/B/BwIS0g2oC0haq0iqbV3ZA+u6+0TlNCo= golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= @@ -82,7 +78,6 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d h1:HV9Z9qMhQEsdlvxNFELgQ11RkMzO3CMkjEySjCtuLes= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -107,13 +102,11 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fatih/set.v0 v0.2.1 h1:Xvyyp7LXu34P0ROhCyfXkmQCAoOUKb1E2JS9I7SE5CY= gopkg.in/fatih/set.v0 v0.2.1/go.mod h1:5eLWEndGL4zGGemXWrKuts+wTJR0y+w+auqUJZbmyBg= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -olympos.io/encoding/edn v0.0.0-20200308123125-93e3b8dd0e24 h1:sreVOrDp0/ezb0CHKVek/l7YwpxPJqv+jT3izfSphA4= olympos.io/encoding/edn v0.0.0-20200308123125-93e3b8dd0e24/go.mod h1:oVgVk4OWVDi43qWBEyGhXgYxt7+ED4iYNpTngSLX2Iw= olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 h1:slmdOY3vp8a7KQbHkL+FLbvbkgMqmXojpFUO/jENuqQ= olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3/go.mod h1:oVgVk4OWVDi43qWBEyGhXgYxt7+ED4iYNpTngSLX2Iw= diff --git a/main.go b/main.go index 680fe2b..85ae81d 100644 --- a/main.go +++ b/main.go @@ -4,9 +4,9 @@ import ( "context" "errors" "fmt" - "github.com/Garionion/ffmpeg-playout/api" - "github.com/Garionion/ffmpeg-playout/playout" - "github.com/Garionion/ffmpeg-playout/store" + "git.entr0py.de/garionion/ffmpeg-playout/api" + "git.entr0py.de/garionion/ffmpeg-playout/playout" + "git.entr0py.de/garionion/ffmpeg-playout/store" "github.com/ilyakaznacheev/cleanenv" "google.golang.org/grpc" "log" diff --git a/playout/playout.go b/playout/playout.go index 5e77fcc..81c23d9 100644 --- a/playout/playout.go +++ b/playout/playout.go @@ -3,7 +3,7 @@ package playout import ( "bytes" "fmt" - "github.com/Garionion/ffmpeg-playout/status" + "git.entr0py.de/garionion/ffmpeg-playout/status" "github.com/grafov/bcast" "log" "net/http" diff --git a/store/store.go b/store/store.go index debb1f6..ead8841 100644 --- a/store/store.go +++ b/store/store.go @@ -2,7 +2,7 @@ package store import ( "errors" - "github.com/Garionion/ffmpeg-playout/playout" + "git.entr0py.de/garionion/ffmpeg-playout/playout" "log" "sync" "time"