Waiting animation for anilist mode

Author: aQaTL

anilist/animation_helpers.go

@@ -0,0 +1,42 @@
+package anilist
+
+import (
+	"github.com/aqatl/mal/oauth2"
+	"github.com/aqatl/cliwait"
+)
+
+func QueryUserListsWaitAnimation(userId int, token oauth2.OAuthToken) ([]MediaListGroup, error) {
+	var mlg []MediaListGroup
+	var err error
+	cliwait.DoFuncWithWaitAnimation("Queyring user list", func() {
+		mlg, err = QueryUserLists(userId, token)
+	})
+	return mlg, err
+}
+
+func QueryAuthenticatedUserWaitAnimation(user *User, token oauth2.OAuthToken) error {
+	var err error
+	cliwait.DoFuncWithWaitAnimation("Saving entry", func() {
+		err = QueryAuthenticatedUser(user, token)
+	})
+	return err
+}
+
+func SaveMediaListEntryWaitAnimation(entry *MediaListEntry, token oauth2.OAuthToken) error {
+	var err error
+	cliwait.DoFuncWithWaitAnimation("Saving entry", func() {
+		err = SaveMediaListEntry(entry, token)
+	})
+	return err
+}
+
+func QueryAiringScheduleWaitAnimation(mediaId, episode int, token oauth2.OAuthToken) (
+	AiringSchedule, error,
+) {
+	var as AiringSchedule
+	var err error
+	cliwait.DoFuncWithWaitAnimation("Querying airing schedule", func() {
+		as, err = QueryAiringSchedule(mediaId, episode, token)
+	})
+	return as, err
+}

anilist_app.go

@@ -241,7 +241,7 @@ func alSetEntryEpisodes(ctx *cli.Context) error {
 
 	alStatusAutoUpdate(cfg, entry)
 
-	if err = anilist.SaveMediaListEntry(entry, al.Token); err != nil {
+	if err = anilist.SaveMediaListEntryWaitAnimation(entry, al.Token); err != nil {
 		return err
 	}
 	if err = saveAniListAnimeLists(al); err != nil {
@@ -285,7 +285,7 @@ func alSetEntryStatus(ctx *cli.Context) error {
 
 	entry.Status = status
 
-	if err = anilist.SaveMediaListEntry(entry, al.Token); err != nil {
+	if err = anilist.SaveMediaListEntryWaitAnimation(entry, al.Token); err != nil {
 		return err
 	}
 	if err = saveAniListAnimeLists(al); err != nil {
@@ -310,7 +310,7 @@ func alSetEntryScore(ctx *cli.Context) error {
 
 	entry.Score = score
 
-	if err = anilist.SaveMediaListEntry(entry, al.Token); err != nil {
+	if err = anilist.SaveMediaListEntryWaitAnimation(entry, al.Token); err != nil {
 		return err
 	}
 	if err = saveAniListAnimeLists(al); err != nil {
@@ -484,7 +484,7 @@ func alNextAiringEpisode(ctx *cli.Context) error {
 	if cfg.StatusAutoUpdateMode != AfterThreshold && entry.Progress < entry.Episodes {
 		episode++
 	}
-	schedule, err := anilist.QueryAiringSchedule(entry.Id, episode, al.Token)
+	schedule, err := anilist.QueryAiringScheduleWaitAnimation(entry.Id, episode, al.Token)
 	if err != nil {
 		return err
 	}

cache.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 	"io/ioutil"
 	"golang.org/x/crypto/ssh/terminal"
+	"github.com/aqatl/cliwait"
 )
 
 func checkDataDir() {
@@ -64,7 +65,7 @@ func loadData(c *mal.Client, ctx *cli.Context) (mal.AnimeList, error) {
 	if ctx.GlobalBool("refresh") || cacheNotExist() {
 		{
 			var err error
-			mal.DoFuncWithWaitAnimation("Fetching your list", func() {
+			cliwait.DoFuncWithWaitAnimation("Fetching your list", func() {
 				list, err = c.AnimeList(mal.All)
 			})
 			return nil, fmt.Errorf("error fetching your list\n%v", err)

mal/utils.go

@@ -4,10 +4,7 @@ import (
 	"strings"
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
-	"time"
-	"github.com/fatih/color"
-	"bufio"
-	"os"
+	"github.com/aqatl/cliwait"
 )
 
 func ParseStatus(status string) MyStatus {
@@ -41,39 +38,10 @@ func isTextEqualFilterFunc(text string) func(i int, s *goquery.Selection) bool {
 	}
 }
 
-func DoFuncWithWaitAnimation(text string, f func()) {
-	done := make(chan struct{})
-	go func() {
-		f()
-		done <- struct{}{}
-	}()
-
-	ticker := time.NewTicker(100 * time.Millisecond)
-	defer ticker.Stop()
-
-	green := color.New(color.FgHiGreen).FprintFunc()
-	clockStates := [...]string{"-", "\\", "|", "/"}
-	currClockState := 0
-
-	stdout := bufio.NewWriter(os.Stdout)
-	for {
-		select {
-		case <-ticker.C:
-			green(color.Output, fmt.Sprintf("\r%s %s", text, clockStates[currClockState]))
-			stdout.Flush()
-			currClockState = (currClockState + 1) % len(clockStates)
-		case <-done:
-			fmt.Fprintf(color.Output, "\r%s\r", strings.Repeat(" ", len(text)+4))
-			stdout.Flush()
-			return
-		}
-	}
-}
-
 func FetchDetailsWithAnimation(c *Client, entry *Anime) (*AnimeDetails, error) {
 	var details *AnimeDetails
 	var err error
-	DoFuncWithWaitAnimation("Fetching details", func() {
+	cliwait.DoFuncWithWaitAnimation("Fetching details", func() {
 		details, err = c.FetchDetails(entry)
 	})
 	return details, err
@@ -82,7 +50,7 @@ func FetchDetailsWithAnimation(c *Client, entry *Anime) (*AnimeDetails, error) {
 
 func UpdateEntryWithAnimation(c *Client, entry *Anime) (error) {
 	var err error
-	DoFuncWithWaitAnimation("Updating entry", func() {
+	cliwait.DoFuncWithWaitAnimation("Updating entry", func() {
 		err = c.Update(entry)
 	})
 	return err

mal_app.go

@@ -14,6 +14,7 @@ import (
 	"github.com/fatih/color"
 	"github.com/skratchdot/open-golang/open"
 	"github.com/urfave/cli"
+	"github.com/aqatl/cliwait"
 )
 
 func MalApp(app *cli.App) *cli.App {
@@ -544,7 +545,7 @@ func deleteEntry(ctx *cli.Context) error {
 		return fmt.Errorf("no entry selected")
 	}
 
-	mal.DoFuncWithWaitAnimation("Deleting entry", func() {
+	cliwait.DoFuncWithWaitAnimation("Deleting entry", func() {
 		err = c.Delete(entry)
 	})
 	if err != nil {