go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/lbryio/errors.go v0.0.0-20180223142025-ad03d3cc6a5c
-	github.com/lbryio/lbry.go v0.0.0-20190508210757-f6d02e29ec8e
+	github.com/lbryio/lbry.go v0.0.0-20190509140534-c6befda2ce3f
 	github.com/lusis/slack-test v0.0.0-20190408224659-6cf59653add2 // indirect
 	github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
 	github.com/mitchellh/mapstructure v1.1.2 // indirect

go.sum

@@ -125,8 +125,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lbryio/errors.go v0.0.0-20180223142025-ad03d3cc6a5c h1:BhdcWGsuKif/XoSZnqVGNqJ1iEmH0czWR5upj+AuR8M=
 github.com/lbryio/errors.go v0.0.0-20180223142025-ad03d3cc6a5c/go.mod h1:muH7wpUqE8hRA3OrYYosw9+Sl681BF9cwcjzE+OCNK8=
-github.com/lbryio/lbry.go v0.0.0-20190508210757-f6d02e29ec8e h1:7WEfDKlKA3pGrNQt42UfNd1koRG+OVwIZXg55IYJ8dU=
+github.com/lbryio/lbry.go v0.0.0-20190509140534-c6befda2ce3f h1:bkHBx4nnjhTFeiNlVyqQAzFHy9nCT/6AxsbixdfhDl4=
-github.com/lbryio/lbry.go v0.0.0-20190508210757-f6d02e29ec8e/go.mod h1:rAREtjHq/Wkkqy4+yt89Er/7JAVu6uMo3v8nevCEEIA=
+github.com/lbryio/lbry.go v0.0.0-20190509140534-c6befda2ce3f/go.mod h1:rAREtjHq/Wkkqy4+yt89Er/7JAVu6uMo3v8nevCEEIA=
 github.com/lbryio/lbryschema.go v0.0.0-20190428231007-c54836bca002 h1:urfYK5ElpUrAv90auPLldoVC60LwiGAcY0OE6HJB9KI=
 github.com/lbryio/lbryschema.go v0.0.0-20190428231007-c54836bca002/go.mod h1:dAzPCBj3CKKWBGYBZxK6tKBP5SCgY2tqd9SnQd/OyKo=
 github.com/lbryio/ozzo-validation v0.0.0-20170323141101-d1008ad1fd04/go.mod h1:fbG/dzobG8r95KzMwckXiLMHfFjZaBRQqC9hPs2XAQ4=

manager/setup.go

@@ -260,9 +260,11 @@ func (s *Sync) ensureChannelOwnership() error {
 			}
 		}
 	}
+	channelUsesOldMetadata := false
 	if len((*channels).Items) == 1 {
 		channel := ((*channels).Items)[0]
 		if channel.Name == s.LbryChannelName {
+			channelUsesOldMetadata = channel.Value.GetThumbnail() == nil
 			//TODO: eventually get rid of this when the whole db is filled
 			if s.lbryChannelID == "" {
 				err = s.Manager.apiConfig.SetChannelClaimID(s.YoutubeChannelID, channel.ClaimID)
@@ -270,7 +272,9 @@ func (s *Sync) ensureChannelOwnership() error {
 				return errors.Err("the channel in the wallet is different than the channel in the database")
 			}
 			s.lbryChannelID = channel.ClaimID
-			return err
+			if !channelUsesOldMetadata {
+				return err
+			}
 		} else {
 			return errors.Err("this channel does not belong to this wallet! Expected: %s, found: %s", s.LbryChannelName, channel.Name)
 		}
@@ -328,16 +332,35 @@ func (s *Sync) ensureChannelOwnership() error {
 	if channelInfo.Country != "" {
 		locations = []jsonrpc.Location{{Country: util.PtrToString(channelInfo.Country)}}
 	}
-	c, err := s.daemon.ChannelCreate(s.LbryChannelName, channelBidAmount, jsonrpc.ChannelCreateOptions{
+	var c *jsonrpc.TransactionSummary
-		ClaimCreateOptions: jsonrpc.ClaimCreateOptions{
+	if channelUsesOldMetadata {
-			Title:        channelInfo.Title,
+		c, err = s.daemon.ChannelUpdate(s.lbryChannelID, jsonrpc.ChannelUpdateOptions{
-			Description:  channelInfo.Description,
+			ClearLocations: util.PtrToBool(true),
-			Tags:         nil,
+			ClearLanguages: util.PtrToBool(true),
-			Languages:    languages,
+			ChannelCreateOptions: jsonrpc.ChannelCreateOptions{
-			Locations:    locations,
+				ClaimCreateOptions: jsonrpc.ClaimCreateOptions{
-			ThumbnailURL: &thumbnailURL,
+					Title:        channelInfo.Title,
-		},
+					Description:  channelInfo.Description,
-	})
+					Tags:         nil,
+					Languages:    languages,
+					Locations:    locations,
+					ThumbnailURL: &thumbnailURL,
+				},
+			},
+		})
+	} else {
+		c, err = s.daemon.ChannelCreate(s.LbryChannelName, channelBidAmount, jsonrpc.ChannelCreateOptions{
+			ClaimCreateOptions: jsonrpc.ClaimCreateOptions{
+				Title:        channelInfo.Title,
+				Description:  channelInfo.Description,
+				Tags:         nil,
+				Languages:    languages,
+				Locations:    locations,
+				ThumbnailURL: &thumbnailURL,
+			},
+		})
+	}
+
 	if err != nil {
 		return err
 	}

manager/ytsync.go

@@ -801,6 +801,11 @@ func (s *Sync) processVideo(v video) (err error) {
 		log.Println(v.ID() + " already published")
 		return nil
 	}
+	newMetadataVersion := int8(2)
+	if ok && sv.MetadataVersion >= newMetadataVersion {
+		log.Println(v.ID() + " upgraded to the new metadata")
+		return nil
+	}
 
 	if v.PlaylistPosition() > s.Manager.videosLimit {
 		log.Println(v.ID() + " is old: skipping")