fix empty thumbnails

lbryio · Jun 25, 2021 · 8fb1e2e · 8fb1e2e
1 parent 3b84db3
commit 8fb1e2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/shared/shared.go b/shared/shared.go
@@ -90,6 +90,7 @@ var ErrorsNoRetry = []string{
 	"This video has been removed by the uploader",
 	"Premiere will begin shortly",
 	"cannot unmarshal number 0.0",
+	"default youtube thumbnail found",
 }
 var WalletErrors = []string{
 	"Not enough funds to cover this transaction",

diff --git a/sources/youtubeVideo.go b/sources/youtubeVideo.go
@@ -683,6 +683,9 @@ func (v *YoutubeVideo) delete(reason string) error {
 
 func (v *YoutubeVideo) triggerThumbnailSave() (err error) {
 	thumbnail := thumbs.GetBestThumbnail(v.youtubeInfo.Thumbnails)
+	if thumbnail.Width == 0 {
+		return errors.Err("default youtube thumbnail found")
+	}
 	v.thumbnailURL, err = thumbs.MirrorThumbnail(thumbnail.URL, v.ID(), v.awsConfig)
 	return err
 }

diff --git a/thumbs/uploader.go b/thumbs/uploader.go
@@ -117,13 +117,11 @@ func MirrorThumbnail(url string, name string, s3Config aws.Config) (string, erro
 }
 
 func GetBestThumbnail(thumbnails []ytdl.Thumbnail) *ytdl.Thumbnail {
-	var bestWidth *ytdl.Thumbnail
+	var bestWidth ytdl.Thumbnail
 	for _, thumbnail := range thumbnails {
-		if bestWidth == nil {
-			bestWidth = &thumbnail
-		} else if bestWidth.Width < thumbnail.Width {
-			bestWidth = &thumbnail
+		if bestWidth.Width < thumbnail.Width {
+			bestWidth = thumbnail
 		}
 	}
-	return bestWidth
+	return &bestWidth
 }