show platforms compability

vikoadi · Feb 21, 2016 · abde0f8 · abde0f8
1 parent f7c917c
commit abde0f8
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 14 deletions.
diff --git a/giantbomb.go b/giantbomb.go
@@ -129,7 +129,7 @@ func parseJson(jsonStream string, target interface{}) error {
 	return json.NewDecoder(strings.NewReader(jsonStream)).Decode(target)
 }
 
-func Filter(platformsInfo Platforms, filter int) bool {
+func GetPlatformsFilter(platformsInfo Platforms) int {
 	platform := 0
 	for _, platformInfo := range platformsInfo {
 		if platformInfo.Abbreviation == "LIN" {
@@ -147,6 +147,9 @@ func Filter(platformsInfo Platforms, filter int) bool {
 	if platform == 0 {
 		platform = 8
 	}
+	return platform
+}
 
-	return (filter & platform) > 0
+func Filter(platformsInfo Platforms, filter int) bool {
+	return (filter & GetPlatformsFilter(platformsInfo)) > 0
 }
diff --git a/platform1.png b/platform1.png
diff --git a/platform2.png b/platform2.png
diff --git a/platform3.png b/platform3.png
diff --git a/platform4.png b/platform4.png
diff --git a/platform5.png b/platform5.png
diff --git a/platform6.png b/platform6.png
diff --git a/platform7.png b/platform7.png
diff --git a/platforms1.png b/platforms1.png
diff --git a/platforms2.png b/platforms2.png
diff --git a/platforms3.png b/platforms3.png
diff --git a/platforms4.png b/platforms4.png
diff --git a/platforms5.png b/platforms5.png
diff --git a/platforms6.png b/platforms6.png
diff --git a/platforms7.png b/platforms7.png
diff --git a/query.go b/query.go
@@ -197,7 +197,7 @@ func (s *Query) AddSearchResults(reply *scopes.SearchReply, query string) error
 }
 
 func getDateString(unixDate int64) string {
-	return time.Unix(unixDate,0).Format ("2 January 2006")
+	return time.Unix(unixDate, 0).Format("2 January 2006")
 }
 
 func (s *Query) registerCategory(reply *scopes.SearchReply, id string, title string, template string, deals cheapshark.Deal, completeDetail bool) error {
@@ -209,16 +209,16 @@ func (s *Query) registerCategory(reply *scopes.SearchReply, id string, title str
 		savingsF, _ := d.Savings.Float64()
 		releaseDate, _ := d.ReleaseDate.Int64()
 		releaseDateStr := ""
-		if r := getDateString (releaseDate);releaseDate!=0 {
-			releaseDateStr=r
+		if r := getDateString(releaseDate); releaseDate != 0 {
+			releaseDateStr = r
 		}
 
 		storeIcon := s.getStoreIcon(d.StoreID)
 		log.Println(storeIcon)
 		if completeDetail {
 			if info, err := gb.GetInfo(d.Title); err == nil {
 				if Filter(info.Platforms, platformFilter) {
-					addCategorisedGameResult(result, "http://www.cheapshark.com/redirect?dealID="+d.DealID, d.Title, d.Title, d.NormalPrice.String(), d.SalePrice.String(), strconv.Itoa(int(math.Floor(savingsF))), d.MetacriticScore.String(), d.DealRating.String(), info.Image.ThumbURL, info.Image.SmallURL, storeIcon, info.Description, releaseDateStr, "icon.png")
+					addCategorisedGameResult(result, "http://www.cheapshark.com/redirect?dealID="+d.DealID, d.Title, d.Title, d.NormalPrice.String(), d.SalePrice.String(), strconv.Itoa(int(math.Floor(savingsF))), d.MetacriticScore.String(), d.DealRating.String(), info.Image.ThumbURL, info.Image.SmallURL, storeIcon, info.Description, releaseDateStr, s.getStoreIcon("platform"+strconv.Itoa(GetPlatformsFilter(info.Platforms))))
 					if err := reply.Push(result); err != nil {
 						return err
 					}
@@ -246,9 +246,9 @@ func addCategorisedGameResult(result *scopes.CategorisedResult, uri string, dndU
 	result.SetArt(art)
 	result.Set("bigArt", bigArt)
 	result.Set("normalPrice", normalPrice)
-	if (salePrice=="0") {
+	if salePrice == "0" {
 		result.Set("salePrice", "<b>FREE</b> from $"+normalPrice)
-	}else {
+	} else {
 		result.Set("salePrice", "<b>$"+salePrice+"</b> from $"+normalPrice)
 	}
 	result.Set("uri", uri)
@@ -264,21 +264,21 @@ func addCategorisedGameResult(result *scopes.CategorisedResult, uri string, dndU
 	}
 
 	attr := []Attr{}
-	if (savings!="0") {
-		attr=append(attr, Attr{Value: savings + "%", Icon: storeIcon})
+	if savings != "0" {
+		attr = append(attr, Attr{Value: savings + "%", Icon: storeIcon})
 	}
-	if (metacriticScore!="0") {
-		attr=append(attr, Attr{Value: metacriticScore, Icon: "image://theme/starred"})
+	if metacriticScore != "0" {
+		attr = append(attr, Attr{Value: metacriticScore, Icon: "image://theme/starred"})
 	}
 
 	result.Set("attributes", attr)
 
 	completeAttr := attr
 
 	if releaseDate != "" {
-		completeAttr = append(completeAttr, Attr{Value: "released at "+releaseDate})
+		completeAttr = append(completeAttr, Attr{Value: "released at " + releaseDate})
 	}
-
+	log.Println(platformsIcon)
 	if platformsIcon != "" {
 		completeAttr = append(completeAttr, Attr{Icon: platformsIcon})
 	}