LBRYCommunity/ytsync
1
0
Fork 0
Code Issues 39 Pull requests 8 Projects Releases 197 Packages Wiki Activity

Add new fall through errors for release time

Browse source
This commit is contained in:
Mark Beamer Jr 2020-07-30 11:38:22 -04:00 committed by Alex Grintsvayg
parent 64040ea67a
commit 81e9378b9d
No known key found for this signature in database
GPG key ID: AEB3F089F86A22B5
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
downloader/downloader.go
View file

@ -62,7 +62,7 @@ GetTime:
t, err := getUploadTime(config, videoID, ip) t, err := getUploadTime(config, videoID, ip)
if err != nil { if err != nil {
//slack(":warning: Upload time error: %v", err) //slack(":warning: Upload time error: %v", err)
if tries <= maxTries && (errors.Is(err, errNotScraped) || errors.Is(err, errUploadTimeEmpty)) { if tries <= maxTries && (errors.Is(err, errNotScraped) || errors.Is(err, errUploadTimeEmpty) || errors.Is(err, errStatusParse) || errors.Is(err, errConnectionIssue)) {
err := triggerScrape(videoID, ip) err := triggerScrape(videoID, ip)
if err == nil { if err == nil {
time.Sleep(2 * time.Second) // let them scrape it time.Sleep(2 * time.Second) // let them scrape it
@ -99,6 +99,8 @@ GetTime:
var errNotScraped = errors.Base("not yet scraped by caa.iti.gr") var errNotScraped = errors.Base("not yet scraped by caa.iti.gr")
var errUploadTimeEmpty = errors.Base("upload time is empty") var errUploadTimeEmpty = errors.Base("upload time is empty")
var errStatusParse = errors.Base("could not parse status, got number, need string")
var errConnectionIssue = errors.Base("there was a connection issue with the api")
func slack(format string, a ...interface{}) { func slack(format string, a ...interface{}) {
fmt.Printf(format+"\n", a...) fmt.Printf(format+"\n", a...)
@ -134,6 +136,12 @@ func triggerScrape(videoID string, ip *net.TCPAddr) error {
} }
err = json.NewDecoder(res.Body).Decode(&response) err = json.NewDecoder(res.Body).Decode(&response)
if err != nil { if err != nil {
if strings.Contains(err.Error(), "cannot unmarshal number") {
return errors.Err(errStatusParse)
}
if strings.Contains(err.Error(), "no route to host") {
return errors.Err(errConnectionIssue)
}
return errors.Err(err) return errors.Err(err)
} }