Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c53cf4c1b3 | ||
|
|
ad5a30da9e | ||
|
|
ecda80b02d |
No files matched your search
+1
-5
@@ -73,11 +73,7 @@ func (s *Sync) walletSetup() error {
|
||||
}
|
||||
log.Debugf("Starting balance is %.4f", balance)
|
||||
|
||||
videosOnYoutube, err := ytapi.CountVideosInChannel(s.DbChannelData.ChannelId)
|
||||
if err != nil {
|
||||
logUtils.SendErrorToSlack(errors.FullTrace(errors.Prefix("failed to get video count through socialblade. Falling back to API count", err)))
|
||||
videosOnYoutube = int(s.DbChannelData.TotalVideos)
|
||||
}
|
||||
videosOnYoutube := int(s.DbChannelData.TotalVideos)
|
||||
|
||||
log.Debugf("Source channel has %d videos", videosOnYoutube)
|
||||
if videosOnYoutube == 0 {
|
||||
|
||||
+11
-7
@@ -207,17 +207,21 @@ func (s *Sync) processTransfers() (e error) {
|
||||
isTip := true
|
||||
summary, err := s.daemon.SupportCreate(s.DbChannelData.ChannelClaimID, fmt.Sprintf("%.6f", supportAmount), &isTip, nil, []string{defaultAccount}, nil)
|
||||
if err != nil {
|
||||
if strings.Contains(err.Error(), "tx-size") { //TODO: this is a silly workaround and should be written in an recursive function
|
||||
summary, err = s.daemon.SupportCreate(s.DbChannelData.ChannelClaimID, fmt.Sprintf("%.6f", supportAmount/2.0), &isTip, nil, []string{defaultAccount}, nil)
|
||||
if strings.Contains(err.Error(), "tx-size") { //TODO: this is a silly workaround...
|
||||
_, spendErr := s.daemon.TxoSpend(util.PtrToString("other"), nil, nil, nil, nil, &s.defaultAccountID)
|
||||
if spendErr != nil {
|
||||
return errors.Prefix(fmt.Sprintf("something went wrong while tipping the channel for %.6f LBCs", supportAmount), err)
|
||||
}
|
||||
err = s.waitForNewBlock()
|
||||
if err != nil {
|
||||
return errors.Prefix(fmt.Sprintf("something went wrong while tipping the channel for %.6f LBCs (waiting for new block)", supportAmount), err)
|
||||
}
|
||||
summary, err = s.daemon.SupportCreate(s.DbChannelData.ChannelClaimID, fmt.Sprintf("%.6f", supportAmount), &isTip, nil, []string{defaultAccount}, nil)
|
||||
if err != nil {
|
||||
return errors.Prefix(fmt.Sprintf("something went wrong while tipping the channel for %.6f LBCs", supportAmount), err)
|
||||
}
|
||||
summary, err = s.daemon.SupportCreate(s.DbChannelData.ChannelClaimID, fmt.Sprintf("%.6f", supportAmount/2.0), &isTip, nil, []string{defaultAccount}, nil)
|
||||
if err != nil {
|
||||
return errors.Err(err)
|
||||
}
|
||||
} else {
|
||||
return errors.Err(err)
|
||||
return errors.Prefix(fmt.Sprintf("something went wrong while tipping the channel for %.6f LBCs", supportAmount), err)
|
||||
}
|
||||
}
|
||||
if len(summary.Outputs) < 1 {
|
||||
|
||||
+12
-4
@@ -123,15 +123,23 @@ func GetVideosToSync(config *sdk.APIConfig, channelID string, syncedVideos map[s
|
||||
return videos, nil
|
||||
}
|
||||
|
||||
// CountVideosInChannel is unused for now... keeping it here just in case
|
||||
func CountVideosInChannel(channelID string) (int, error) {
|
||||
res, err := http.Get("https://socialblade.com/youtube/channel/" + channelID)
|
||||
url := "https://socialblade.com/youtube/channel/" + channelID
|
||||
|
||||
req, _ := http.NewRequest("GET", url, nil)
|
||||
|
||||
req.Header.Add("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36")
|
||||
req.Header.Add("Accept", "*/*")
|
||||
req.Header.Add("Host", "socialblade.com")
|
||||
|
||||
res, err := http.DefaultClient.Do(req)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return 0, errors.Err(err)
|
||||
}
|
||||
defer res.Body.Close()
|
||||
|
||||
var line string
|
||||
|
||||
scanner := bufio.NewScanner(res.Body)
|
||||
for scanner.Scan() {
|
||||
if strings.Contains(scanner.Text(), "youtube-stats-header-uploads") {
|
||||
@@ -199,7 +207,7 @@ func getVideos(config *sdk.APIConfig, channelID string, videoIDs []string, stopC
|
||||
}
|
||||
select {
|
||||
case <-stopChan:
|
||||
return videos, errors.Err("canceled by stopper")
|
||||
return videos, errors.Err("interrupted by user")
|
||||
default:
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user