Update curse dl checker to use CAV

Author: modmuss50

.gitignore

@@ -9,4 +9,5 @@
 commands.txt
 curse.json.bz2
 discordBot
-discordLog.txt
+discordLog.txt
+auth_config.json

Main.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 	"github.com/bwmarrin/discordgo"
-	"github.com/modmuss50/discordBot/minecraft"
+	"github.com/TechReborn/DiscordBot/curse"
 	"github.com/modmuss50/MCP-Diff/mcpDiff"
 	"strconv"
 	"github.com/modmuss50/MCP-Diff/utils"
@@ -14,7 +14,7 @@ import (
 	"bytes"
 	"io/ioutil"
 	"github.com/modmuss50/goutils"
-	"github.com/modmuss50/discordBot/curse"
+	"github.com/TechReborn/DiscordBot/minecraft"
 )
 
 var (

build.gradle

@@ -19,6 +19,7 @@ golang {
         build 'github.com/patrickmn/go-cache'
         build 'github.com/modmuss50/goutils'
         build 'github.com/dustin/go-humanize'
+        build 'github.com/modmuss50/CAV2'
         forceUpdate = true
     }
     platforms = System.getProperty("platforms", "linux-amd64,windows-amd64,darwin-amd64")

curse/Curse.go

@@ -7,13 +7,14 @@ import (
 	"github.com/modmuss50/goutils"
 	"encoding/json"
 	"strings"
-	"strconv"
 	"github.com/dustin/go-humanize"
 	"github.com/bwmarrin/discordgo"
 	"sort"
 	"github.com/patrickmn/go-cache"
 	"time"
 	"compress/bzip2"
+	"github.com/modmuss50/CAV2"
+	"strconv"
 )
 
 var (
@@ -23,6 +24,12 @@ var (
 
 func Load(){
 	Cache = cache.New(90*time.Minute, 1*time.Minute)
+
+	//logs with with cav
+	err := cav2.SetupDefaultConfig()
+	if err != nil {
+		panic(err)
+	}
 }
 
 func HandleCurseMessage(s *discordgo.Session, m *discordgo.MessageCreate) bool {
@@ -37,7 +44,8 @@ func HandleCurseMessage(s *discordgo.Session, m *discordgo.MessageCreate) bool {
 
 		data, found := Cache.Get("data")
 		if !found {
-			s.ChannelMessageSend(m.ChannelID, "Curse Cache Expired, re-downloading")
+			m, merr := s.ChannelMessageSend(m.ChannelID, "Curse Cache Expired, give me a second ...")
+			s.ChannelTyping(m.ChannelID)
 			reader, dwerr := goutils.Download("http://clientupdate-v6.cursecdn.com/feed/addons/432/v10/complete.json.bz2")
 			if dwerr != nil{
 				s.ChannelMessageSend(m.ChannelID, "failed to download curse data")
@@ -55,62 +63,77 @@ func HandleCurseMessage(s *discordgo.Session, m *discordgo.MessageCreate) bool {
 			data = database
 
 			Cache.Set("data", database, cache.DefaultExpiration)
+
+			if merr == nil { //Remove that message
+				s.ChannelMessageDelete(m.ChannelID, m.ID)
+			}
 		}
 
 		var database = data.(AddonDatabase)
 
-		var downloads int64 = 0
 
-		var addons []Addon
+
+		var addons []int
 
 		for _,addon := range database.Addons {
 			for _,author := range addon.Authors {
 				if strings.EqualFold(author.Name, username){
-					addons = append(addons, addon)
-
-					downloads = downloads + getDownloadCount(addon.DownloadCount)
+					addons = append(addons, addon.Id)
 				}
 			}
 		}
 
+		if len(addons) == 0 {
+			s.ChannelMessageSend(m.ChannelID, "No addons found for " + username)
+			return true
+		}
+
+
+		var downloads float64 = 0
+		addonInfo, err := cav2.GetAddons(addons)
+		if err != nil {
+			s.ChannelMessageSend(m.ChannelID, "Something bad happened when loading detailed addon data from curse")
+			return true
+		}
+
+		for _, addon := range addonInfo {
+			downloads += addon.DownloadCount
+		}
+
 		if downloads == 0 {
 			s.ChannelMessageSend(m.ChannelID, "No downloads found for " + username)
 			return true
 		}
 
-		sort.Sort(SortAddon(addons))
+		sort.Sort(SortAddon(addonInfo))
 		projects := ""
-		for i,addon := range addons {
-			if i < 10 {
-				projects = projects + addon.Name + " : `" + humanize.Comma(getDownloadCount(addon.DownloadCount)) + "`\n"
-
-			}
+		for _,addon := range addonInfo {
+			projects = projects + addon.Name + " : `" + humanize.Comma(round(addon.DownloadCount)) + "`\n"
 		}
+
 		s.ChannelMessageSend(m.ChannelID, projects)
 
-		fmt.Println(humanize.Comma(downloads))
-		s.ChannelMessageSend(m.ChannelID, username +  " has `" + humanize.Comma(downloads) + "` total downloads")
+		fmt.Println(humanize.Comma(round(downloads)))
+		s.ChannelMessageSend(m.ChannelID, username +  " has `" + humanize.Comma(round(downloads)) + "` total downloads over `" + strconv.Itoa(len(addons)) + "` projects")
 	}
 	return false
 }
 
-type SortAddon []Addon
+type SortAddon []cav2.Addon
 
 func (c SortAddon) Len() int           { return len(c) }
 func (c SortAddon) Swap(i, j int)      { c[i], c[j] = c[j], c[i] }
-func (c SortAddon) Less(i, j int) bool { return getDownloadCount(c[i].DownloadCount ) > getDownloadCount(c[j].DownloadCount ) }
-
-func getDownloadCount(number json.Number) int64 {
-	intstr := strings.Split(number.String(), ".")[0]
-	int, _ := strconv.ParseInt(intstr, 10, 64)
-	return int
-}
+func (c SortAddon) Less(i, j int) bool { return c[i].DownloadCount  > c[j].DownloadCount }
 
 func LoadFromBz2(byteArray []byte) string {
 	reader := bzip2.NewReader(bytes.NewReader(byteArray))
 	buf := new(bytes.Buffer)
 	buf.ReadFrom(reader)
 	s := buf.String()
 	return s
+}
 
+func round(val float64) int64 {
+	if val < 0 { return int64(val-0.5) }
+	return int64(val+0.5)
 }

curse/CurseStructs.go

@@ -4,10 +4,10 @@ import "encoding/json"
 
 type AddonDatabase struct {
 	TimeStamp int64 `json:"timestamp"`
-	Addons []Addon `json:"data"`
+	Addons []AddonDB `json:"data"`
 }
 
-type Addon struct {
+type AddonDB struct {
 	Id int `json:"id"`
 	Name string `json:"name"`
 	Authors []Author `json:"authors"`