move main to subpackage

oleggator · Jul 22, 2023 · eb6f2c6 · eb6f2c6
1 parent ffdcad7
commit eb6f2c6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ ARG TARGETARCH
 
 COPY . .
 RUN --mount=type=cache,target=/root/.cache/go-build \
-    CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-s -w" -o /usr/bin/discobot discobot
+    CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-s -w" -o /usr/bin/discobot discobot/cmd/discobot
 
 
 FROM alpine:3.17

diff --git a/README.md b/README.md
@@ -13,11 +13,4 @@
 - ffmpeg
 
 ## Docker image is compilable for the next platforms
-
-- x86_64
-- x86
-- aarch64
-- armhf
-- s390x
-- armv7
-- ppc64le
+x86_64, x86, aarch64, armhf, s390x, armv7, ppc64le
diff --git a/main.go → cmd/discobot/main.go b/main.go → cmd/discobot/main.go
@@ -7,28 +7,32 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+
+	"discobot"
 )
 
 var token = os.Getenv("TOKEN")
 
 func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 
-	bot := NewDiscoBot(token)
+	bot := discobot.NewDiscoBot(token)
 	if err := bot.Open(ctx); err != nil {
 		log.Fatalln(err)
 	}
 	defer bot.Close()
 
 	go func() {
-		if err := bot.RunPlayer(ctx); err != nil {
-			log.Println(err)
-		}
+		sc := make(chan os.Signal, 1)
+		signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
+
+		fmt.Println("Press CTRL-C to exit.")
+
+		<-sc
+		cancel()
 	}()
 
-	fmt.Println("Press CTRL-C to exit.")
-	sc := make(chan os.Signal, 1)
-	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
-	<-sc
-	cancel()
+	if err := bot.RunPlayer(ctx); err != nil {
+		log.Println(err)
+	}
 }
diff --git a/discobot.go b/discobot.go
@@ -1,4 +1,4 @@
-package main
+package discobot
 
 import (
 	"context"

diff --git a/playback.go b/playback.go
@@ -1,4 +1,4 @@
-package main
+package discobot
 
 import (
 	"context"

diff --git a/queue.go b/queue.go
@@ -1,4 +1,4 @@
-package main
+package discobot
 
 import (
 	"context"
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,11 +13,4 @@ @@
     - ffmpeg
     ## Docker image is compilable for the next platforms
-    - x86_64
-    - x86
-    - aarch64
-    - armhf
-    - s390x
-    - armv7
-    - ppc64le
+    x86_64, x86, aarch64, armhf, s390x, armv7, ppc64le