aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd/1136
-rw-r--r--cmd/chapters.go2
-rw-r--r--cmd/episodes.go2
-rw-r--r--cmd/score.go2
-rw-r--r--cmd/search.go2
-rw-r--r--cmd/status.go2
-rw-r--r--cmd/volumes.go2
-rw-r--r--macli.yaml39
-rw-r--r--mal/mal.go1
-rw-r--r--mal/search.go16
-rw-r--r--ui/search.go18
-rw-r--r--util/bind_config.go8
12 files changed, 53 insertions, 177 deletions
diff --git a/cmd/1 b/cmd/1
deleted file mode 100644
index 0961ffe..0000000
--- a/cmd/1
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-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/mal"
- "github.com/MikunoNaka/macli/ui"
- "github.com/MikunoNaka/macli/util"
- a "github.com/MikunoNaka/MAL2Go/v4/anime"
- m "github.com/MikunoNaka/MAL2Go/v4/manga"
- "github.com/spf13/cobra"
-)
-
-var searchCmd = &cobra.Command {
- Use: "search",
- Short: "Search for an anime/manga",
- Long: "Search for an anime or a manga on MyAnimeList\n" +
- "\n" +
- "Example Usage:\n" +
- "\t\x1b[33m`macli search <anime-name>`\x1b[0m searches for an anime\n" +
- "\t\x1b[33m`macli search -m <manga-name>`\x1b[0m searches for a manga\n" +
- "\t\x1b[33m`macli search`\x1b[0m interactively asks for an anime to search for (same for manga with -m/--manga flag)\n",
- Run: func(cmd *cobra.Command, args []string) {
- conf, err := util.BindSearchConfig(cmd.Flags())
- if err != nil {
- fmt.Println("Error while parsing flags.", err.Error())
- os.Exit(1)
- }
- mal.SearchLength = conf.SearchLength
- mal.SearchOffset = conf.SearchOffset
- mal.SearchNSFW = conf.SearchNSFW
- ui.PromptLength = conf.PromptLength
- mal.Init()
-
- // read searchInput from command
- searchInput := strings.Join(args, " ")
- 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 {
- searchManga(searchInput)
- } else {
- searchAnime(searchInput)
- }
- },
-}
-
-func searchManga(searchInput string) {
- var selectedManga m.Manga
- mangaId := entryId
- fields := []string{}
-
- if entryId < 1 {
- if searchInput == "" {
- searchInput = ui.TextInput("Search Manga: ", "Search can't be blank.")
- }
- manga := ui.MangaSearch("Select Manga:", searchInput)
- mangaId = manga.Id
- fields = []string{"my_list_status", "num_chapters"}
- }
-
- selectedManga = mal.GetMangaData(mangaId, fields)
-
- if queryOnlyMode {
- util.PrintManga(selectedManga)
- os.Exit(0)
- }
-
- if entryId > 1 {
- fmt.Println("Selected: \x1b[35m" + selectedManga.Title + "\x1b[0m")
- }
- ui.MangaActionMenu(selectedManga.MyListStatus.Status != "")(selectedManga)
-}
-
-func searchAnime(searchInput string) {
- var selectedAnime a.Anime
- animeId := entryId
- fields := []string{}
-
- if entryId < 1 {
- if searchInput == "" {
- searchInput = ui.TextInput("Search Anime: ", "Search can't be blank.")
- }
- anime := ui.AnimeSearch("Select Anime:", searchInput)
- animeId = anime.Id
- fields = []string{"my_list_status", "num_episodes"}
- }
-
- selectedAnime = mal.GetAnimeData(animeId, fields)
-
- if queryOnlyMode {
- util.PrintAnime(selectedAnime)
- os.Exit(0)
- }
-
- if entryId > 1 {
- fmt.Println("Selected: \x1b[35m" + selectedAnime.Title + "\x1b[0m")
- }
- ui.AnimeActionMenu(selectedAnime.MyListStatus.Status != "")(selectedAnime)
-}
-
-func init() {
- rootCmd.AddCommand(searchCmd)
- searchCmd.Flags().BoolVarP(&mangaMode, "manga", "m", false, "Use manga mode")
- searchCmd.Flags().IntVarP(&entryId, "id", "i", -1, "Manually specify the ID of anime/manga (overrides search)")
- searchCmd.Flags().BoolVarP(&queryOnlyMode, "query", "q", false, "Query only (don't update data)")
- searchCmd.Flags().StringVarP(&mal.Secret, "authentication-token", "t", "", "MyAnimeList authentication token to use (overrides system keyring if any)")
-
- searchCmd.Flags().IntP("prompt-length", "l", 5, "Length of select prompt")
- searchCmd.Flags().IntP("search-length", "n", 10, "Amount of search results to load")
- searchCmd.Flags().IntP("search-offset", "o", 0, "Offset for the search results")
- searchCmd.Flags().BoolP("search-nsfw", "", false, "Include NSFW-rated items in search results")
-}
diff --git a/cmd/chapters.go b/cmd/chapters.go
index f8c3414..15e2169 100644
--- a/cmd/chapters.go
+++ b/cmd/chapters.go
@@ -50,6 +50,7 @@ var chaptersCmd = &cobra.Command{
mal.SearchLength = conf.SearchLength
mal.SearchOffset = conf.SearchOffset
mal.SearchNSFW = conf.SearchNSFW
+ mal.AutoSel = conf.AutoSel
ui.PromptLength = conf.PromptLength
mal.Init()
@@ -104,6 +105,7 @@ func init() {
chaptersCmd.Flags().IntVarP(&entryId, "id", "i", -1, "Manually specify the ID of anime/manga (overrides search)")
chaptersCmd.Flags().StringVarP(&mal.Secret, "authentication-token", "t", "", "MyAnimeList authentication token to use (overrides system keyring if any)")
+ chaptersCmd.Flags().IntP("auto-select", "S", 0, "Automatically select nth value")
chaptersCmd.Flags().IntP("prompt-length", "l", 5, "Length of select prompt")
chaptersCmd.Flags().IntP("search-length", "n", 10, "Amount of search results to load")
chaptersCmd.Flags().IntP("search-offset", "o", 0, "Offset for the search results")
diff --git a/cmd/episodes.go b/cmd/episodes.go
index fce4b2a..a2dbd4d 100644
--- a/cmd/episodes.go
+++ b/cmd/episodes.go
@@ -50,6 +50,7 @@ var episodesCmd = &cobra.Command{
mal.SearchLength = conf.SearchLength
mal.SearchOffset = conf.SearchOffset
mal.SearchNSFW = conf.SearchNSFW
+ mal.AutoSel = conf.AutoSel
ui.PromptLength = conf.PromptLength
mal.Init()
@@ -104,6 +105,7 @@ func init() {
episodesCmd.Flags().IntVarP(&entryId, "id", "i", -1, "Manually specify the ID of anime/manga (overrides search)")
episodesCmd.Flags().StringVarP(&mal.Secret, "authentication-token", "t", "", "MyAnimeList authentication token to use (overrides system keyring if any)")
+ episodesCmd.Flags().IntP("auto-select", "S", 0, "Automatically select nth value")
episodesCmd.Flags().IntP("prompt-length", "l", 5, "Length of select prompt")
episodesCmd.Flags().IntP("search-length", "n", 10, "Amount of search results to load")
episodesCmd.Flags().IntP("search-offset", "o", 0, "Offset for the search results")
diff --git a/cmd/score.go b/cmd/score.go
index a7a5aaa..57442fe 100644
--- a/cmd/score.go
+++ b/cmd/score.go
@@ -51,6 +51,7 @@ var scoreCmd = &cobra.Command{
mal.SearchLength = conf.SearchLength
mal.SearchOffset = conf.SearchOffset
mal.SearchNSFW = conf.SearchNSFW
+ mal.AutoSel = conf.AutoSel
ui.PromptLength = conf.PromptLength
mal.Init()
@@ -174,6 +175,7 @@ func init() {
scoreCmd.Flags().IntVarP(&entryId, "id", "i", -1, "Manually specify the ID of anime/manga (overrides search)")
scoreCmd.Flags().StringVarP(&mal.Secret, "authentication-token", "t", "", "MyAnimeList authentication token to use (overrides system keyring if any)")
+ scoreCmd.Flags().IntP("auto-select", "S", 0, "Automatically select nth value")
scoreCmd.Flags().IntP("prompt-length", "l", 5, "Length of select prompt")
scoreCmd.Flags().IntP("search-length", "n", 10, "Amount of search results to load")
scoreCmd.Flags().IntP("search-offset", "o", 0, "Offset for the search results")
diff --git a/cmd/search.go b/cmd/search.go
index 0961ffe..8413804 100644
--- a/cmd/search.go
+++ b/cmd/search.go
@@ -49,6 +49,7 @@ var searchCmd = &cobra.Command {
mal.SearchLength = conf.SearchLength
mal.SearchOffset = conf.SearchOffset
mal.SearchNSFW = conf.SearchNSFW
+ mal.AutoSel = conf.AutoSel
ui.PromptLength = conf.PromptLength
mal.Init()
@@ -129,6 +130,7 @@ func init() {
searchCmd.Flags().BoolVarP(&queryOnlyMode, "query", "q", false, "Query only (don't update data)")
searchCmd.Flags().StringVarP(&mal.Secret, "authentication-token", "t", "", "MyAnimeList authentication token to use (overrides system keyring if any)")
+ searchCmd.Flags().IntP("auto-select", "S", 0, "Automatically select nth value")
searchCmd.Flags().IntP("prompt-length", "l", 5, "Length of select prompt")
searchCmd.Flags().IntP("search-length", "n", 10, "Amount of search results to load")
searchCmd.Flags().IntP("search-offset", "o", 0, "Offset for the search results")
diff --git a/cmd/status.go b/cmd/status.go
index 7c641e6..0c92249 100644
--- a/cmd/status.go
+++ b/cmd/status.go
@@ -48,6 +48,7 @@ var statusCmd = &cobra.Command{
}
mal.SearchLength = conf.SearchLength
mal.SearchOffset = conf.SearchOffset
+ mal.AutoSel = conf.AutoSel
mal.SearchNSFW = conf.SearchNSFW
ui.PromptLength = conf.PromptLength
mal.Init()
@@ -151,6 +152,7 @@ func init() {
statusCmd.Flags().IntVarP(&entryId, "id", "i", -1, "Manually specify the ID of anime/manga (overrides search)")
statusCmd.Flags().StringVarP(&mal.Secret, "authentication-token", "t", "", "MyAnimeList authentication token to use (overrides system keyring if any)")
+ statusCmd.Flags().IntP("auto-select", "S", 0, "Automatically select nth value")
statusCmd.Flags().IntP("prompt-length", "l", 5, "Length of select prompt")
statusCmd.Flags().IntP("search-length", "n", 10, "Amount of search results to load")
statusCmd.Flags().IntP("search-offset", "o", 0, "Offset for the search results")
diff --git a/cmd/volumes.go b/cmd/volumes.go
index 6df1b69..f1cc108 100644
--- a/cmd/volumes.go
+++ b/cmd/volumes.go
@@ -49,6 +49,7 @@ var volumesCmd = &cobra.Command{
}
mal.SearchLength = conf.SearchLength
mal.SearchOffset = conf.SearchOffset
+ mal.AutoSel = conf.AutoSel
mal.SearchNSFW = conf.SearchNSFW
ui.PromptLength = conf.PromptLength
mal.Init()
@@ -104,6 +105,7 @@ func init() {
volumesCmd.Flags().IntVarP(&entryId, "id", "i", -1, "Manually specify the ID of manga (overrides search)")
volumesCmd.Flags().StringVarP(&mal.Secret, "authentication-token", "t", "", "MyAnimeList authentication token to use (overrides system keyring if any)")
+ volumesCmd.Flags().IntP("auto-select", "S", 0, "Automatically select nth value")
volumesCmd.Flags().IntP("prompt-length", "l", 5, "Length of select prompt")
volumesCmd.Flags().IntP("search-length", "n", 10, "Amount of search results to load")
volumesCmd.Flags().IntP("search-offset", "o", 0, "Offset for the search results")
diff --git a/macli.yaml b/macli.yaml
deleted file mode 100644
index 4578967..0000000
--- a/macli.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# sample macli configuration file
-# can be placed (and accessed in the same order)
-# at ./macli.yaml, ~/.config/macli/macli.yaml or /etc/macli/macli.yaml
-#
-# https://vidhukant.xyz/docs/macli
-# https://github.com/MikunoNaka/macli
-#
-# macli v1.12 onwards support reading this file but
-# currently this file may cause unexpected behaviour
-# so it is not currently recommended to use it
-
-# AUTHENTICAITON INFO
-# macli defaults to the system keyring on windows or mac,
-# or gnome-keyring (optional) on linux to store the login information
-# if none are available it can be set here
-# but it is not recommended unless it's the only option
-#
-# if you're using termux, this is probably the only option
-auth:
- # TODO: add option to ignore system keyring
- # ~~can leave blank, macli will set this~~ TODO: make macli set this optionally
- token: ""
- # run `macli help` for instructions for creating one
- client_id: ""
- # save newly entered client id when logging in (yes/no)
- save_client_id: "yes"
-
-# default settings (can be overridden by corresponding flags, `macli --help` for more details)
-searching:
- prompt_length: 5 # length of anime/manga selection prompt when searching (default: 5)
- search_length: 10 # amount of search results to get (default: 10)
- search_offset: 0 # offset for the search results (default is 0, changing it is here not recommended as it may cause confusion)
- search_nsfw: false # include NSFW rated search results (true/false)
-
-lists:
- # TODO: add default sort types, etc
- list_length: 15 # amount of titles to show from user's list
- list_offset: 0 # offset for the results (default is 0, changing it here is not recommended as it may cause confusion)
- include_nsfw_results: false # show NSFW rated items
diff --git a/mal/mal.go b/mal/mal.go
index d29c572..69cb1f1 100644
--- a/mal/mal.go
+++ b/mal/mal.go
@@ -39,6 +39,7 @@ var (
SearchLength, SearchOffset int
SearchNSFW bool
+ AutoSel int
)
// init() would kill the program prematurely on `macli login` command
diff --git a/mal/search.go b/mal/search.go
index 1bad114..e6e416a 100644
--- a/mal/search.go
+++ b/mal/search.go
@@ -28,7 +28,13 @@ import (
func SearchAnime(searchString string, fields []string) []a.Anime {
fields = append([]string{"title", "id"}, fields...)
- res, err := animeClient.SearchAnime(searchString, SearchLength, SearchOffset, SearchNSFW, fields)
+ searchLength, searchOffset := SearchLength, SearchOffset
+ if AutoSel > 0 {
+ searchLength = 1
+ searchOffset = AutoSel - 1
+ }
+
+ res, err := animeClient.SearchAnime(searchString, searchLength, searchOffset, SearchNSFW, fields)
if err != nil {
fmt.Println("MyAnimeList reported error while searching:", err.Error())
os.Exit(1)
@@ -40,7 +46,13 @@ func SearchAnime(searchString string, fields []string) []a.Anime {
func SearchManga(searchString string, fields []string) []m.Manga {
fields = append([]string{"title", "id"}, fields...)
- res, err := mangaClient.SearchManga(searchString, SearchLength, SearchOffset, SearchNSFW, fields)
+ searchLength, searchOffset := SearchLength, SearchOffset
+ if AutoSel > 0 {
+ searchLength = 1
+ searchOffset = AutoSel - 1
+ }
+
+ res, err := mangaClient.SearchManga(searchString, searchLength, searchOffset, SearchNSFW, fields)
if err != nil {
fmt.Println("MyAnimeList reported error while searching:", err.Error())
os.Exit(1)
diff --git a/ui/search.go b/ui/search.go
index 60089f3..a8e8f51 100644
--- a/ui/search.go
+++ b/ui/search.go
@@ -40,6 +40,15 @@ var AnimeSearchFields []string = []string {
// only search animes probably only now
func AnimeSearch(label, searchString string) a.Anime {
animes := mal.SearchAnime(searchString, AnimeSearchFields)
+ // don't show selection prompt if --auto-select is passed
+ if mal.AutoSel > 0 {
+ if len(animes) > 0 {
+ return animes[0]
+ } else {
+ fmt.Println("Error: Empty response from MyAnimeList while searching for anime.")
+ os.Exit(1)
+ }
+ }
for i, anime := range animes {
animes[i].DurationSeconds = anime.DurationSeconds / 60
@@ -148,6 +157,15 @@ var MangaSearchFields []string = []string {
func MangaSearch(label, searchString string) m.Manga {
mangas := mal.SearchManga(searchString, MangaSearchFields)
+ // don't show selection prompt if --auto-select is passed
+ if mal.AutoSel > 0 {
+ if len(mangas) > 0 {
+ return mangas[0]
+ } else {
+ fmt.Println("Error: Empty response from MyAnimeList while searching for manga.")
+ os.Exit(1)
+ }
+ }
for i, manga := range mangas {
/* I cant find a way to add functions to the details template
diff --git a/util/bind_config.go b/util/bind_config.go
index 2ab6cc9..ece5c2e 100644
--- a/util/bind_config.go
+++ b/util/bind_config.go
@@ -33,6 +33,7 @@ type SearchConfig struct {
PromptLength int
SearchLength int
SearchOffset int
+ AutoSel int
SearchNSFW bool
}
@@ -49,6 +50,13 @@ func BindSearchConfig(flags *pflag.FlagSet) (SearchConfig, error) {
err error
)
+ if flags.Lookup("auto-select").Changed {
+ conf.AutoSel, err = flags.GetInt("auto-select")
+ if err != nil {return conf, err}
+ } else {
+ conf.AutoSel = viper.GetInt("searching.auto_select_n")
+ }
+
if flags.Lookup("prompt-length").Changed {
conf.PromptLength, err = flags.GetInt("prompt-length")
if err != nil {return conf, err}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 07:36:53 +0000