Updated avatar refresh

jobs/avatars/avatars.go

@@ -1,13 +1,10 @@
 package main
 
 import (
-	"fmt"
 	"os"
 	"path"
-	"reflect"
 	"runtime"
 	"sync"
-	"time"
 
 	_ "image/gif"
 	_ "image/jpeg"
@@ -15,19 +12,10 @@ import (
 
 	"github.com/aerogo/log"
 	"github.com/animenotifier/arn"
-	"github.com/animenotifier/avatar"
-	"github.com/animenotifier/avatar/outputs"
-	"github.com/animenotifier/avatar/sources"
+	"github.com/animenotifier/avatar/lib"
 	"github.com/fatih/color"
 )
 
-const (
-	webPQuality = 80
-)
-
-var avatarSources []avatar.Source
-var avatarOutputs []avatar.Output
-var avatarLog = log.New()
 var wg sync.WaitGroup
 
 // Main
@@ -45,51 +33,8 @@ func main() {
 	os.Chdir(path.Join(root, "../../"))
 
 	// Log
-	avatarLog.AddOutput(log.File("logs/avatar.log"))
-	defer avatarLog.Flush()
-
-	// Define the avatar sources
-	avatarSources = []avatar.Source{
-		&sources.Gravatar{
-			Rating:         "pg",
-			RequestLimiter: time.NewTicker(100 * time.Millisecond),
-		},
-		&sources.MyAnimeList{
-			RequestLimiter: time.NewTicker(250 * time.Millisecond),
-		},
-		&sources.FileSystem{
-			Directory: "images/avatars/large/",
-		},
-	}
-
-	// Define the avatar outputs
-	avatarOutputs = []avatar.Output{
-		// Original - Large
-		&outputs.OriginalFile{
-			Directory: "images/avatars/large/",
-			Size:      arn.AvatarMaxSize,
-		},
-
-		// Original - Small
-		&outputs.OriginalFile{
-			Directory: "images/avatars/small/",
-			Size:      arn.AvatarSmallSize,
-		},
-
-		// WebP - Large
-		&outputs.WebPFile{
-			Directory: "images/avatars/large/",
-			Size:      arn.AvatarMaxSize,
-			Quality:   webPQuality,
-		},
-
-		// WebP - Small
-		&outputs.WebPFile{
-			Directory: "images/avatars/small/",
-			Size:      arn.AvatarSmallSize,
-			Quality:   webPQuality,
-		},
-	}
+	lib.Log.AddOutput(log.File("logs/avatar.log"))
+	defer lib.Log.Flush()
 
 	if InvokeShellArgs() {
 		return
@@ -97,7 +42,7 @@ func main() {
 
 	// Worker queue
 	usersQueue := make(chan *arn.User, runtime.NumCPU())
-	StartWorkers(usersQueue, Work)
+	StartWorkers(usersQueue, lib.RefreshAvatar)
 
 	allUsers, _ := arn.AllUsers()
 
@@ -123,59 +68,3 @@ func StartWorkers(queue chan *arn.User, work func(*arn.User)) {
 		}()
 	}
 }
-
-// Work handles a single user.
-func Work(user *arn.User) {
-	user.Avatar.Extension = ""
-
-	for _, source := range avatarSources {
-		avatar, err := source.GetAvatar(user)
-
-		if err != nil {
-			avatarLog.Error(err)
-			continue
-		}
-
-		if avatar == nil {
-			// fmt.Println(color.RedString("✘"), reflect.TypeOf(source).Elem().Name(), user.Nick)
-			continue
-		}
-
-		// Name of source
-		user.Avatar.Source = reflect.TypeOf(source).Elem().Name()
-
-		// Log
-		fmt.Println(color.GreenString("✔"), user.Avatar.Source, "|", user.Nick, "|", avatar)
-
-		// Avoid JPG quality loss (if it's on the file system, we don't need to write it again)
-		if user.Avatar.Source == "FileSystem" {
-			user.Avatar.Extension = avatar.Extension()
-			break
-		}
-
-		for _, writer := range avatarOutputs {
-			err := writer.SaveAvatar(avatar)
-
-			if err != nil {
-				color.Red(err.Error())
-			}
-		}
-
-		break
-	}
-
-	// Since this a very long running job, refresh user data before saving it.
-	avatarExt := user.Avatar.Extension
-	avatarSrc := user.Avatar.Source
-	user, err := arn.GetUser(user.ID)
-
-	if err != nil {
-		avatarLog.Error("Can't refresh user info:", user.ID, user.Nick)
-		return
-	}
-
-	// Save avatar data
-	user.Avatar.Extension = avatarExt
-	user.Avatar.Source = avatarSrc
-	user.Save()
-}