evan/AnthoLume
evan/AnthoLume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: evan:1b8b5060f1ca8d540ebf6a071617aae3cd725185
Branches Tags
evan:master
evan:templ
evan:0.0.1
..
compare: evan:37b6ac10ac26664561a542f5794cbc7bfd949292
Branches Tags
evan:templ
evan:master
evan:0.0.1

No commits in common. "1b8b5060f1ca8d540ebf6a071617aae3cd725185" and "37b6ac10ac26664561a542f5794cbc7bfd949292" have entirely different histories.
1b8b5060f1 ... 37b6ac10ac

5 changed files with 60 additions and 102 deletions
Show Stats Expand all files Collapse all files

7
api/app-routes.go
View File

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

23
assets/reader/index.js
View File

@ -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
? this.bookState.percentage * (this.bookState.words / 100)
: 0;
if (!cfi) this.bookState.currentWord = 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
**/

31
metadata/epub.go
View File

@ -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)
completeCount = completeCount + int64(len(strings.Fields(doc.Text())))
tokenizer := html.NewTokenizer(f)
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
}
}
}

2
metadata/metadata_test.go
View File

@ -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 {

101
search/search.go
View File

@ -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)
if err != nil {
return nil, err
}
return parseLibGenFiction(body)
body := getPage(url)
allEntries = parseLibGenFiction(body)
} else if bookType == BOOK_NON_FICTION {
// Search NonFiction
url := "https://libgen.is/search.php?req=" + url.QueryEscape(query)
body, err := getPage(url)
if err != nil {
return nil, err
}
return parseLibGenNonFiction(body)
} else {
return nil, errors.New("Invalid Book Type")
}
body := getPage(url)
allEntries = parseLibGenNonFiction(body)
}
func GoodReadsMostRead(c Cadence) ([]SearchItem, error) {
body, err := getPage("https://www.goodreads.com/book/most_read?category=all&country=US&duration=" + string(c))
if err != nil {
return nil, err
return
}
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)
if err != nil {
return "", err
}
body := getPage(infoURL)
// 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)
if err != nil {
return "", err
}
bookURL, err := parseLibGenDownloadURL(body)
if err != nil {
log.Error("[SaveBook] Parse Download URL Error: ", err)
return "", errors.New("Download Failure")
}
body := getPage(infoURL)
bookURL := parseLibGenDownloadURL(body)
// 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) {
// Set 10s Timeout
client := http.Client{
Timeout: 10 * time.Second,
func getPage(page string) io.ReadCloser {
resp, _ := http.Get(page)
return resp.Body
}
// Get Page
resp, err := client.Get(page)
if err != nil {
return nil, err
}
// Return Body
return resp.Body, err
}
func parseLibGenFiction(body io.ReadCloser) ([]SearchItem, error) {
func parseLibGenFiction(body io.ReadCloser) []SearchItem {
// Parse
defer body.Close()
doc, err := goquery.NewDocumentFromReader(body)
if err != nil {
return nil, err
}
doc, _ := goquery.NewDocumentFromReader(body)
// 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)
if err != nil {
return nil, err
}
doc, _ := goquery.NewDocumentFromReader(body)
// 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")
if exists == false {
return "", errors.New("Download URL not found")
downloadURL, _ := doc.Find("#download h2 a").Attr("href")
return downloadURL
}
return downloadURL, nil
}
func parseGoodReads(body io.ReadCloser) ([]SearchItem, error) {
func parseGoodReads(body io.ReadCloser) []SearchItem {
// Parse
defer body.Close()
doc, err := goquery.NewDocumentFromReader(body)
if err != nil {
return nil, err
}
doc, _ := goquery.NewDocumentFromReader(body)
// Normalize Results
var allEntries []SearchItem
@ -290,5 +249,5 @@ func parseGoodReads(body io.ReadCloser) ([]SearchItem, error) {
})
// Return Results
return allEntries, nil
return allEntries
}