Now using recordings and ISRC if possible

main.go

···
 	"github.com/teal-fm/piper/api/teal"
 )
 
-const AGENT string = "teal-cider/0.0.1"
+const AGENT string = "teal-cider/0.0.2"
 
 var ENV_DATA envData = envData{}
 
···
 	return r, nil
 }
 
-func getInfos(song types.NowPlaying) (types.MBRecord, error) {
-	r := types.MBRecord{}
-
-	req, err := http.NewRequest("GET", "https://musicbrainz.org/ws/2/release", nil)
+func getMbRecord(query string) (types.MBRecord, error) {
+	record := types.MBRecord{}
+	req, err := http.NewRequest("GET", "https://musicbrainz.org/ws/2/recording", nil)
 	if err != nil {
-		return r, err
+		return record, err
 	}
 
-	query := fmt.Sprintf("recording:\"%s\" AND artist:\"%s\" AND date:\"%s\"", song.Info.Name, song.Info.ArtistName, song.Info.ReleaseDate)
-
 	req.Header.Add("User-Agent", AGENT)
 	req.Header.Add("content-type", "false")
 
 	queryParam := req.URL.Query()
+	queryParam.Add("fmt", "json")
 	queryParam.Add("query", query)
-	queryParam.Add("fmt", "json")
 	req.URL.RawQuery = queryParam.Encode()
 
 	res, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return r, err
+		return record, err
 	}
 
-	record := types.MBRecord{}
 	err = json.NewDecoder(res.Body).Decode(&record)
-	if err != nil {
-		return r, err
+	return record, err
+}
+
+func getInfos(song types.NowPlaying) (types.MBRecord, error) {
+	isrc := song.Info.Isrc[len(song.Info.Isrc)-12:]
+	query := fmt.Sprintf("isrc:\"%s\"", isrc)
+	r, err := getMbRecord(query)
+	if err == nil && r.Count > 0 {
+		return r, nil
 	}
 
-	return record, nil
+	query = fmt.Sprintf("recording:\"%s\" AND artist:\"%s\" AND date:\"%s\"", song.Info.Name, song.Info.ArtistName, song.Info.ReleaseDate)
+	r, err = getMbRecord(query)
+	return r, err
 }
 
 func recordToTeal(records types.MBRecord, s types.NowPlaying) teal.AlphaFeedPlay {
···
 			SubmissionClientAgent: &dupAgent,
 		}
 	} else {
-		r := records.Releases[0]
+		r := records.Recordings[0]
 
 		artists := make([]teal.AlphaFeedDefs_Artist, 0)
 		for _, a := range r.ArtistCredit {
···
 			Artists:               artistsRef,
 			TrackName:             r.Title,
 			TrackMbId:             &r.ID,
-			ReleaseName:           &r.ReleaseGroup.Title,
-			ReleaseMbId:           &r.ReleaseGroup.ID,
+			ReleaseName:           &r.Releases[0].Title,
+			ReleaseMbId:           &r.Releases[0].ID,
 			Duration:              &duration,
 			PlayedTime:            &now,
 			SubmissionClientAgent: &dupAgent,

types/musicbrainz.go

···
 package types
 
-import "time"
+import (
+	"encoding/json"
+	"time"
+)
+
+func UnmarshalWelcome(data []byte) (MBRecord, error) {
+	var r MBRecord
+	err := json.Unmarshal(data, &r)
+	return r, err
+}
+
+func (r *MBRecord) Marshal() ([]byte, error) {
+	return json.Marshal(r)
+}
 
 type MBRecord struct {
-	Created  time.Time `json:"created"`
-	Count    int       `json:"count"`
-	Offset   int       `json:"offset"`
-	Releases []struct {
-		ID                 string `json:"id"`
-		Score              int    `json:"score"`
-		StatusID           string `json:"status-id"`
-		PackagingID        string `json:"packaging-id,omitempty"`
-		ArtistCreditID     string `json:"artist-credit-id"`
-		Count              int    `json:"count"`
-		Title              string `json:"title"`
-		Status             string `json:"status"`
-		Packaging          string `json:"packaging,omitempty"`
-		TextRepresentation struct {
-			Language string `json:"language"`
-			Script   string `json:"script"`
-		} `json:"text-representation,omitempty"`
-		ArtistCredit []struct {
-			Name   string `json:"name"`
-			Artist struct {
-				ID             string `json:"id"`
-				Name           string `json:"name"`
-				SortName       string `json:"sort-name"`
-				Disambiguation string `json:"disambiguation"`
-			} `json:"artist"`
-		} `json:"artist-credit"`
-		ReleaseGroup struct {
-			ID            string `json:"id"`
-			TypeID        string `json:"type-id"`
-			PrimaryTypeID string `json:"primary-type-id"`
-			Title         string `json:"title"`
-			PrimaryType   string `json:"primary-type"`
-		} `json:"release-group"`
-		Date          string `json:"date"`
-		Country       string `json:"country"`
-		ReleaseEvents []struct {
-			Date string `json:"date"`
-			Area struct {
-				ID            string   `json:"id"`
-				Name          string   `json:"name"`
-				SortName      string   `json:"sort-name"`
-				Iso31661Codes []string `json:"iso-3166-1-codes"`
-			} `json:"area"`
-		} `json:"release-events"`
-		LabelInfo []struct {
-			CatalogNumber string `json:"catalog-number"`
-			Label         struct {
-				ID   string `json:"id"`
-				Name string `json:"name"`
-			} `json:"label"`
-		} `json:"label-info"`
-		TrackCount int `json:"track-count"`
-		Media      []struct {
-			ID         string `json:"id"`
-			Format     string `json:"format"`
-			DiscCount  int    `json:"disc-count"`
-			TrackCount int    `json:"track-count"`
-		} `json:"media"`
-		Tags []struct {
-			Count int    `json:"count"`
-			Name  string `json:"name"`
-		} `json:"tags,omitempty"`
-		Asin    string `json:"asin,omitempty"`
-		Barcode string `json:"barcode,omitempty"`
-	} `json:"releases"`
+	Created    time.Time   `json:"created"`
+	Count      int64       `json:"count"`
+	Offset     int64       `json:"offset"`
+	Recordings []Recording `json:"recordings"`
+}
+
+type Recording struct {
+	ID               string         `json:"id"`
+	Score            int64          `json:"score"`
+	ArtistCreditID   string         `json:"artist-credit-id"`
+	Title            string         `json:"title"`
+	Length           int64          `json:"length"`
+	Disambiguation   *string        `json:"disambiguation,omitempty"`
+	Video            interface{}    `json:"video"`
+	ArtistCredit     []ArtistCredit `json:"artist-credit"`
+	FirstReleaseDate string         `json:"first-release-date"`
+	Releases         []Release      `json:"releases"`
+	Isrcs            []string       `json:"isrcs,omitempty"`
+}
+
+type ArtistCredit struct {
+	Joinphrase *string `json:"joinphrase,omitempty"`
+	Name       string  `json:"name"`
+	Artist     Artist  `json:"artist"`
+}
+
+type Artist struct {
+	ID             string   `json:"id"`
+	Name           string   `json:"name"`
+	SortName       string   `json:"sort-name"`
+	Disambiguation *string  `json:"disambiguation,omitempty"`
+	Aliases        []Alias  `json:"aliases,omitempty"`
+	ISO31661Codes  []string `json:"iso-3166-1-codes,omitempty"`
+}
+
+type Alias struct {
+	SortName  string      `json:"sort-name"`
+	TypeID    *string     `json:"type-id,omitempty"`
+	Name      string      `json:"name"`
+	Locale    *string     `json:"locale"`
+	Type      *string     `json:"type"`
+	Primary   *bool       `json:"primary"`
+	BeginDate interface{} `json:"begin-date"`
+	EndDate   interface{} `json:"end-date"`
+}
+
+type Release struct {
+	ID             string         `json:"id"`
+	StatusID       *string        `json:"status-id,omitempty"`
+	ArtistCreditID string         `json:"artist-credit-id"`
+	Count          int64          `json:"count"`
+	Title          string         `json:"title"`
+	Status         *string        `json:"status,omitempty"`
+	Disambiguation *string        `json:"disambiguation,omitempty"`
+	ArtistCredit   []ArtistCredit `json:"artist-credit"`
+	ReleaseGroup   ReleaseGroup   `json:"release-group"`
+	Date           *string        `json:"date,omitempty"`
+	Country        *string        `json:"country,omitempty"`
+	ReleaseEvents  []ReleaseEvent `json:"release-events,omitempty"`
+	TrackCount     int64          `json:"track-count"`
+	Media          []Media        `json:"media"`
+}
+
+type Media struct {
+	ID          string  `json:"id"`
+	Position    int64   `json:"position"`
+	Format      string  `json:"format"`
+	Track       []Track `json:"track"`
+	TrackCount  int64   `json:"track-count"`
+	TrackOffset int64   `json:"track-offset"`
+}
+
+type Track struct {
+	ID     string `json:"id"`
+	Number string `json:"number"`
+	Title  string `json:"title"`
+	Length *int64 `json:"length,omitempty"`
+}
+
+type ReleaseEvent struct {
+	Date string `json:"date"`
+	Area Artist `json:"area"`
+}
+
+type ReleaseGroup struct {
+	ID               string   `json:"id"`
+	TypeID           string   `json:"type-id"`
+	PrimaryTypeID    string   `json:"primary-type-id"`
+	Title            string   `json:"title"`
+	PrimaryType      string   `json:"primary-type"`
+	SecondaryTypes   []string `json:"secondary-types,omitempty"`
+	SecondaryTypeIDS []string `json:"secondary-type-ids,omitempty"`
 }