adjust channel info logic

OdyseeTeam · Mar 21, 2024 · 7806d42 · 7806d42
1 parent c82760c
commit 7806d42
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/manager/setup.go b/manager/setup.go
@@ -402,6 +402,9 @@ func (s *Sync) ensureChannelOwnership() error {
 		return errors.Err("the database has a channel recorded (%s) but nothing was found in our control", s.DbChannelData.ChannelClaimID)
 	}
 
+	if s.DbChannelData.IsDeletedOnYoutube || s.DbChannelData.TransferState == shared.TransferStateComplete {
+		return nil
+	}
 	channelUsesOldMetadata := false
 	if channelToUse != nil {
 		channelUsesOldMetadata = channelToUse.Value.GetThumbnail() == nil || (len(channelToUse.Value.GetLanguages()) == 0 && s.DbChannelData.Language != "")
@@ -410,10 +413,6 @@ func (s *Sync) ensureChannelOwnership() error {
 		}
 	}
 
-	if s.DbChannelData.IsDeletedOnYoutube {
-		return nil
-	}
-
 	balanceResp, err := s.daemon.AccountBalance(nil)
 	if err != nil {
 		return err

diff --git a/ytapi/ytapi.go b/ytapi/ytapi.go
@@ -176,7 +176,7 @@ func ChannelInfo(channelID string, attemptNo int, ipPool *ip_manager.IPPool) (*Y
 	// get end index by matching pattern AFTER the start index
 	dataEndIndex := strings.Index(pageBody[dataStartIndex:], ";</script>") + dataStartIndex
 	//dataEndIndex := strings.Index(pageBody, "}]}}};</script>") + 5
-	if dataEndIndex == dataStartIndex {
+	if dataEndIndex <= dataStartIndex {
 		return nil, errors.Err("start index is lower than end index. cannot extract channel info!")
 	}
 	data := pageBody[dataStartIndex:dataEndIndex]