diff options
| -rw-r--r-- | cmd/score.go | 123 | ||||
| -rw-r--r-- | cmd/version.go | 2 | ||||
| -rw-r--r-- | mal/score.go | 41 | ||||
| -rw-r--r-- | ui/episodes.go | 4 | ||||
| -rw-r--r-- | ui/score.go | 112 | ||||
| -rw-r--r-- | ui/status.go | 2 | 
6 files changed, 280 insertions, 4 deletions
| diff --git a/cmd/score.go b/cmd/score.go new file mode 100644 index 0000000..15a1e03 --- /dev/null +++ b/cmd/score.go @@ -0,0 +1,123 @@ +/* +macli - Unofficial CLI-Based MyAnimeList Client +Copyright © 2022 Vidhu Kant Sharma <vidhukant@vidhukant.xyz> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +package cmd + +import ( +	"fmt" +	"os" +	"strings" +	"github.com/MikunoNaka/macli/ui" +	"github.com/MikunoNaka/macli/mal" + +	"github.com/spf13/cobra" +) + +// statusCmd represents the status command +var scoreCmd = &cobra.Command{ +	Use:   "score", +	Short: "Set an anime/manga's status", +	Long: "Set an anime's status\n" + +	"\n" + +    "Example Usage:\n" + +	" - \x1b[33m`macli status <anime-name>`\x1b[0m For interactive prompt (anime-name can be omitted)\n" + +	" - \x1b[33m`macli status -s \x1b[34mwatching|plan_to_watch|dropped|on_hold|completed\x1b[33m <anime-name>`\x1b[0m to specify status from command\n", +	Run: func(cmd *cobra.Command, args []string) { +		searchInput := strings.Join(args, " ") + +		scoreInput, err := cmd.Flags().GetInt("set-value") +		if err != nil { +			fmt.Println("Error while reading \x1b[33m--set-value\x1b[0m flag.", err.Error()) +			os.Exit(1) +		} + +		mangaMode, err := cmd.Flags().GetBool("manga") +		if err != nil { +			fmt.Println("Error while reading \x1b[33m--manga\x1b[0m flag.", err.Error()) +			os.Exit(1) +		} + +		if mangaMode { +			setMangaScore(scoreInput, searchInput) +		} else { +			setAnimeScore(scoreInput, searchInput) +		} + +	}, +} + +func setAnimeScore(scoreInput int, searchInput string) { +	if searchInput == "" { +	    var promptText string +		if queryOnlyMode { +			promptText = "Search Anime to Get Score of: " +		} else { +			promptText = "Search Anime to Set Score of: " +		} +	   	searchInput = ui.TextInput(promptText, "Search can't be blank.") +	} + +	anime := ui.AnimeSearch("Select Anime: ", searchInput) +	selectedAnime := mal.GetAnimeData(anime.Id, []string{"my_list_status"}) +	currentScore := selectedAnime.MyListStatus.Score + +	if queryOnlyMode { +		fmt.Printf("\x1b[35m%s\x1b[0m Score :: %s\n", anime.Title, ui.FormatScore(currentScore)) +		os.Exit(0) +	} + +    if scoreInput < 0 { +		ui.ScoreInput(anime.Id, selectedAnime.MyListStatus.Score, anime.Title, false) +    } else { +    	resp := mal.SetAnimeScore(anime.Id, scoreInput) +    	fmt.Println(ui.CreateScoreUpdateConfirmationMessage(anime.Title, currentScore, resp.Score)) +    } +} + +func setMangaScore(scoreInput int, searchInput string) { +	if searchInput == "" { +	    var promptText string +		if queryOnlyMode { +			promptText = "Search Manga to Get Score of: " +		} else { +			promptText = "Search Manga to Set Score of: " +		} +	   	searchInput = ui.TextInput(promptText, "Search can't be blank.") +	} + +	manga := ui.MangaSearch("Select Manga: ", searchInput) +	selectedManga := mal.GetMangaData(manga.Id, []string{"my_list_status"}) +	currentScore := selectedManga.MyListStatus.Score + +	if queryOnlyMode { +		fmt.Printf("\x1b[35m%s\x1b[0m :: Score -> %s\n", manga.Title, ui.FormatScore(currentScore)) +		os.Exit(0) +	} + +    if scoreInput < 0 { +		ui.ScoreInput(manga.Id, selectedManga.MyListStatus.Score, manga.Title, false) +    } else { +    	resp := mal.SetAnimeScore(manga.Id, scoreInput) +    	fmt.Println(ui.CreateScoreUpdateConfirmationMessage(manga.Title, currentScore, resp.Score)) +    } +} + +func init() { +	rootCmd.AddCommand(scoreCmd) +    scoreCmd.Flags().IntP("set-value", "s", -1, "Score to be set") +} diff --git a/cmd/version.go b/cmd/version.go index fa574f1..4ca1a04 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -24,7 +24,7 @@ import (  	"github.com/spf13/cobra"  ) -var version string = "v1.4.3" +var version string = "v1.5.0"  var versionCmd = &cobra.Command {  	Use:   "version", diff --git a/mal/score.go b/mal/score.go new file mode 100644 index 0000000..fe52e73 --- /dev/null +++ b/mal/score.go @@ -0,0 +1,41 @@ +/* +macli - Unofficial CLI-Based MyAnimeList Client +Copyright © 2022 Vidhu Kant Sharma <vidhukant@vidhukant.xyz> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +package mal + +import ( +  "fmt" +  a "github.com/MikunoNaka/MAL2Go/v2/user/anime" +  m "github.com/MikunoNaka/MAL2Go/v2/user/manga" +) + +func SetAnimeScore(animeId, score int) a.UpdateResponse { +  resp, err := userAnimeClient.SetScore(animeId, score) +  if err != nil { +    fmt.Println("MyAnimeList returned error while updating anime score:", err) +  } +  return resp +} + +func SetMangaScore(mangaId, score int) m.UpdateResponse { +  resp, err := userMangaClient.SetScore(mangaId, score) +  if err != nil { +    fmt.Println("MyAnimeList returned error while updating manga score:", err) +  } +  return resp +} diff --git a/ui/episodes.go b/ui/episodes.go index 8b1bcff..69e2463 100644 --- a/ui/episodes.go +++ b/ui/episodes.go @@ -31,11 +31,11 @@ import (  // very short name I know  func CreateEpisodeUpdateConfirmationMessage(title string, prevEpNum, epNum int) string { -  return fmt.Sprintf("Set Episodes Watched for \x1b[35m%s\x1b[0m from \x1b[1;33m%d\x1b[0m to \x1b[1;36m%d\x1b[0m.", title, prevEpNum, epNum) +  return fmt.Sprintf("\x1b[35m%s\x1b[0m Episodes :: \x1b[1;33m%d\x1b[0m -> \x1b[1;36m%d\x1b[0m", title, prevEpNum, epNum)  }  func CreateChapterUpdateConfirmationMessage(title string, prevChNum, chNum int) string { -  return fmt.Sprintf("Set Chapters Read for \x1b[35m%s\x1b[0m from \x1b[1;33m%d\x1b[0m to \x1b[1;36m%d\x1b[0m.", title, prevChNum, chNum) +  return fmt.Sprintf("\x1b[35m%s\x1b[0m Chapters :: \x1b[1;33m%d\x1b[0m -> \x1b[1;36m%d\x1b[0m", title, prevChNum, chNum)  }  func EpisodeInput(anime a.Anime) { diff --git a/ui/score.go b/ui/score.go new file mode 100644 index 0000000..6f0d92a --- /dev/null +++ b/ui/score.go @@ -0,0 +1,112 @@ +/* +macli - Unofficial CLI-Based MyAnimeList Client +Copyright © 2022 Vidhu Kant Sharma <vidhukant@vidhukant.xyz> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +package ui + +import ( +  "strconv" +  "errors" +  "fmt" +  "os" +  "github.com/MikunoNaka/macli/mal" +  // m "github.com/MikunoNaka/MAL2Go/v2/manga" +  p "github.com/manifoldco/promptui" +) + +// to print dropped in red color, etc +func GetColorCodeByScore(score int) string { +  switch score { +    case 0: +      return "\x1b[37m" +    case 1: +      return "\x1b[31m" +    case 2: +      return "\x1b[1;31m" +    case 3: +      return "\x1b[35m" +    case 4: +      return "\x1b[1;35m" +    case 5: +      return "\x1b[33m" +    case 6: +      return "\x1b[1;33m" +    case 7: +      return "\x1b[36m" +    case 8: +      return "\x1b[1;36m" +    case 9: +      return "\x1b[32m" +    case 10: +      return "\x1b[1;32m" +    default: +      return "" +  } +} + +func FormatScore(score int) string { +  return fmt.Sprintf("%s%d\x1b[0m", GetColorCodeByScore(score), score) +} + +// very short name I know +func CreateScoreUpdateConfirmationMessage(title string, prevScore, score int) string { +  return fmt.Sprintf("\x1b[35m%s\x1b[0m Score :: %s -> %s", title, FormatScore(prevScore), FormatScore(score)) +} + +func ScoreInput(id, currentScore int, title string, isManga bool) { +  validate := func(input string) error { +    i, err := strconv.ParseFloat(input, 64) +    if err != nil || i < 0 || i > 10 { +      return errors.New("Input must be a number within 0-10.") +    } +    return nil +  } + +  template := &p.PromptTemplates { +    Valid: "\x1b[0m{{ . | magenta }}", +    Invalid: "\x1b[0m{{ . | magenta }}\x1b[31m ", +    Success: "{{ . | cyan }}", +  } + +  prompt := p.Prompt { +    Label: fmt.Sprintf("Set Score (Current: %d): ", currentScore), +    Templates: template, +    Validate:  validate, +  } + +  res, err := prompt.Run() +  if err != nil { +    fmt.Println("Error Running score input Prompt.", err.Error()) +    os.Exit(1) +  } + +  score, err := strconv.Atoi(res) +  if err != nil { +    fmt.Println("Error while parsing score input:", err) +  } + +  var newScore int +  if isManga { +    resp := mal.SetMangaScore(id, score) +    newScore = resp.Score +  } else { +    resp := mal.SetAnimeScore(id, score) +    newScore = resp.Score +  } + +  fmt.Println(CreateScoreUpdateConfirmationMessage(title, currentScore, newScore)) +} diff --git a/ui/status.go b/ui/status.go index 7e8687e..7a0e538 100644 --- a/ui/status.go +++ b/ui/status.go @@ -47,7 +47,7 @@ func GetColorCodeByStatus(status string) string {      case "plan_to_watch", "plan_to_read":        return "\x1b[36m"      case "": -      return "\x1b[38;5;7m" +      return "\x1b[37m"      default:        return ""    } |