diff --git a/manager/transfer.go b/manager/transfer.go index cd45707..1a1ecaa 100644 --- a/manager/transfer.go +++ b/manager/transfer.go @@ -52,6 +52,10 @@ func abandonSupports(s *Sync) (float64, error) { if ok { continue } + supportOnTransferredClaim := support.Address == s.publishAddress + if supportOnTransferredClaim { + continue + } alreadyAbandoned[support.ClaimID] = true summary, err := s.daemon.SupportAbandon(&support.ClaimID, nil, nil, nil, nil) if err != nil { @@ -136,6 +140,9 @@ func transferChannel(s *Sync) error { if channelClaim == nil || len(channelClaim.Claims) == 0 { return errors.Err("There is no channel claim for channel %s", s.LbryChannelName) } + if channelClaim.Claims[0].Address == s.publishAddress { + return nil + } updateOptions := jsonrpc.ChannelUpdateOptions{ ChannelCreateOptions: jsonrpc.ChannelCreateOptions{ ClaimCreateOptions: jsonrpc.ClaimCreateOptions{ diff --git a/manager/ytsync.go b/manager/ytsync.go index d26bb59..2370901 100644 --- a/manager/ytsync.go +++ b/manager/ytsync.go @@ -362,9 +362,11 @@ func deleteSyncFolder(videoDirectory string) { _ = util.SendToSlack(err.Error()) } } + func (s *Sync) shouldTransfer() bool { - return s.transferState == 1 && s.publishAddress != "" && !s.Manager.SyncFlags.DisableTransfers + return s.transferState >= 1 && s.publishAddress != "" && !s.Manager.SyncFlags.DisableTransfers } + func (s *Sync) setChannelTerminationStatus(e *error) { var transferState *int