Merge pull request #125 from browningluke/fix/cubari/non-proxied-pages

fix(cubari): Identify proxied pages correctly

Author: browningluke

README.md

@@ -24,7 +24,7 @@ $ mangathr <COMMAND> -s SOURCE QUERY
 
 If Go is installed, install it with:
 ```
-$ go install github.com/browningluke/mangathr/cmd/mangathr@latest
+$ go install github.com/browningluke/mangathr/v2/cmd/mangathr@latest
 ```
 
 ### Pre-build binary

internal/logging/logging.go

@@ -104,3 +104,15 @@ func Errorln(a ...interface{}) {
 func Errorf(format string, a ...interface{}) {
 	output(errorLogger, fmt.Sprintf("%s%s%s\n", "\033[31m", fmt.Sprintf(format, a...), "\033[0m"))
 }
+
+// Fatal
+
+func Fatalln(a ...interface{}) {
+	output(errorLogger, fmt.Sprintf("%s%s%s\n", "\033[31m", fmt.Sprint(a...), "\033[0m"))
+	os.Exit(1)
+}
+
+func Fatalf(format string, a ...interface{}) {
+	output(errorLogger, fmt.Sprintf("%s%s%s\n", "\033[31m", fmt.Sprintf(format, a...), "\033[0m"))
+	os.Exit(1)
+}

internal/rester/rester.go

@@ -3,7 +3,6 @@ package rester
 import (
 	"context"
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"github.com/browningluke/mangathr/v2/internal/logging"
 	"io"
@@ -48,7 +47,7 @@ func New() *RESTer {
 
 func (r RESTer) Do(retries int, timeout string) (interface{}, Response) {
 	if retries == 0 {
-		panic(errors.New("retried too many times, giving up"))
+		logging.Fatalln("retried too many times, giving up")
 	}
 	body, res, err := r.job()
 
@@ -70,7 +69,7 @@ func (r RESTer) Do(retries int, timeout string) (interface{}, Response) {
 
 func (r RESTer) DoWithHelperFunc(retries int, timeout string, f func(res Response, err error)) interface{} {
 	if retries == 0 {
-		panic(errors.New("retried too many times, giving up"))
+		logging.Fatalln("retried too many times, giving up")
 	}
 	body, res, err := r.job()
 

internal/sources/cubari/pages.go

@@ -16,20 +16,35 @@ func (m *Scraper) addPagesToChapter(chapter *manga.Chapter) *logging.ScraperErro
 	// Get pages from proxy URL
 	// (if using GIST provider)
 	if m.provider == GIST {
-		jsonResp, _ := rester.New().Get(fmt.Sprintf("%s%s", SITEROOT, pages[0]),
-			map[string]string{}, []rester.QueryParam{}).Do(4, "100ms")
-		jsonString := jsonResp.(string)
+		// Check if pages contain a valid URL
+		allValid := true
 
-		urls, ok := parseImgurStyle([]byte(jsonString))
-		if !ok {
-			return &logging.ScraperError{
-				Error:   errors.New("failed to get imgur URLs from proxy"),
-				Message: "An error occurred while getting pages from imgur",
-				Code:    0,
+		for _, u := range pages {
+			if !utils.IsValidURL(u) {
+				allValid = false
+				break
 			}
 		}
 
-		pages = urls
+		// If not all are valid urls, that means they are
+		// being proxied through Cubari so handle accordingly.
+		if !allValid {
+			logging.Debugln(fmt.Sprintf("Found pages: %v", pages))
+			jsonResp, _ := rester.New().Get(fmt.Sprintf("%s%s", SITEROOT, pages[0]),
+				map[string]string{}, []rester.QueryParam{}).Do(4, "100ms")
+			jsonString := jsonResp.(string)
+
+			urls, ok := parseImgurStyle([]byte(jsonString))
+			if !ok {
+				return &logging.ScraperError{
+					Error:   errors.New("failed to get imgur URLs from proxy"),
+					Message: "An error occurred while getting pages from imgur",
+					Code:    0,
+				}
+			}
+
+			pages = urls
+		}
 	}
 
 	// (if using MANGASEE provider)

internal/utils/utils.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/google/uuid"
 	"github.com/schollz/progressbar/v3"
+	"net/url"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -139,3 +140,17 @@ func IsValidUUID(u string) bool {
 	_, err := uuid.Parse(u)
 	return err == nil
 }
+
+func IsValidURL(str string) bool {
+	u, err := url.ParseRequestURI(str)
+	if err != nil {
+		return false
+	}
+
+	// Check if the scheme and host are present
+	if u.Scheme == "" || u.Host == "" {
+		return false
+	}
+
+	return true
+}