Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0d473cc4f6 | ||
|
|
2f701a887a |
No files matched your search
@@ -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{
|
||||
|
||||
+4
-3
@@ -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
|
||||
|
||||
@@ -546,7 +548,7 @@ func (s *Sync) updateRemoteDB(claims []jsonrpc.Claim) (total, fixed, removed int
|
||||
if !claimInDatabase {
|
||||
log.Debugf("%s: Published but is not in database (%s - %s)", videoID, c.Name, c.ClaimID)
|
||||
}
|
||||
if s.syncedVideos[videoID].Transferred {
|
||||
if s.syncedVideos[videoID].Transferred && s.publishAddress != c.Address {
|
||||
log.Debugf("%s: Marked as transferred while in fact it's not (%s - %s). Publish address: %s, expected: %s", videoID, c.Name, c.ClaimID, c.Address, s.publishAddress)
|
||||
}
|
||||
if !claimInDatabase || metadataDiffers || claimIDDiffers || claimNameDiffers || claimMarkedUnpublished {
|
||||
@@ -575,7 +577,6 @@ func (s *Sync) updateRemoteDB(claims []jsonrpc.Claim) (total, fixed, removed int
|
||||
for vID, sv := range s.syncedVideos {
|
||||
if sv.Transferred {
|
||||
log.Infof("%s: claim was transferred, ignoring", vID)
|
||||
count++ //still count them as publishes
|
||||
continue
|
||||
}
|
||||
_, ok := videoIDMap[vID]
|
||||
|
||||
Reference in new issue
Block a user