From 77d0efcf3c1a8e0b3deb52ed7d06a4930d3739ac Mon Sep 17 00:00:00 2001 From: Niko Storni Date: Mon, 21 Oct 2019 15:44:24 +0200 Subject: [PATCH] refactor tags_mapping name remove failure state for transfers --- {ipManager => ip_manager}/throttle.go | 2 +- manager/manager.go | 1 - manager/setup.go | 7 ++++--- manager/ytsync.go | 4 +--- sources/youtubeVideo.go | 16 ++++++++-------- {tagsManager => tags_manager}/tags_mapping.go | 2 +- .../tags_mapping_test.go | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) rename {ipManager => ip_manager}/throttle.go (99%) rename {tagsManager => tags_manager}/tags_mapping.go (99%) rename {tagsManager => tags_manager}/tags_mapping_test.go (99%) diff --git a/ipManager/throttle.go b/ip_manager/throttle.go similarity index 99% rename from ipManager/throttle.go rename to ip_manager/throttle.go index 14a86a9..cfb73f5 100644 --- a/ipManager/throttle.go +++ b/ip_manager/throttle.go @@ -1,4 +1,4 @@ -package ipManager +package ip_manager import ( "github.com/asaskevich/govalidator" diff --git a/manager/manager.go b/manager/manager.go index 00c2b23..9d6d5d2 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -92,7 +92,6 @@ const ( TransferStateNotTouched = iota TransferStatePending TransferStateComplete - TransferStateFailed = -1 ) func (s *SyncManager) Start() error { diff --git a/manager/setup.go b/manager/setup.go index 2fbe721..f33fb6f 100644 --- a/manager/setup.go +++ b/manager/setup.go @@ -10,10 +10,11 @@ import ( "github.com/lbryio/lbry.go/v2/extras/errors" "github.com/lbryio/lbry.go/v2/extras/jsonrpc" "github.com/lbryio/lbry.go/v2/extras/util" - "github.com/lbryio/ytsync/tagsManager" - "github.com/lbryio/ytsync/thumbs" logUtils "github.com/lbryio/ytsync/util" + "github.com/lbryio/ytsync/tags_manager" + "github.com/lbryio/ytsync/thumbs" + "github.com/shopspring/decimal" log "github.com/sirupsen/logrus" "google.golang.org/api/googleapi/transport" @@ -386,7 +387,7 @@ func (s *Sync) ensureChannelOwnership() error { claimCreateOptions := jsonrpc.ClaimCreateOptions{ Title: &channelInfo.Title, Description: &channelInfo.Description, - Tags: tagsManager.GetTagsForChannel(s.YoutubeChannelID), + Tags: tags_manager.GetTagsForChannel(s.YoutubeChannelID), Languages: languages, Locations: locations, ThumbnailURL: &thumbnailURL, diff --git a/manager/ytsync.go b/manager/ytsync.go index 314dec1..00b1f1b 100644 --- a/manager/ytsync.go +++ b/manager/ytsync.go @@ -384,9 +384,7 @@ func (s *Sync) setChannelTerminationStatus(e *error) { var transferState *int if s.shouldTransfer() { - if *e != nil { - transferState = util.PtrToInt(TransferStateFailed) - } else { + if *e == nil { transferState = util.PtrToInt(TransferStateComplete) } } diff --git a/sources/youtubeVideo.go b/sources/youtubeVideo.go index 99192fa..ae3f41d 100644 --- a/sources/youtubeVideo.go +++ b/sources/youtubeVideo.go @@ -18,10 +18,10 @@ import ( "github.com/lbryio/lbry.go/v2/extras/stop" "github.com/lbryio/lbry.go/v2/extras/util" - "github.com/lbryio/ytsync/ipManager" + "github.com/lbryio/ytsync/ip_manager" "github.com/lbryio/ytsync/namer" "github.com/lbryio/ytsync/sdk" - "github.com/lbryio/ytsync/tagsManager" + "github.com/lbryio/ytsync/tags_manager" "github.com/lbryio/ytsync/thumbs" duration "github.com/ChannelMeter/iso8601duration" @@ -220,7 +220,7 @@ func (v *YoutubeVideo) download(useIPv6 bool) error { fmt.Sprintf("duration <= %d", int(math.Round(v.maxVideoLength*3600))), ) } - sourceAddress, err := ipManager.GetNextIP(useIPv6) + sourceAddress, err := ip_manager.GetNextIP(useIPv6) if err != nil { if sourceAddress == "throttled" { for { @@ -230,8 +230,8 @@ func (v *YoutubeVideo) download(useIPv6 bool) error { default: } - time.Sleep(ipManager.IPCooldownPeriod) - sourceAddress, err = ipManager.GetNextIP(useIPv6) + time.Sleep(ip_manager.IPCooldownPeriod) + sourceAddress, err = ip_manager.GetNextIP(useIPv6) if err == nil { break } @@ -240,7 +240,7 @@ func (v *YoutubeVideo) download(useIPv6 bool) error { return errors.Err(err) } } - defer ipManager.ReleaseIP(sourceAddress) + defer ip_manager.ReleaseIP(sourceAddress) if useIPv6 { log.Infof("using IPv6: %s", sourceAddress) ytdlArgs = append(ytdlArgs, @@ -282,7 +282,7 @@ runcmd: if err = cmd.Wait(); err != nil { if strings.Contains(err.Error(), "exit status 1") { if strings.Contains(string(errorLog), "HTTP Error 429") { - ipManager.SetIpThrottled(sourceAddress, v.stopGroup) + ip_manager.SetIpThrottled(sourceAddress, v.stopGroup) } else if strings.Contains(string(errorLog), "giving up after 0 fragment retries") && qualityIndex < len(qualities)-1 { qualityIndex++ goto runcmd @@ -477,7 +477,7 @@ func (v *YoutubeVideo) getMetadata() (languages []string, locations []jsonrpc.Lo } tags = v.youtubeInfo.Snippet.Tags } - tags, err := tagsManager.SanitizeTags(tags, v.youtubeChannelID) + tags, err := tags_manager.SanitizeTags(tags, v.youtubeChannelID) if err != nil { log.Errorln(err.Error()) } diff --git a/tagsManager/tags_mapping.go b/tags_manager/tags_mapping.go similarity index 99% rename from tagsManager/tags_mapping.go rename to tags_manager/tags_mapping.go index 01d7c3c..c48f216 100644 --- a/tagsManager/tags_mapping.go +++ b/tags_manager/tags_mapping.go @@ -1,4 +1,4 @@ -package tagsManager +package tags_manager import ( "regexp" diff --git a/tagsManager/tags_mapping_test.go b/tags_manager/tags_mapping_test.go similarity index 99% rename from tagsManager/tags_mapping_test.go rename to tags_manager/tags_mapping_test.go index be7fe76..a974f26 100644 --- a/tagsManager/tags_mapping_test.go +++ b/tags_manager/tags_mapping_test.go @@ -1,4 +1,4 @@ -package tagsManager +package tags_manager import ( "fmt"