From bffc0823be2a787df76397bd096cc918238b5cd3 Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg <grin@lbry.com>
Date: Mon, 27 Jul 2020 14:52:21 -0400
Subject: [PATCH] more

---
 manager/count.go |  9 ---------
 manager/setup.go |  2 +-
 ytapi/ytapi.go   | 14 +++++++-------
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 manager/count.go

diff --git a/manager/count.go b/manager/count.go
deleted file mode 100644
index 51c78dd..0000000
--- a/manager/count.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package manager
-
-import (
-	"github.com/lbryio/ytsync/v5/ytapi"
-)
-
-func (s *Sync) CountVideos() (uint64, error) {
-	return ytapi.VideosInChannel(s.APIConfig.YoutubeAPIKey, s.YoutubeChannelID)
-}
diff --git a/manager/setup.go b/manager/setup.go
index 951fe41..decfa18 100644
--- a/manager/setup.go
+++ b/manager/setup.go
@@ -72,7 +72,7 @@ func (s *Sync) walletSetup() error {
 	}
 	log.Debugf("Starting balance is %.4f", balance)
 
-	n, err := s.CountVideos()
+	n, err := ytapi.CountVideosInChannel(s.APIConfig.YoutubeAPIKey, s.YoutubeChannelID)
 	if err != nil {
 		return err
 	}
diff --git a/ytapi/ytapi.go b/ytapi/ytapi.go
index a1c5d82..bc28360 100644
--- a/ytapi/ytapi.go
+++ b/ytapi/ytapi.go
@@ -46,7 +46,7 @@ type VideoParams struct {
 var mostRecentlyFailedChannel string // TODO: fix this hack!
 
 func GetVideosToSync(apiKey, channelID string, syncedVideos map[string]sdk.SyncedVideo, quickSync bool, maxVideos int, videoParams VideoParams) ([]Video, error) {
-	playlistID, err := PlaylistID(apiKey, channelID)
+	playlistID, err := getPlaylistID(apiKey, channelID)
 	if err != nil {
 		return nil, err
 	}
@@ -57,7 +57,7 @@ func GetVideosToSync(apiKey, channelID string, syncedVideos map[string]sdk.Synce
 	var videos []Video
 
 	for {
-		playlistItems, nextPageToken, err = PlaylistItems(apiKey, playlistID, nextPageToken)
+		playlistItems, nextPageToken, err = getPlaylistItems(apiKey, playlistID, nextPageToken)
 
 		if len(playlistItems) < 1 {
 			// If there are 50+ videos in a playlist but less than 50 are actually returned by the API, youtube will still redirect
@@ -81,7 +81,7 @@ func GetVideosToSync(apiKey, channelID string, syncedVideos map[string]sdk.Synce
 			videoIDs[i] = item.Snippet.ResourceId.VideoId
 		}
 
-		vids, err := Videos(apiKey, videoIDs)
+		vids, err := getVideos(apiKey, videoIDs)
 		if err != nil {
 			return nil, err
 		}
@@ -112,7 +112,7 @@ func GetVideosToSync(apiKey, channelID string, syncedVideos map[string]sdk.Synce
 	return videos, nil
 }
 
-func VideosInChannel(apiKey, channelID string) (uint64, error) {
+func CountVideosInChannel(apiKey, channelID string) (uint64, error) {
 	client := &http.Client{
 		Transport: &transport.APIKey{Key: apiKey},
 	}
@@ -152,7 +152,7 @@ func ChannelInfo(apiKey, channelID string) (*ytlib.ChannelSnippet, *ytlib.Channe
 	return response.Items[0].Snippet, response.Items[0].BrandingSettings, nil
 }
 
-func PlaylistID(apiKey, channelID string) (string, error) {
+func getPlaylistID(apiKey, channelID string) (string, error) {
 	service, err := ytlib.New(&http.Client{Transport: &transport.APIKey{Key: apiKey}})
 	if err != nil {
 		return "", errors.Prefix("error creating YouTube service", err)
@@ -179,7 +179,7 @@ func PlaylistID(apiKey, channelID string) (string, error) {
 	return playlistID, nil
 }
 
-func PlaylistItems(apiKey, playlistID, nextPageToken string) ([]*ytlib.PlaylistItem, string, error) {
+func getPlaylistItems(apiKey, playlistID, nextPageToken string) ([]*ytlib.PlaylistItem, string, error) {
 	service, err := ytlib.New(&http.Client{Transport: &transport.APIKey{Key: apiKey}})
 	if err != nil {
 		return nil, "", errors.Prefix("error creating YouTube service", err)
@@ -198,7 +198,7 @@ func PlaylistItems(apiKey, playlistID, nextPageToken string) ([]*ytlib.PlaylistI
 	return response.Items, response.NextPageToken, nil
 }
 
-func Videos(apiKey string, videoIDs []string) ([]*ytlib.Video, error) {
+func getVideos(apiKey string, videoIDs []string) ([]*ytlib.Video, error) {
 	service, err := ytlib.New(&http.Client{Transport: &transport.APIKey{Key: apiKey}})
 	if err != nil {
 		return nil, errors.Prefix("error creating YouTube service", err)