Refactor (#15)

* initial commito

* change domain to libgen

* wip

* wip

* wip

* rename packages

* add current doc and mirror

* add downloader package, some things still brokne

* fix downloading

* clean up

* fix parsing of title

* delete libgen

* remove replace

.goreleaser.yaml

@@ -34,4 +34,4 @@ archives:
     format_overrides:
       - goos: windows
         format: zip
-    name_template: '{{.ProjectName}}_{{.Os}}-{{.Arch}}'
+    name_template: '{{.ProjectName}}_{{.Os}}-{{.Arch}}'

cmd/search.go

@@ -2,11 +2,11 @@ package cmd
 
 import (
 	"fmt"
-	"log"
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/laureanray/clibgen/pkg/api"
+	"github.com/laureanray/clibgen/internal/libgen"
+	"github.com/laureanray/clibgen/internal/mirror"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 )
@@ -48,57 +48,56 @@ var (
 				return
 			}
 
-			var libgenType = api.LibgenNew
+      var m mirror.Mirror
 
-			if selectedSite == "old" {
-				libgenType = api.LibgenOld
+			if selectedSite == "legacy" {
+        m = mirror.NewLegacyMirror(libgen.IS)
 			} else if selectedSite == "new" {
-				libgenType = api.LibgenNew
-			}
-
-			books, siteUsed, err := api.SearchBookByTitle(args[0], numberOfResults, libgenType)
-			if err != nil {
-				log.Fatalln(err)
-			}
+        m = mirror.NewCurrentMirror(libgen.LC)
+			} else{
+        // TODO: Improve this.
+        fmt.Print("Not an option");
+        return
+      }
 
-			if err != nil {
-				log.Fatal(err)
-				return
-			}
+
+      books, _ := m.SearchByTitle(args[0])
 
 			var titles []string
-
+			
 			for _, book := range books {
 				parsedTitle := truncateText(book.Title, 42)
 				parsedAuthor := truncateText(book.Author, 24)
 				parsedExt := getExtension(fmt.Sprintf("%-4s", book.Extension))
 				titles = append(titles, fmt.Sprintf("%s %-6s | %-45s %s", parsedExt, book.FileSize, parsedTitle, parsedAuthor))
 			}
-
+			
 			prompt := promptui.Select{
 				Label: "Select Title",
 				Items: titles,
 			}
-
+			
 			resultInt, _, err := prompt.Run()
-
+			
 			if err != nil {
 				fmt.Printf("Prompt failed %v\n", err)
 				return
 			}
 
-			api.DownloadSelection(books[resultInt], siteUsed)
+      println(resultInt)
+
+      m.DownloadSelection(books[resultInt])
 		},
 	}
 )
 
 func init() {
 	searchCmd.
 		PersistentFlags().
-		StringVarP(&selectedSite, "site", "s", "old", `select which site to use
+		StringVarP(&selectedSite, "site", "s", "legacy", `select which site to use
 		options: 
-			"old" -> libgen.is
-			"new" -> liggen.li 
+			"legacy" 
+			"new"
 	`)
 
 	searchCmd.

pkg/api/book.go → internal/book/book.go

@@ -1,4 +1,4 @@
-package api
+package book
 
 type Book struct {
 	ID        string

internal/console/console.go

@@ -0,0 +1,34 @@
+package console
+
+import (
+	"fmt"
+
+	"github.com/fatih/color"
+)
+
+// TODO: Refactor this to just print directly instead
+// of doing fmt.Println(console.Hihlight()) and so on...
+func Higlight(format string, a ...any) string {
+	magenta := color.New(color.FgHiWhite).Add(color.BgBlack).SprintFunc()
+	return magenta(fmt.Sprintf(format, a...))
+}
+
+func Error(format string, a ...any) string {
+	red := color.New(color.FgRed).SprintFunc()
+	return red(fmt.Sprintf(format, a...))
+}
+
+func Info(format string, a ...any) string {
+	yellow := color.New(color.FgYellow).SprintFunc()
+	return yellow(fmt.Sprintf(format, a...))
+}
+
+func Success(format string, a ...any) string {
+	green := color.New(color.FgHiGreen).SprintFunc()
+	return green(fmt.Sprintf(format, a...))
+}
+
+func Normal(format string, a ...any) string {
+  white := color.New(color.FgWhite).SprintFunc()
+  return white(fmt.Sprintf(format, a...))
+}

internal/document_parser/current_document.go

@@ -0,0 +1,130 @@
+package documentparser
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+
+	"github.com/PuerkitoBio/goquery"
+	"github.com/laureanray/clibgen/internal/book"
+)
+
+type CurrentDocumentParser struct {
+	doc *goquery.Document
+}
+
+func NewCurrentDocumentParser(document *goquery.Document) *CurrentDocumentParser {
+	return &CurrentDocumentParser{doc: document}
+}
+
+func NewCurrentDocumentParserFromReader(r io.Reader) *CurrentDocumentParser {
+	document, _ := goquery.NewDocumentFromReader(r)
+	return &CurrentDocumentParser{doc: document}
+}
+
+func findTitle(selection *goquery.Selection) string {
+  var title string
+  selection.Find("a").EachWithBreak(func(v int, s *goquery.Selection) bool {
+    if  s.Text() != "" && len(s.Text()) > 1 {
+      title = s.Text()
+      // Break out of the loop
+      return false
+    }
+    return true
+  })
+
+  return title
+}
+
+func (cdp *CurrentDocumentParser) GetBookDataFromDocument() []book.Book {
+	var books []book.Book
+	cdp.doc.Find("#tablelibgen > tbody > tr").Each(func(resultsRow int, bookRow *goquery.Selection) {
+		var id, author, title, publisher, extension, year, fileSize string
+		var mirrors []string
+		if resultsRow != 0 {
+			bookRow.Find("td").Each(func(column int, columnSelection *goquery.Selection) {
+				switch column {
+				case 0:
+					title = findTitle(columnSelection)
+				case 1:
+					author = columnSelection.Text()
+				case 2:
+					publisher = columnSelection.Text()
+				case 3:
+					year = columnSelection.Text()
+				case 6:
+					fileSize = columnSelection.Text()
+				case 7:
+					extension = columnSelection.Text()
+				case 8:
+					columnSelection.Find("a").Each(func(linkCol int, link *goquery.Selection) {
+						href, hrefExists := link.Attr("href")
+						if hrefExists {
+							mirrors = append(mirrors, href)
+						}
+					})
+				}
+			})
+			books = append(books, book.Book{
+				ID:        id,
+				Author:    author,
+				Year:      year,
+				Title:     title,
+				Publisher: publisher,
+				Extension: extension,
+				Mirrors:   mirrors,
+				FileSize:  fileSize,
+			})
+		}
+	})
+	return books
+}
+
+func (cdp *CurrentDocumentParser) getDownloadLinkFromDocument() (string, bool) {
+  return cdp.doc.Find("#main a").First().Attr("href")
+}
+
+func (cdp *CurrentDocumentParser) getBookTitleFromSelection(selection *goquery.Selection) string {
+	var title string
+	selection.Find("a").Each(func(v int, s *goquery.Selection) {
+		_, exists := s.Attr("title")
+		if exists {
+			title = s.Text()
+		}
+	})
+	selection.Find("a > font").Each(func(v int, s *goquery.Selection) {
+		a := s.Text()
+		title = strings.ReplaceAll(title, a, "")
+	})
+	return title
+}
+
+func (cdp *CurrentDocumentParser) GetDirectDownloadLink(selectedBook book.Book) string {
+	fmt.Println("Obtaining direct download link")
+
+  // TODO Implement retry?
+  link := selectedBook.Mirrors[0]
+
+	resp, err := http.Get(link)
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+
+		if err != nil {
+			fmt.Println("Error closing body:", err)
+		}
+	}(resp.Body)
+
+	if err != nil {
+		fmt.Println("Error getting response:", err)
+	}
+
+	directDownloadLink, exists :=
+		NewCurrentDocumentParserFromReader(resp.Body).getDownloadLinkFromDocument()
+
+	if exists {
+		return directDownloadLink
+	}
+
+	return ""
+}

internal/document_parser/document_parser.go

@@ -0,0 +1,15 @@
+package documentparser
+
+import (
+	"github.com/laureanray/clibgen/internal/book"
+)
+
+// type Page struct {
+// 	doc *goquery.Document
+// }
+
+type DocumentParser interface {
+  GetBookDataFromDocument() []book.Book
+  GetDownloadLinkFromDocument() (string, bool)
+}
+