update binaries

schollz · Mar 19, 2022 · 8553f74 · 8553f74
1 parent b78ee15
commit 8553f74
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -2,32 +2,35 @@ serve:
 	go build -v
 	./streammyaudio --debug --server 
 
-build-all: build-linux build-windows build-mac
+build-all: build-linux build-windows build-mac build-mac-arm
 
 build-linux:
 	go build -v -o streammyaudio
 	zip streammyaudio_linux_amd64.zip streammyaudio LICENSE
 
-build-windows: src/ffmpeg/ffmpeg.exe
+build-windows: win32-x64
+	cp win32-x64 src/ffmpeg/ffmpeg.exe
 	GOOS=windows GOARCH=amd64 go build -v -o streammyaudio.exe
 	zip streammyaudio_windows_amd64.zip streammyaudio.exe LICENSE
+	rm -f src/ffmpeg/ffmpeg.exe
 
-build-mac: src/ffmpeg/ffmpegmac
+build-mac: darwin-x64
+	cp darwin-x64 src/ffmpeg/ffmpegmac
 	GOOS=darwin GOARCH=amd64 go build -v -o streammyaudio
 	zip streammyaudio_macos_amd64.zip streammyaudio LICENSE
+	rm -f src/ffmpeg/ffmpegmac
 
-src/ffmpeg/ffmpeg.exe: ffmpeg-release-essentials.zip
-	unzip -o ffmpeg-release-essentials.zip
-	cp ffmpeg-5.0-essentials_build/bin/ffmpeg.exe src/ffmpeg/ffmpeg.exe
+build-mac-arm: darwin-arm64
+	cp darwin-arm64 src/ffmpeg/ffmpegmac
+	GOOS=darwin GOARCH=arm64 go build -v -o streammyaudio
+	zip streammyaudio_macos_m1.zip streammyaudio LICENSE
+	rm -f src/ffmpeg/ffmpegmac
 
-src/ffmpeg/ffmpegmac: ffmpeg-5.0.zip
-	unzip -o ffmpeg-5.0.zip
-	cp ffmpeg src/ffmpeg/ffmpegmac
-
-ffmpeg-release-essentials.zip:
-	wget https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip
-
-ffmpeg-5.0.zip:
-	wget https://evermeet.cx/ffmpeg/ffmpeg-5.0.zip
+darwin-arm64:
+	wget https://github.com/eugeneware/ffmpeg-static/releases/download/b5.0/darwin-arm64
 
+darwin-x64:
+	wget https://github.com/eugeneware/ffmpeg-static/releases/download/b5.0/darwin-x64
 
+win32-x64:
+	wget https://github.com/eugeneware/ffmpeg-static/releases/download/b5.0/win32-x64
diff --git a/src/client/client.go b/src/client/client.go
@@ -27,23 +27,25 @@ type Client struct {
 }
 
 func (c *Client) Run() (err error) {
+	_ = ffmpeg.Binary()
 	defer func() {
 		ffmpeg.Clean()
 	}()
 
 	clearscreen.ClearScreen()
-	fmt.Println("\n\n\n" + `███████╗████████╗██████╗ ███████╗ █████╗ ███╗   ███╗                        
-██╔════╝╚══██╔══╝██╔══██╗██╔════╝██╔══██╗████╗ ████║                        
-███████╗   ██║   ██████╔╝█████╗  ███████║██╔████╔██║                        
-╚════██║   ██║   ██╔══██╗██╔══╝  ██╔══██║██║╚██╔╝██║                        
-███████║   ██║   ██║  ██║███████╗██║  ██║██║ ╚═╝ ██║                        
-╚══════╝   ╚═╝   ╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝╚═╝     ╚═╝                        
-██╗   ██╗ ██████╗ ██╗   ██╗██████╗      █████╗ ██╗   ██╗██████╗ ██╗ ██████╗ 
-╚██╗ ██╔╝██╔═══██╗██║   ██║██╔══██╗    ██╔══██╗██║   ██║██╔══██╗██║██╔═══██╗
- ╚████╔╝ ██║   ██║██║   ██║██████╔╝    ███████║██║   ██║██║  ██║██║██║   ██║
-  ╚██╔╝  ██║   ██║██║   ██║██╔══██╗    ██╔══██║██║   ██║██║  ██║██║██║   ██║
-   ██║   ╚██████╔╝╚██████╔╝██║  ██║    ██║  ██║╚██████╔╝██████╔╝██║╚██████╔╝
-   ╚═╝    ╚═════╝  ╚═════╝ ╚═╝  ╚═╝    ╚═╝  ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═════╝ 
+	fmt.Println("\n" + `     _______..___________..______       _______      ___      .___  ___.     
+    /       ||           ||   _  \     |   ____|    /   \     |   \/   |     
+   |   (----` + "`" + `` + "`" + `---|  |----` + "`" + `|  |_)  |    |  |__      /  ^  \    |  \  /  |     
+    \   \        |  |     |      /     |   __|    /  /_\  \   |  |\/|  |     
+.----)   |       |  |     |  |\  \----.|  |____  /  _____  \  |  |  |  |     
+|_______/        |__|     | _| ` + "`" + `._____||_______|/__/     \__\ |__|  |__|     
+.___  ___. ____    ____         ___      __    __   _______   __    ______   
+|   \/   | \   \  /   /        /   \    |  |  |  | |       \ |  |  /  __  \  
+|  \  /  |  \   \/   /        /  ^  \   |  |  |  | |  .--.  ||  | |  |  |  | 
+|  |\/|  |   \_    _/        /  /_\  \  |  |  |  | |  |  |  ||  | |  |  |  | 
+|  |  |  |     |  |         /  _____  \ |  ` + "`" + `--'  | |  '--'  ||  | |  ` + "`" + `--'  | 
+|__|  |__|     |__|        /__/     \__\ \______/  |_______/ |__|  \______/  
+                                                                             
                                                                             `)
 	err = c.cast()
 	if err != nil {

diff --git a/src/ffmpeg/ffmpeg_darwin.go b/src/ffmpeg/ffmpeg_darwin.go
@@ -21,7 +21,9 @@ func Binary() string {
 	log.Debugf("loaded ffmpeg: %d", len(b))
 	if !loadedDarwin {
 		loadedDarwin = true
-		ioutil.WriteFile("./ffmpeg", b, 0777)
+		go func() {
+			ioutil.WriteFile("./ffmpeg", b, 0777)
+		}()
 	}
 	return "./ffmpeg"
 }

diff --git a/src/ffmpeg/ffmpeg_windows.go b/src/ffmpeg/ffmpeg_windows.go
@@ -14,7 +14,9 @@ var loaded bool
 func Binary() string {
 	if !loaded {
 		loaded = true
-		ioutil.WriteFile("./ffmpeg.exe", b, 0777)
+		go func() {
+			ioutil.WriteFile("./ffmpeg.exe", b, 0777)
+		}()
 	}
 	return "./ffmpeg.exe"
 }