Handle the some sites implementing the resolution as an int and some …

…string in their heresphere api

pkg/api/heresphere.go

@@ -89,12 +89,13 @@ type HeresphereMedia struct {
 	Sources []HeresphereSource `json:"sources"`
 }
 
+type StringOrInt string
 type HeresphereSource struct {
-	Resolution string `json:"resolution"`
-	Height     int    `json:"height"`
-	Width      int    `json:"width"`
-	Size       int64  `json:"size"`
-	URL        string `json:"url"`
+	Resolution StringOrInt `json:"resolution"`
+	Height     int         `json:"height"`
+	Width      int         `json:"width"`
+	Size       int64       `json:"size"`
+	URL        string      `json:"url"`
 }
 
 type HereSphereAlphaPackedSettings struct {
@@ -226,7 +227,7 @@ func (i HeresphereResource) getHeresphereFile(req *restful.Request, resp *restfu
 		Name: fmt.Sprintf("File 1/1 %vp - %v", resolution, humanize.Bytes(uint64(file.Size))),
 		Sources: []HeresphereSource{
 			{
-				Resolution: resolution,
+				Resolution: StringOrInt(resolution),
 				Height:     height,
 				Width:      width,
 				Size:       file.Size,
@@ -341,7 +342,7 @@ func (i HeresphereResource) getHeresphereScene(req *restful.Request, resp *restf
 			Name: fmt.Sprintf("File %v/%v %vp - %v", i+1, len(videoFiles), resolution, humanize.Bytes(uint64(file.Size))),
 			Sources: []HeresphereSource{
 				{
-					Resolution: resolution,
+					Resolution: StringOrInt(resolution),
 					Height:     height,
 					Width:      width,
 					Size:       file.Size,
@@ -366,7 +367,7 @@ func (i HeresphereResource) getHeresphereScene(req *restful.Request, resp *restf
 				if len(encoding.VideoSources) > 0 {
 					hsp.Name = encoding.Name
 					for _, source := range encoding.VideoSources {
-						hspSource := HeresphereSource(HeresphereSource{Resolution: strconv.Itoa(source.Resolution), Height: source.Height, Width: source.Width, Size: source.Size, URL: source.URL})
+						hspSource := HeresphereSource(HeresphereSource{Resolution: StringOrInt(strconv.Itoa(source.Resolution)), Height: source.Height, Width: source.Width, Size: source.Size, URL: source.URL})
 						hsp.Sources = append(hsp.Sources, hspSource)
 					}
 					media = append(media, hsp)
@@ -1099,3 +1100,20 @@ func getTrackAssignment(name string, trackAssignments *[]string) int {
 	*trackAssignments = append(*trackAssignments, name)
 	return len(*trackAssignments)
 }
+
+func (fs *StringOrInt) UnmarshalJSON(data []byte) error {
+	var str string
+	// Try to unmarshal as a string
+	if err := json.Unmarshal(data, &str); err == nil {
+		*fs = StringOrInt(str)
+		return nil
+	}
+	// Try to unmarshal as an int
+	var num int
+	if err := json.Unmarshal(data, &num); err == nil {
+		*fs = StringOrInt(fmt.Sprintf("%d", num))
+		return nil
+	}
+	// Return an error if neither worked
+	return fmt.Errorf("invalid resolution format: %s", data)
+}