Custom nyaa query per entry

Author: aQaTL

anilist_app.go

@@ -119,6 +119,10 @@ func AniListApp(app *cli.App) *cli.App {
 					Name:  "alt",
 					Usage: "choose an alternative title",
 				},
+				cli.StringFlag{
+					Name:  "custom",
+					Usage: "Adds custom nyaa search query for the selected entry",
+				},
 			},
 		},
 		cli.Command{

anilist_utils.go

@@ -2,12 +2,12 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/aqatl/mal/anilist"
 	"github.com/aqatl/mal/oauth2"
+	"github.com/urfave/cli"
 	"os"
 	"time"
-	"fmt"
-	"github.com/urfave/cli"
 )
 
 type AniList struct {

config.go

@@ -34,6 +34,8 @@ type Config struct {
 
 	ALSelectedID int
 	ALStatus     anilist.MediaListStatus
+
+	NyaaAlts []NyaaAlt
 }
 
 func NewConfig() *Config {

main.go

@@ -1,12 +1,12 @@
 package main
 
 import (
-	"os"
 	"fmt"
 	"github.com/fatih/color"
-	"path/filepath"
 	"github.com/urfave/cli"
 	"log"
+	"os"
+	"path/filepath"
 )
 
 var dataDir = filepath.Join(homeDir(), ".mal")

mal_app.go

@@ -8,12 +8,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/aqatl/cliwait"
 	"github.com/aqatl/mal/mal"
 	"github.com/atotto/clipboard"
 	"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 {

mal_cache.go

@@ -1,20 +1,20 @@
 package main
 
 import (
-	"os"
-	"github.com/aqatl/mal/mal"
-	"time"
+	"bufio"
 	"encoding/xml"
+	"fmt"
+	"github.com/aqatl/cliwait"
+	"github.com/aqatl/mal/mal"
+	"github.com/urfave/cli"
+	"golang.org/x/crypto/ssh/terminal"
 	"io"
+	"io/ioutil"
 	"log"
-	"github.com/urfave/cli"
-	"bufio"
-	"fmt"
-	"syscall"
+	"os"
 	"strings"
-	"io/ioutil"
-	"golang.org/x/crypto/ssh/terminal"
-	"github.com/aqatl/cliwait"
+	"syscall"
+	"time"
 )
 
 func loadCredentials(ctx *cli.Context) string {

nyaa_cui.go

@@ -36,6 +36,11 @@ func malNyaaCui(ctx *cli.Context) error {
 	)
 }
 
+type NyaaAlt struct {
+	Query string
+	Id    int
+}
+
 func alNyaaCui(ctx *cli.Context) error {
 	al, err := loadAniList(ctx)
 	if err != nil {
@@ -48,14 +53,33 @@ func alNyaaCui(ctx *cli.Context) error {
 		return fmt.Errorf("no entry found")
 	}
 
+	if alt := ctx.String("custom"); alt != "" {
+		addCustomAlt(alt+" "+strings.Join(ctx.Args(), " "), cfg)
+		return nil
+	}
+
+	var customAlt *string = nil
+	for _, alt := range cfg.NyaaAlts {
+		if alt.Id == entry.Id {
+			customAlt = &alt.Query
+			break
+		}
+	}
+
 	searchTerm := entry.Title.UserPreferred
 	if ctx.Bool("alt") {
 		fmt.Printf("Select desired title\n\n")
-		if searchTerm = chooseStrFromSlice(sliceOfEntryTitles(entry)); searchTerm == "" {
+		alts := sliceOfEntryTitles(entry)
+		if customAlt != nil {
+			alts = append(alts, *customAlt)
+		}
+		if searchTerm = chooseStrFromSlice(alts); searchTerm == "" {
 			return fmt.Errorf("no alternative titles")
 		}
 	} else if ctx.NArg() > 0 {
 		searchTerm = strings.Join(ctx.Args(), " ")
+	} else if customAlt != nil {
+		searchTerm = *customAlt
 	}
 
 	return startNyaaCui(
@@ -66,6 +90,22 @@ func alNyaaCui(ctx *cli.Context) error {
 	)
 }
 
+func addCustomAlt(newAlt string, cfg *Config) {
+	// Assumes the entry ID is valid
+	defer cfg.Save()
+	for i, alt := range cfg.NyaaAlts {
+		if alt.Id == cfg.ALSelectedID {
+			cfg.NyaaAlts[i].Query = newAlt
+			return
+		}
+	}
+
+	cfg.NyaaAlts = append(cfg.NyaaAlts, NyaaAlt{
+		Id:    cfg.ALSelectedID,
+		Query: newAlt,
+	})
+}
+
 func startNyaaCui(cfg *Config, searchTerm, displayedInfo, quality string) error {
 	gui, err := gocui.NewGui(gocui.Output256)
 	defer gui.Close()
@@ -162,7 +202,7 @@ func (nc *nyaaCui) Layout(gui *gocui.Gui) error {
 		gui.SetCurrentView(ncResultsView)
 		nc.ResultsView = v
 
-		//TODO Better/clearer results printing
+		// TODO Better/clearer results printing
 		nc.DisplayedIndexes = make([]int, 0, len(nc.Results))
 		for i, result := range nc.Results {
 			if nc.TitleFilter != nil && !nc.TitleFilter.MatchString(result.Title) {
@@ -325,7 +365,7 @@ func (nc *nyaaCui) Download(yIdx int) {
 	cmd := exec.Command(nc.Cfg.TorrentClientPath, nc.Cfg.TorrentClientArgs...)
 	cmd.Args = append(cmd.Args, link)
 	if len(nc.Cfg.TorrentClientArgs) > 0 {
-		cmd.Args = cmd.Args[1:] //Why they include app name in the arguments???
+		cmd.Args = cmd.Args[1:] // Why they include app name in the arguments???
 	}
 	if err := cmd.Start(); err != nil {
 		gocuiReturnError(nc.Gui, err)

templates.go

@@ -1,9 +1,9 @@
 package main
 
 import (
+	"github.com/aqatl/mal/mal"
 	"math"
 	"text/template"
-	"github.com/aqatl/mal/mal"
 )
 
 const PrettyListTemplate = `No{{printf "%57s" "Title"}}{{printf "%8s" "Eps"}}{{printf "%6s" "Score"}}{{printf "%7s" "ID"}}
@@ -28,7 +28,6 @@ var PrettyList = template.Must(
 )
 
 type PrettyListData struct {
-	List []*mal.Anime
+	List       []*mal.Anime
 	SelectedID int
 }
-