Skip to content

Commit f854504

Browse files
wolfram77wolfram77
committed
🚌 used []string{} in some args
1 parent cf6872d commit f854504

File tree

3 files changed

+47
-26
lines changed

3 files changed

+47
-26
lines changed

‎build.sh‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,54 @@
11
#!/bin/bash
2-
32
VER=$(git describe --tags)
43
> sha256-checksums
54

5+
app="youtubeuploader_linux_armv7"
6+
echo "Generating $app ..."
67
(env GOOS=linux GOARCH=arm GOARM=7 \
7-
go build -ldflags "-X main.appVersion=$VER" -o youtubeuploader_linux_armv7
8-
gzip youtubeuploader_linux_armv7
9-
sha256sum youtubeuploader_linux_armv7.gz >> sha256-checksums) &
8+
go build -ldflags "-X main.appVersion=$VER" -o $app
9+
tar -acf $app.zip $app && rm -f $app
10+
sha256sum $app.zip >> sha256-checksums)
1011

12+
app="youtubeuploader_linux_arm64"
13+
echo "Generating $app ..."
1114
(env GOOS=linux GOARCH=arm64 \
12-
go build -ldflags "-X main.appVersion=$VER" -o youtubeuploader_linux_arm64
13-
gzip youtubeuploader_linux_arm64
14-
sha256sum youtubeuploader_linux_arm64.gz >> sha256-checksums) &
15+
go build -ldflags "-X main.appVersion=$VER" -o $app
16+
tar -acf $app.zip $app && rm -f $app
17+
sha256sum $app.zip >> sha256-checksums)
18+
19+
app="youtubeuploader_linux_386"
20+
echo "Generating $app ..."
21+
(env GOOS=linux GOARCH=386 \
22+
go build -ldflags "-X main.appVersion=$VER" -o $app
23+
tar -acf $app.zip $app && rm -f $app
24+
sha256sum $app.zip >> sha256-checksums)
1525

26+
app="youtubeuploader_linux_amd64"
27+
echo "Generating $app ..."
1628
(env GOOS=linux GOARCH=amd64 \
17-
go build -ldflags "-X main.appVersion=$VER" -o youtubeuploader_linux_amd64
18-
gzip youtubeuploader_linux_amd64
19-
sha256sum youtubeuploader_linux_amd64.gz >> sha256-checksums) &
29+
go build -ldflags "-X main.appVersion=$VER" -o $app
30+
tar -acf $app.zip $app && rm -f $app
31+
sha256sum $app.zip >> sha256-checksums)
32+
33+
app="youtubeuploader_windows_386"
34+
echo "Generating $app ..."
35+
(env GOOS=windows GOARCH=386 \
36+
go build -ldflags "-X main.appVersion=$VER" -o $app.exe
37+
tar -acf $app.zip $app.exe && rm -f $app.exe
38+
sha256sum $app.zip >> sha256-checksums)
2039

40+
app="youtubeuploader_windows_amd64"
41+
echo "Generating $app ..."
2142
(env GOOS=windows GOARCH=amd64 \
22-
go build -ldflags "-X main.appVersion=$VER" -o youtubeuploader_windows_amd64.exe
23-
zip youtubeuploader_windows_amd64.zip youtubeuploader_windows_amd64.exe
24-
rm -f youtubeuploader_windows_amd64.exe
25-
sha256sum youtubeuploader_windows_amd64.zip >> sha256-checksums) &
43+
go build -ldflags "-X main.appVersion=$VER" -o $app.exe
44+
tar -acf $app.zip $app.exe && rm -f $app.exe
45+
sha256sum $app.zip >> sha256-checksums)
2646

47+
app="youtubeuploader_mac_amd64"
48+
echo "Generating $app ..."
2749
(env GOOS=darwin GOARCH=amd64 \
28-
go build -ldflags "-X main.appVersion=$VER" -o youtubeuploader_mac_amd64
29-
zip youtubeuploader_mac_amd64.zip youtubeuploader_mac_amd64
30-
rm -f youtubeuploader_mac_amd64
31-
sha256sum youtubeuploader_mac_amd64.zip >> sha256-checksums) &
50+
go build -ldflags "-X main.appVersion=$VER" -o $app
51+
tar -acf $app.zip $app && rm -f $app
52+
sha256sum $app.zip >> sha256-checksums)
3253

