Added --bundle arg

By using it you can bundle/package the entire defined range into a
single file

Author: elboletaire

.gitignore

@@ -1,2 +1,3 @@
 manga-downloader
 *.cbz
+demos/*.yml

README.md

@@ -9,7 +9,7 @@ Manga Downloader
 This app downloads mangas from websites like mangadex and stores them into cbz files, so you can read them with your
 favorite ereader or reading app.
 
-![demo img]
+![download img]
 
 Supported sites
 ---------------
@@ -47,12 +47,27 @@ manga-downloader --language es https://mangadex.org/title/a1c7c817-4e59-43b7-936
 # would download One Piece chapters 1 to 10 in spanish
 ~~~
 
+### Bundling
+
+You can bundle all the downloaded chapters into a single file by using the `--bundle` arg:
+
+~~~bash
+manga-downloader https://inmanga.com/ver/manga/One-Piece/dfc7ecb5-e9b3-4aa5-a61b-a498993cd935 1-8 --bundle
+# would download one piece chapters 1 to 8 and bundle them into a single file
+~~~
+
+![bundle img]
+
+### Help
+
 Use the `help` command to see all the available options:
 
 ~~~bash
 manga-downloader help
 ~~~
 
+![help img]
+
 Installation
 ------------
 
@@ -117,4 +132,6 @@ All the code contained in this repo is licensed under the [GNU Affero General Pu
 [license badge]: https://img.shields.io/github/license/elboletaire/manga-downloader?color=green
 [releases]: https://github.com/elboletaire/manga-downloader/releases
 [issues]: https://github.com/elboletaire/manga-downloader/issues
-[demo img]: https://raw.githubusercontent.com/elboletaire/manga-downloader/master/demo.gif
+[download img]: https://raw.githubusercontent.com/elboletaire/manga-downloader/master/demos/download.gif
+[bundle img]: https://raw.githubusercontent.com/elboletaire/manga-downloader/master/demos/bundle.gif
+[help img]: https://raw.githubusercontent.com/elboletaire/manga-downloader/master/demos/help.gif

cmd/root.go

@@ -19,6 +19,8 @@ import (
 	cc "github.com/ivanpirog/coloredcobra"
 )
 
+var settings grabber.Settings
+
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "manga-downloader [flags] [url] [ranges]",
@@ -48,7 +50,7 @@ Would download chapters 10 to 20 of Black Clover from
 mangadex.org in Spanish`, "manga-downloader", color.YellowString("manga-downloader")),
 	Args: cobra.ExactArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
-		s, errs := grabber.NewSite(args[0])
+		s, errs := grabber.NewSite(args[0], &settings)
 		if len(errs) > 0 {
 			color.Red("Errors testing site (a site may be down):")
 			for _, err := range errs {
@@ -62,7 +64,8 @@ mangadex.org in Spanish`, "manga-downloader", color.YellowString("manga-download
 		s.InitFlags(cmd)
 
 		// ranges parsing
-		rngs, err := ranges.Parse(args[1])
+		settings.Range = args[1]
+		rngs, err := ranges.Parse(settings.Range)
 		cerr(err, "Error parsing ranges: %s")
 
 		// fetch series title
@@ -83,13 +86,15 @@ mangadex.org in Spanish`, "manga-downloader", color.YellowString("manga-download
 		chapters = chapters.FilterRanges(rngs)
 
 		if len(chapters) == 0 {
-			warn("No chapters found for the specified ranges")
+			fmt.Println(color.YellowString("No chapters found for the specified ranges"))
+			os.Exit(1)
 		}
 
+		// download chapters
 		wg := sync.WaitGroup{}
 		g := make(chan struct{}, s.GetMaxConcurrency().Chapters)
+		downloaded := grabber.Filterables{}
 
-		// loop chapters to retrieve pages
 		for _, chap := range chapters {
 			g <- struct{}{}
 			wg.Add(1)
@@ -110,26 +115,51 @@ mangadex.org in Spanish`, "manga-downloader", color.YellowString("manga-download
 					return
 				}
 
-				filename, err := packer.NewFilenameFromTemplate(title, chapter, s.GetFilenameTemplate())
-				if err != nil {
-					color.Red("- error creating filename for chapter %s: %s", chapter.GetTitle(), err.Error())
-					<-g
-					return
+				d := &packer.DownloadedChapter{
+					Chapter: chapter,
+					Files:   files,
 				}
 
-				filename += ".cbz"
-
-				if err = packer.ArchiveCBZ(filename, files); err != nil {
-					color.Red("- error saving file %s: %s", filename, err.Error())
+				if !settings.Bundle {
+					filename, err := packer.PackSingle(s, d)
+					if err == nil {
+						fmt.Printf("- %s %s\n", color.GreenString("saved file"), color.HiBlackString(filename))
+					} else {
+						color.Red(err.Error())
+					}
 				} else {
-					fmt.Printf("- %s %s\n", color.GreenString("saved file"), color.HiBlackString(filename))
+					// avoid adding it to memory if we're not gonna use it
+					downloaded = append(downloaded, d)
 				}
 
 				// release guard
 				<-g
 			}(chap)
 		}
 		wg.Wait()
+		close(g)
+
+		if !settings.Bundle {
+			// if we're not bundling, just finish it
+			os.Exit(0)
+		}
+
+		// resort downloaded
+		downloaded = downloaded.SortByNumber()
+
+		dc := []*packer.DownloadedChapter{}
+		// convert slice back to DownloadedChapter
+		for _, d := range downloaded {
+			dc = append(dc, d.(*packer.DownloadedChapter))
+		}
+
+		filename, err := packer.PackBundle(s, dc, settings.Range)
+		if err != nil {
+			color.Red(err.Error())
+			os.Exit(1)
+		}
+
+		fmt.Printf("- %s %s\n", color.GreenString("saved file"), color.HiBlackString(filename))
 	},
 }
 
@@ -156,10 +186,11 @@ func Execute() {
 
 // init sets the flags for the root command
 func init() {
-	rootCmd.Flags().Uint8P("concurrency", "c", 5, "number of concurrent chapter downloads, hard-limited to 5")
-	rootCmd.Flags().Uint8P("concurrency-pages", "C", 10, "number of concurrent page downloads, hard-limited to 10")
-	rootCmd.Flags().StringP("language", "l", "", "only download the specified language")
-	rootCmd.Flags().StringP("filename-template", "t", packer.FilenameTemplateDefault, "template for the resulting filename")
+	rootCmd.Flags().BoolVarP(&settings.Bundle, "bundle", "b", false, "bundle all specified chapters into a single file")
+	rootCmd.Flags().Uint8VarP(&settings.MaxConcurrency.Chapters, "concurrency", "c", 5, "number of concurrent chapter downloads, hard-limited to 5")
+	rootCmd.Flags().Uint8VarP(&settings.MaxConcurrency.Pages, "concurrency-pages", "C", 10, "number of concurrent page downloads, hard-limited to 10")
+	rootCmd.Flags().StringVarP(&settings.Language, "language", "l", "", "only download the specified language")
+	rootCmd.Flags().StringVarP(&settings.FilenameTemplate, "filename-template", "t", packer.FilenameTemplateDefault, "template for the resulting filename")
 }
 
 func cerr(err error, prefix string) {
@@ -168,8 +199,3 @@ func cerr(err error, prefix string) {
 		os.Exit(1)
 	}
 }
-
-func warn(err string) {
-	fmt.Println(color.YellowString(err))
-	os.Exit(1)
-}

demo.gif

@@ -2,18 +2,19 @@ package downloader
 
 import (
 	"bytes"
-	"fmt"
 	"io"
+	"sort"
 	"sync"
 
 	"github.com/elboletaire/manga-downloader/grabber"
 	"github.com/elboletaire/manga-downloader/http"
 	"github.com/fatih/color"
 )
 
+// File represents a downloaded file
 type File struct {
 	Data []byte
-	Name string
+	Page uint
 }
 
 // FetchChapter downloads all the pages of a chapter
@@ -29,14 +30,13 @@ func FetchChapter(site grabber.Site, chapter *grabber.Chapter) (files []*File, e
 		go func(page grabber.Page) {
 			defer wg.Done()
 
-			filename := fmt.Sprintf("%03d.jpg", page.Number)
 			file, err := FetchFile(http.RequestParams{
 				URL:     page.URL,
-				Referer: site.GetBaseUrl(),
-			}, filename)
+				Referer: site.BaseUrl(),
+			}, uint(page.Number))
 
 			if err != nil {
-				color.Red("- error downloading page %s", filename)
+				color.Red("- error downloading page %d of %s", page.Number, chapter.GetTitle())
 				return
 			}
 
@@ -46,14 +46,19 @@ func FetchChapter(site grabber.Site, chapter *grabber.Chapter) (files []*File, e
 			<-guard
 		}(page)
 	}
-
 	wg.Wait()
+	close(guard)
+
+	// sort files by page number
+	sort.SliceStable(files, func(i, j int) bool {
+		return files[i].Page < files[j].Page
+	})
 
 	return
 }
 
 // FetchFile gets an online file returning a new *File with its contents
-func FetchFile(params http.RequestParams, filename string) (file *File, err error) {
+func FetchFile(params http.RequestParams, page uint) (file *File, err error) {
 	body, err := http.Get(params)
 	if err != nil {
 		return
@@ -67,7 +72,7 @@ func FetchFile(params http.RequestParams, filename string) (file *File, err erro
 
 	file = &File{
 		Data: data.Bytes(),
-		Name: filename,
+		Page: page,
 	}
 
 	return

demos/bundle.gif

@@ -12,7 +12,7 @@ import (
 
 // Inmanga is a grabber for inmanga.com
 type Inmanga struct {
-	Grabber
+	*Grabber
 	title string
 }
 
@@ -54,7 +54,7 @@ func (i *Inmanga) FetchTitle() (string, error) {
 
 // FetchChapters returns the chapters of the manga
 func (i Inmanga) FetchChapters() (Filterables, []error) {
-	id := GetUUID(i.URL)
+	id := getUuid(i.URL)
 
 	// retrieve chapters json list
 	body, err := http.GetText(http.RequestParams{

demos/download.gif

@@ -13,7 +13,7 @@ import (
 
 // Mangadex is a grabber for mangadex.org
 type Mangadex struct {
-	Grabber
+	*Grabber
 	title string
 }
 
@@ -35,11 +35,11 @@ func (m *Mangadex) FetchTitle() (string, error) {
 		return m.title, nil
 	}
 
-	id := GetUUID(m.URL)
+	id := getUuid(m.URL)
 
 	rbody, err := http.Get(http.RequestParams{
 		URL:     "https://api.mangadex.org/manga/" + id,
-		Referer: m.GetBaseUrl(),
+		Referer: m.BaseUrl(),
 	})
 	if err != nil {
 		return "", err
@@ -53,8 +53,8 @@ func (m *Mangadex) FetchTitle() (string, error) {
 	}
 
 	// fetch the title in the requested language
-	if m.PreferredLanguage != "" {
-		trans := body.Data.Attributes.AltTitles.GetTitleByLang(m.PreferredLanguage)
+	if m.Settings.Language != "" {
+		trans := body.Data.Attributes.AltTitles.GetTitleByLang(m.Settings.Language)
 
 		if trans != "" {
 			m.title = trans
@@ -70,7 +70,7 @@ func (m *Mangadex) FetchTitle() (string, error) {
 
 // FetchChapters returns the chapters of the manga
 func (m Mangadex) FetchChapters() (chapters Filterables, errs []error) {
-	id := GetUUID(m.URL)
+	id := getUuid(m.URL)
 
 	baseOffset := 500
 	var fetchChaps func(int)
@@ -86,8 +86,8 @@ func (m Mangadex) FetchChapters() (chapters Filterables, errs []error) {
 		params.Add("order[volume]", "asc")
 		params.Add("order[chapter]", "asc")
 		params.Add("offset", fmt.Sprint(offset))
-		if m.PreferredLanguage != "" {
-			params.Add("translatedLanguage[]", m.PreferredLanguage)
+		if m.Settings.Language != "" {
+			params.Add("translatedLanguage[]", m.Settings.Language)
 		}
 		uri = fmt.Sprintf("%s?%s", uri, params.Encode())
 
@@ -108,9 +108,10 @@ func (m Mangadex) FetchChapters() (chapters Filterables, errs []error) {
 			num, _ := strconv.ParseFloat(c.Attributes.Chapter, 64)
 			chapters = append(chapters, &MangadexChapter{
 				Chapter{
-					Number:   num,
-					Title:    c.Attributes.Title,
-					Language: c.Attributes.TranslatedLanguage,
+					Number:     num,
+					Title:      c.Attributes.Title,
+					Language:   c.Attributes.TranslatedLanguage,
+					PagesCount: c.Attributes.Pages,
 				},
 				c.Id,
 			})
@@ -194,6 +195,7 @@ type mangadexFeed struct {
 			Chapter            string
 			Title              string
 			TranslatedLanguage string
+			Pages              int64
 		}
 	}
 }