Merge branch 'main' into feature/setup-versioning

Author: laureanray

README.md

@@ -42,8 +42,6 @@ Flags:
 -  -h, --help                    help for search
 -  -n, --number of results int   number of result(s) to be displayed maximum: 25 (default 10)
 -  -o, --output string           Output directory (default "./")
--  -s, --site string             which website to use [legacy, new] (default "legacy")
-
 
 
 ### Found an issue?

cmd/search.go

@@ -27,10 +27,9 @@ func getExtension(s string) string {
 }
 
 var (
-	selectedSite    string
-	selectedFilter  string
+  selectedFilter  string
 	outputDirectory string
-	numberOfResults = 10
+	numberOfResults int
 
 	searchCmd = &cobra.Command{
 		Use:   "search",
@@ -43,23 +42,18 @@ var (
 				return
 			}
 
-			var m mirror.Mirror
+      m := mirror.NewLegacyMirror(libgen.IS)
 
-			if selectedSite == "legacy" {
-				m = mirror.NewLegacyMirror(libgen.IS)
-			} else if selectedSite == "new" {
-				m = mirror.NewCurrentMirror(libgen.LC)
-			} else {
-				// TODO: Improve this.
-				fmt.Print("Not an option")
-				return
-			}
+      // Set Defaults
+      m.SetNumberOfResults(numberOfResults)
 
 			var books []book.Book
 
 			switch selectedFilter {
 			case libgen.AUTHOR:
 				books, _ = m.SearchByAuthor(args[0])
+      case libgen.ISBN:
+        books, _ = m.SearchByTitle(args[0])
 			default:
 				books, _ = m.SearchByTitle(args[0])
 			}
@@ -80,6 +74,7 @@ var (
 			prompt := promptui.Select{
 				Label: "Select Title",
 				Items: titles,
+        Size: 10,
 			}
 
 			resultInt, _, err := prompt.Run()
@@ -95,10 +90,6 @@ var (
 )
 
 func init() {
-	searchCmd.
-		PersistentFlags().
-		StringVarP(&selectedSite, "site", "s", "legacy", `which website to use [legacy, new]`)
-
 	searchCmd.
 		PersistentFlags().
 		StringVarP(&selectedFilter, "filter", "f", "title", `search by [title, author, isbn]`)

internal/libgen/libgen.go

@@ -6,12 +6,6 @@ const (
 	RS = "rs"
 	IS = "is"
 	ST = "st"
-
-	LI    = "li"
-	LC    = "lc"
-	GS    = "gs"
-	TOP   = "top"
-	CLICK = "click"
 )
 
 type Filter string

internal/mirror/current_mirror.go

@@ -17,26 +17,27 @@ import (
 
 type LegacyMirror struct {
 	domain libgen.Domain
-	filter libgen.Filter
 	config Configuration
 }
 
 func NewLegacyMirror(domain libgen.Domain) *LegacyMirror {
 	return &LegacyMirror{
 		domain: domain,
 		// TODO: Make this configurable
-		filter: libgen.TITLE,
 		config: Configuration{
-			numberOfResults: 5,
+			numberOfResults: 10,
 		},
 	}
 }
 
+func (m *LegacyMirror) SetNumberOfResults(numberOfResults int) {
+  m.config.numberOfResults = numberOfResults
+}
+
 func (m *LegacyMirror) SearchByTitle(query string) ([]book.Book, error) {
 	fmt.Println("Searching for: ", console.Higlight(query))
 	var document *goquery.Document
-
-	document, err := m.searchSite(query)
+	document, err := m.searchSite(query, libgen.TITLE)
 
 	if err != nil || document == nil {
 		fmt.Println(console.Error("Error searching for book: %s", query))
@@ -57,11 +58,34 @@ func (m *LegacyMirror) SearchByTitle(query string) ([]book.Book, error) {
 	return bookResults, err
 }
 
+func (m *LegacyMirror) SearchByISBN(isbn string) ([]book.Book, error) {
+	fmt.Println("Searching using ISBN: ", console.Higlight(isbn))
+	var document *goquery.Document
+	document, err := m.searchSite(isbn, libgen.ISBN)
+
+	if err != nil || document == nil {
+		fmt.Println(console.Error("Error searching for book: %s", isbn))
+		// TODO: Implement retrying
+		// fmt.Println(infoColor("Retrying with other site"))
+		// document, e = searchLibgen(query, siteToUse) // If this also fails then we have a problem
+		return nil, errors.New("Error searching for book")
+	}
+	fmt.Println(console.Success("Search complete, parsing the document..."))
+
+	bookResults :=
+		documentparser.NewLegacyDocumentParser(document).GetBookDataFromDocument()
+
+	if len(bookResults) >= m.config.numberOfResults {
+		bookResults = bookResults[:m.config.numberOfResults]
+	}
+
+	return bookResults, err
+}
+
+
 func (m *LegacyMirror) SearchByAuthor(query string) ([]book.Book, error) {
 	fmt.Println("Searching by author: ", console.Higlight(query))
-
-	m.filter = libgen.AUTHOR
-	document, err := m.searchSite(query)
+	document, err := m.searchSite(query, libgen.AUTHOR)
 
 	if err != nil || document == nil {
 		fmt.Println(console.Error("Error searching for book: %s", query))
@@ -80,15 +104,14 @@ func (m *LegacyMirror) SearchByAuthor(query string) ([]book.Book, error) {
 
 // Search the libgen site returns the document
 // of the search results page
-func (m *LegacyMirror) searchSite(query string) (*goquery.Document, error) {
-
+func (m *LegacyMirror) searchSite(query string, filter libgen.Filter) (*goquery.Document, error) {
 	baseUrl := fmt.Sprintf("https://libgen.%s/search.php", m.domain)
 
 	queryString := fmt.Sprintf(
 		"%s?req=%s&res=25&view=simple&phrase=1&column=%s",
 		baseUrl,
 		url.QueryEscape(query),
-		m.filter,
+		filter,
 	)
 
 	fmt.Println(console.Info(queryString))

internal/mirror/legacy_mirror.go

@@ -8,8 +8,7 @@ import (
 type Mirror interface {
 	SearchByTitle(query string) ([]book.Book, error)
 	SearchByAuthor(author string) ([]book.Book, error)
-	// SearchByISBN(isbn string) []book.Book
-	// 1GetDownloadLink(book book.Book) string
+	SearchByISBN(isbn string) ([]book.Book, error)
 	DownloadSelection(book book.Book, outputDirectory string)
 }