api/app-routes.go

@@ -209,12 +209,7 @@ func (api *API) createAppResourcesRoute(routeName string, args ...map[string]any
 				}
 
 				// Search
-				searchResults, err := search.SearchBook(*sParams.Query, bType)
+				searchResults := search.SearchBook(*sParams.Query, bType)
-				if err != nil {
-					errorPage(c, http.StatusInternalServerError, fmt.Sprintf("Search Error: %v", err))
-					return
-				}
-
 				templateVars["Data"] = searchResults
 				templateVars["BookType"] = *sParams.BookType
 			}

assets/reader/index.js

@@ -45,15 +45,9 @@ class EBookReader {
    * Load progress and generate locations
    **/
   async setupReader() {
-    // Get Word Count (If Needed)
-    if (this.bookState.words == 0)
-      this.bookState.words = await this.countWords();
-
     // Load Progress
     let { cfi } = await this.getCFIFromXPath(this.bookState.progress);
-    this.bookState.currentWord = cfi
+    if (!cfi) this.bookState.currentWord = 0;
-      ? this.bookState.percentage * (this.bookState.words / 100)
-      : 0;
 
     let getStats = function () {
       // Start Timer
@@ -1044,21 +1038,6 @@ class EBookReader {
     );
   }
 
-  /**
-   * Count the words of the book. Useful for keeping a more accurate track
-   * of progress percentage. Implementation returns the same number as the
-   * server side implementation.
-   **/
-  countWords() {
-    // Iterate over each item in the spine, render, and count words.
-    return this.book.spine.spineItems.reduce(async (totalCount, item) => {
-      let currentCount = await totalCount;
-      let newDoc = await item.load(this.book.load.bind(this.book));
-      let itemCount = newDoc.innerText.trim().split(/\s+/).length;
-      return currentCount + itemCount;
-    }, 0);
-  }
-
   /**
    * Save settings to localStorage
    **/

metadata/epub.go

@@ -1,10 +1,11 @@
 package metadata
 
 import (
+	"io"
 	"strings"
 
-	"github.com/PuerkitoBio/goquery"
 	"github.com/taylorskalyo/goreader/epub"
+	"golang.org/x/net/html"
 )
 
 func getEPUBMetadata(filepath string) (*MetadataInfo, error) {
@@ -31,9 +32,33 @@ func countEPUBWords(filepath string) (int64, error) {
 	var completeCount int64
 	for _, item := range rf.Spine.Itemrefs {
 		f, _ := item.Open()
-		doc, _ := goquery.NewDocumentFromReader(f)
+		tokenizer := html.NewTokenizer(f)
-		completeCount = completeCount + int64(len(strings.Fields(doc.Text())))
+		newCount, err := countTokenizerWords(*tokenizer)
+		if err != nil {
+			return 0, err
+		}
+		completeCount = completeCount + newCount
 	}
 
 	return completeCount, nil
 }
+
+func countTokenizerWords(tokenizer html.Tokenizer) (int64, error) {
+	var err error
+	var totalWords int64
+	for {
+		tokenType := tokenizer.Next()
+		token := tokenizer.Token()
+		if tokenType == html.TextToken {
+			currStr := string(token.Data)
+			totalWords = totalWords + int64(len(strings.Fields(currStr)))
+		} else if tokenType == html.ErrorToken {
+			err = tokenizer.Err()
+		}
+		if err == io.EOF {
+			return totalWords, nil
+		} else if err != nil {
+			return 0, err
+		}
+	}
+}

metadata/metadata_test.go

@@ -5,7 +5,7 @@ import (
 )
 
 func TestGetWordCount(t *testing.T) {
-	var want int64 = 30080
+	var want int64 = 30477
 	wordCount, err := countEPUBWords("../_test_files/alice.epub")
 
 	if wordCount != want {

search/search.go

@@ -38,37 +38,29 @@ type SearchItem struct {
 	UploadDate string
 }
 
-func SearchBook(query string, bookType BookType) ([]SearchItem, error) {
+func SearchBook(query string, bookType BookType) (allEntries []SearchItem) {
+	log.Info(query)
 	if bookType == BOOK_FICTION {
 		// Search Fiction
 		url := "https://libgen.is/fiction/?q=" + url.QueryEscape(query) + "&language=English&format=epub"
-		body, err := getPage(url)
+		body := getPage(url)
-		if err != nil {
+		allEntries = parseLibGenFiction(body)
-			return nil, err
-		}
-		return parseLibGenFiction(body)
 	} else if bookType == BOOK_NON_FICTION {
 		// Search NonFiction
 		url := "https://libgen.is/search.php?req=" + url.QueryEscape(query)
-		body, err := getPage(url)
+		body := getPage(url)
-		if err != nil {
+		allEntries = parseLibGenNonFiction(body)
-			return nil, err
-		}
-		return parseLibGenNonFiction(body)
-	} else {
-		return nil, errors.New("Invalid Book Type")
-	}
 	}
 
-func GoodReadsMostRead(c Cadence) ([]SearchItem, error) {
+	return
-	body, err := getPage("https://www.goodreads.com/book/most_read?category=all&country=US&duration=" + string(c))
-	if err != nil {
-		return nil, err
 }
+
+func GoodReadsMostRead(c Cadence) []SearchItem {
+	body := getPage("https://www.goodreads.com/book/most_read?category=all&country=US&duration=" + string(c))
 	return parseGoodReads(body)
 }
 
-func GetBookURL(id string, bookType BookType) (string, error) {
+func GetBookURL(id string, bookType BookType) string {
 	// Derive Info URL
 	var infoURL string
 	if bookType == BOOK_FICTION {
@@ -78,10 +70,7 @@ func GetBookURL(id string, bookType BookType) (string, error) {
 	}
 
 	// Parse & Derive Download URL
-	body, err := getPage(infoURL)
+	body := getPage(infoURL)
-	if err != nil {
-		return "", err
-	}
 
 	// downloadURL := parseLibGenDownloadURL(body)
 	return parseLibGenDownloadURL(body)
@@ -97,15 +86,8 @@ func SaveBook(id string, bookType BookType) (string, error) {
 	}
 
 	// Parse & Derive Download URL
-	body, err := getPage(infoURL)
+	body := getPage(infoURL)
-	if err != nil {
+	bookURL := parseLibGenDownloadURL(body)
-		return "", err
-	}
-	bookURL, err := parseLibGenDownloadURL(body)
-	if err != nil {
-		log.Error("[SaveBook] Parse Download URL Error: ", err)
-		return "", errors.New("Download Failure")
-	}
 
 	// Create File
 	tempFile, err := os.CreateTemp("", "book")
@@ -137,29 +119,15 @@ func SaveBook(id string, bookType BookType) (string, error) {
 	return tempFile.Name(), nil
 }
 
-func getPage(page string) (io.ReadCloser, error) {
+func getPage(page string) io.ReadCloser {
-	// Set 10s Timeout
+	resp, _ := http.Get(page)
-	client := http.Client{
+	return resp.Body
-		Timeout: 10 * time.Second,
 }
 
-	// Get Page
+func parseLibGenFiction(body io.ReadCloser) []SearchItem {
-	resp, err := client.Get(page)
-	if err != nil {
-		return nil, err
-	}
-
-	// Return Body
-	return resp.Body, err
-}
-
-func parseLibGenFiction(body io.ReadCloser) ([]SearchItem, error) {
 	// Parse
 	defer body.Close()
-	doc, err := goquery.NewDocumentFromReader(body)
+	doc, _ := goquery.NewDocumentFromReader(body)
-	if err != nil {
-		return nil, err
-	}
 
 	// Normalize Results
 	var allEntries []SearchItem
@@ -203,16 +171,13 @@ func parseLibGenFiction(body io.ReadCloser) ([]SearchItem, error) {
 	})
 
 	// Return Results
-	return allEntries, nil
+	return allEntries
 }
 
-func parseLibGenNonFiction(body io.ReadCloser) ([]SearchItem, error) {
+func parseLibGenNonFiction(body io.ReadCloser) []SearchItem {
 	// Parse
 	defer body.Close()
-	doc, err := goquery.NewDocumentFromReader(body)
+	doc, _ := goquery.NewDocumentFromReader(body)
-	if err != nil {
-		return nil, err
-	}
 
 	// Normalize Results
 	var allEntries []SearchItem
@@ -248,31 +213,25 @@ func parseLibGenNonFiction(body io.ReadCloser) ([]SearchItem, error) {
 	})
 
 	// Return Results
-	return allEntries, nil
+	return allEntries
 }
 
-func parseLibGenDownloadURL(body io.ReadCloser) (string, error) {
+func parseLibGenDownloadURL(body io.ReadCloser) string {
 	// Parse
 	defer body.Close()
 	doc, _ := goquery.NewDocumentFromReader(body)
 
 	// Return Download URL
 	// downloadURL, _ := doc.Find("#download [href*=cloudflare]").Attr("href")
-	downloadURL, exists := doc.Find("#download h2 a").Attr("href")
+	downloadURL, _ := doc.Find("#download h2 a").Attr("href")
-	if exists == false {
+
-		return "", errors.New("Download URL not found")
+	return downloadURL
 }
 
-	return downloadURL, nil
+func parseGoodReads(body io.ReadCloser) []SearchItem {
-}
-
-func parseGoodReads(body io.ReadCloser) ([]SearchItem, error) {
 	// Parse
 	defer body.Close()
-	doc, err := goquery.NewDocumentFromReader(body)
+	doc, _ := goquery.NewDocumentFromReader(body)
-	if err != nil {
-		return nil, err
-	}
 
 	// Normalize Results
 	var allEntries []SearchItem
@@ -290,5 +249,5 @@ func parseGoodReads(body io.ReadCloser) ([]SearchItem, error) {
 	})
 
 	// Return Results
-	return allEntries, nil
+	return allEntries
 }