33-
wait
54+
echo ":)"

‎http.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (t *limitTransport) RoundTrip(r *http.Request) (res *http.Response, err err
9191
}
9292

9393
func (plx *Playlistx) AddVideoToPlaylist(service *youtube.Service, videoID string) (err error) {
94-
listCall := service.Playlists.List("snippet,contentDetails")
94+
listCall := service.Playlists.List([]string{"snippet", "contentDetails"})
9595
listCall = listCall.Mine(true)
9696
response, err := listCall.Do()
9797
if err != nil {
@@ -114,7 +114,7 @@ func (plx *Playlistx) AddVideoToPlaylist(service *youtube.Service, videoID strin
114114
playlist = &youtube.Playlist{}
115115
playlist.Snippet = &youtube.PlaylistSnippet{Title: plx.Title}
116116
playlist.Status = &youtube.PlaylistStatus{PrivacyStatus: plx.PrivacyStatus}
117-
insertCall := service.Playlists.Insert("snippet,status", playlist)
117+
insertCall := service.Playlists.Insert([]string{"snippet", "status"}, playlist)
118118
// API doesn't return playlist ID here!?
119119
playlist, err = insertCall.Do()
120120
if err != nil {
@@ -129,7 +129,7 @@ func (plx *Playlistx) AddVideoToPlaylist(service *youtube.Service, videoID strin
129129
Kind: "youtube#video",
130130
}
131131

132-
insertCall := service.PlaylistItems.Insert("snippet", playlistItem)
132+
insertCall := service.PlaylistItems.Insert([]string{"snippet"}, playlistItem)
133133
_, err = insertCall.Do()
134134
if err != nil {
135135
return err

‎upload.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func getUploadFlags(y *youtube.Video, m *VideoMeta) {
112112
}
113113

114114
func searchVideoTitle(srv *youtube.Service, txt string) []string {
115-
res, err := srv.Search.List("snippet").Type("video").MaxResults(50).Q(txt).Do()
115+
res, err := srv.Search.List([]string{"snippet"}).Type("video").MaxResults(50).Q(txt).Do()
116116
if err != nil {
117117
if res != nil {
118118
log.Fatalf("Error searching video title '%v': %v, %v", txt, err, res.HTTPStatusCode)
@@ -134,7 +134,7 @@ func searchVideoTitle(srv *youtube.Service, txt string) []string {
134134

135135
func updateVideo(srv *youtube.Service, id string, obj *youtube.Video) {
136136
obj.Id = id
137-
res, err := srv.Videos.Update("snippet,status,recordingDetails", obj).Do()
137+
res, err := srv.Videos.Update([]string{"snippet", "status", "recordingDetails"}, obj).Do()
138138
if err != nil {
139139
if res != nil {
140140
log.Fatalf("Error updating video: %v, %v", err, res.HTTPStatusCode)
@@ -146,7 +146,7 @@ func updateVideo(srv *youtube.Service, id string, obj *youtube.Video) {
146146

147147
func uploadVideo(srv *youtube.Service, fil io.ReadCloser, obj *youtube.Video, cnk int, cquit chanChan) *youtube.Video {
148148
opt := googleapi.ChunkSize(cnk)
149-
req := srv.Videos.Insert("snippet,status,recordingDetails", obj)
149+
req := srv.Videos.Insert([]string{"snippet", "status", "recordingDetails"}, obj)
150150
res, err := req.Media(fil, opt).Do()
151151
if cquit != nil {
152152
quit := make(chan struct{})
@@ -184,7 +184,7 @@ func uploadCaption(srv *youtube.Service, id string, lng string, fil io.ReadClose
184184
c.Snippet.Language = lng
185185
c.Snippet.Name = lng
186186
for i := 0; i < retries; i++ {
187-
req := srv.Captions.Insert("snippet", c).Sync(true)
187+
req := srv.Captions.Insert([]string{"snippet"}, c).Sync(true)
188188
res, err = req.Media(fil).Do()
189189
if err == nil {
190190
break

0 commit comments

Comments
 (0)