Skip to content

Commit

Permalink
🚌 used []string{} in some args
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfram77 committed Nov 29, 2020
1 parent cf6872d commit f854504
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 26 deletions.
59 changes: 40 additions & 19 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,33 +1,54 @@
#!/bin/bash

VER=$(git describe --tags)
> sha256-checksums

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

app="youtubeuploader_linux_arm64"
echo "Generating $app ..."
(env GOOS=linux GOARCH=arm64 \
go build -ldflags "-X main.appVersion=$VER" -o youtubeuploader_linux_arm64
gzip youtubeuploader_linux_arm64
sha256sum youtubeuploader_linux_arm64.gz >> sha256-checksums) &
go build -ldflags "-X main.appVersion=$VER" -o $app
tar -acf $app.zip $app && rm -f $app
sha256sum $app.zip >> sha256-checksums)

app="youtubeuploader_linux_386"
echo "Generating $app ..."
(env GOOS=linux GOARCH=386 \
go build -ldflags "-X main.appVersion=$VER" -o $app
tar -acf $app.zip $app && rm -f $app
sha256sum $app.zip >> sha256-checksums)

app="youtubeuploader_linux_amd64"
echo "Generating $app ..."
(env GOOS=linux GOARCH=amd64 \
go build -ldflags "-X main.appVersion=$VER" -o youtubeuploader_linux_amd64
gzip youtubeuploader_linux_amd64
sha256sum youtubeuploader_linux_amd64.gz >> sha256-checksums) &
go build -ldflags "-X main.appVersion=$VER" -o $app
tar -acf $app.zip $app && rm -f $app
sha256sum $app.zip >> sha256-checksums)

app="youtubeuploader_windows_386"
echo "Generating $app ..."
(env GOOS=windows GOARCH=386 \
go build -ldflags "-X main.appVersion=$VER" -o $app.exe
tar -acf $app.zip $app.exe && rm -f $app.exe
sha256sum $app.zip >> sha256-checksums)

app="youtubeuploader_windows_amd64"
echo "Generating $app ..."
(env GOOS=windows GOARCH=amd64 \
go build -ldflags "-X main.appVersion=$VER" -o youtubeuploader_windows_amd64.exe
zip youtubeuploader_windows_amd64.zip youtubeuploader_windows_amd64.exe
rm -f youtubeuploader_windows_amd64.exe
sha256sum youtubeuploader_windows_amd64.zip >> sha256-checksums) &
go build -ldflags "-X main.appVersion=$VER" -o $app.exe
tar -acf $app.zip $app.exe && rm -f $app.exe
sha256sum $app.zip >> sha256-checksums)

app="youtubeuploader_mac_amd64"
echo "Generating $app ..."
(env GOOS=darwin GOARCH=amd64 \
go build -ldflags "-X main.appVersion=$VER" -o youtubeuploader_mac_amd64
zip youtubeuploader_mac_amd64.zip youtubeuploader_mac_amd64
rm -f youtubeuploader_mac_amd64
sha256sum youtubeuploader_mac_amd64.zip >> sha256-checksums) &
go build -ldflags "-X main.appVersion=$VER" -o $app
tar -acf $app.zip $app && rm -f $app
sha256sum $app.zip >> sha256-checksums)

wait
echo ":)"
6 changes: 3 additions & 3 deletions http.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (t *limitTransport) RoundTrip(r *http.Request) (res *http.Response, err err
}

func (plx *Playlistx) AddVideoToPlaylist(service *youtube.Service, videoID string) (err error) {
listCall := service.Playlists.List("snippet,contentDetails")
listCall := service.Playlists.List([]string{"snippet", "contentDetails"})
listCall = listCall.Mine(true)
response, err := listCall.Do()
if err != nil {
Expand All @@ -114,7 +114,7 @@ func (plx *Playlistx) AddVideoToPlaylist(service *youtube.Service, videoID strin
playlist = &youtube.Playlist{}
playlist.Snippet = &youtube.PlaylistSnippet{Title: plx.Title}
playlist.Status = &youtube.PlaylistStatus{PrivacyStatus: plx.PrivacyStatus}
insertCall := service.Playlists.Insert("snippet,status", playlist)
insertCall := service.Playlists.Insert([]string{"snippet", "status"}, playlist)
// API doesn't return playlist ID here!?
playlist, err = insertCall.Do()
if err != nil {
Expand All @@ -129,7 +129,7 @@ func (plx *Playlistx) AddVideoToPlaylist(service *youtube.Service, videoID strin
Kind: "youtube#video",
}

insertCall := service.PlaylistItems.Insert("snippet", playlistItem)
insertCall := service.PlaylistItems.Insert([]string{"snippet"}, playlistItem)
_, err = insertCall.Do()
if err != nil {
return err
Expand Down
8 changes: 4 additions & 4 deletions upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func getUploadFlags(y *youtube.Video, m *VideoMeta) {
}

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

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

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

0 comments on commit f854504

Please sign in to comment.