generated from VLADIMIR/template
fix
This commit is contained in:
@@ -24,4 +24,4 @@ build-linux:
|
|||||||
-v "$$PWD":/app \
|
-v "$$PWD":/app \
|
||||||
-w /app \
|
-w /app \
|
||||||
my-go-builder sh -c \
|
my-go-builder sh -c \
|
||||||
"CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -o bin/pinned_message_linux_arm64 cmd/pinned_message/main.go"
|
"CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o bin/pinned_message_linux_arm64 ./cmd/pinned_message/main.go"
|
||||||
Binary file not shown.
@@ -14,12 +14,12 @@ import (
|
|||||||
|
|
||||||
type performance struct {
|
type performance struct {
|
||||||
Date string `csv:"ДАТА"`
|
Date string `csv:"ДАТА"`
|
||||||
Day string `csv:"день недели"`
|
Day string `csv:"ДЕНЬ НЕДЕЛИ"`
|
||||||
Name string `csv:"НАЗВАНИЕ"`
|
Name string `csv:"НАЗВАНИЕ"`
|
||||||
Place string `csv:"МЕСТО"`
|
Place string `csv:"МЕСТО"`
|
||||||
TimeCollection string `csv:"время СБОРА (для концерта)"`
|
TimeCollection string `csv:"ВРЕМЯ СБОРА (для концерта)"`
|
||||||
TimeStart string `csv:"время НАЧАЛА"`
|
TimeStart string `csv:"время НАЧАЛА"`
|
||||||
Numbers string `csv:"ЧТО ТАНЦУЕМ"`
|
Numbers string `csv:"НОМЕР"`
|
||||||
Costumes string `csv:"КОСТЮМЫ"`
|
Costumes string `csv:"КОСТЮМЫ"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,7 +45,7 @@ func (p *ScheduleParser) Run(ctx context.Context) {
|
|||||||
ticker := time.NewTicker(30 * time.Minute)
|
ticker := time.NewTicker(30 * time.Minute)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
sheetURL := "https://docs.google.com/spreadsheets/d/1v57bCAG764j1ULXDMb3amNFMzkkLmObKWsl5oE0Xq00/edit?gid=57461713#gid=57461713"
|
sheetURL := "https://docs.google.com/spreadsheets/d/11CJWHq1XDrH52qMO3mNiC04I_s5M4_vDCpGKmDlBMH0/edit?gid=0#gid=0"
|
||||||
p.parseAndSaveSchedule(ctx, sheetURL)
|
p.parseAndSaveSchedule(ctx, sheetURL)
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
@@ -137,13 +137,13 @@ func (p *ScheduleParser) mapNumbers(numbers string) []*models.Number {
|
|||||||
numbers = strings.ReplaceAll(numbers, "»", "\"")
|
numbers = strings.ReplaceAll(numbers, "»", "\"")
|
||||||
numbers = strings.ReplaceAll(numbers, "”", "\"")
|
numbers = strings.ReplaceAll(numbers, "”", "\"")
|
||||||
|
|
||||||
names := strings.Split(numbers, ";")
|
names := strings.Split(numbers, ",")
|
||||||
res := make([]*models.Number, 0, len(names))
|
res := make([]*models.Number, 0, len(names))
|
||||||
for _, name := range names {
|
for _, name := range names {
|
||||||
res = append(
|
res = append(
|
||||||
res,
|
res,
|
||||||
&models.Number{
|
&models.Number{
|
||||||
Name: name,
|
Name: strings.TrimSpace(name),
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ func NewServices(
|
|||||||
func (s *Services) GetSchedule(context.Context, *proto.GetScheduleReq) (*proto.GetScheduleRsp, error) {
|
func (s *Services) GetSchedule(context.Context, *proto.GetScheduleReq) (*proto.GetScheduleRsp, error) {
|
||||||
schedule, err := s.scheduleStorage.GetSchedule()
|
schedule, err := s.scheduleStorage.GetSchedule()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, status.Errorf(codes.Internal, err.Error())
|
return nil, status.Errorf(codes.Internal, "%v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
res := &proto.GetScheduleRsp{
|
res := &proto.GetScheduleRsp{
|
||||||
|
|||||||
Reference in New Issue
Block a user