mrmanga 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d23b801dd6ae6826240c876de94c29bdcda7162
-  data.tar.gz: f4f27f1f5e9764905077a6deeb8c5faa99cb1e24
+  metadata.gz: e33e9eac4da9f4876817148f7e86a7bbfde98b98
+  data.tar.gz: '07975718124aca4d535f13425dd68b61ef98fa70'
 SHA512:
-  metadata.gz: 4d001b7af719bde9ff4f6d479863d3c3d10e8303bada5206b5cc1a2e34be2144f89cfb39cb680444099181fd0ab135ffd7e03ac09a040cc37042b9c0afcd31c8
-  data.tar.gz: 1e7c693c8193af02f27b04f9026e6836228a617efaf41606f848031c3b7593e4c871e3249f9997619c33a4ff7ec071fb4a58c972ee3a4f78fb5eaf0cfead0d96
+  metadata.gz: f271f43d5ad2beb5cd1a822d21f704aea46b9faf80827d6b7ca3ef7a213fa222b210663371e2d161b28dd9ec5535eef911bc0c597b6f64c678daa2952324c7ae
+  data.tar.gz: c03ab4a2efd9816b96a8b069ec0ac9b4da67c4956d5f46bacb21428445e98fb5499cd99fac423ea776733a7955ebea520d0c825b5819ae66f2f0ce801288512d

data/README.md

@@ -1,16 +1,54 @@
 # mrmanga
 
+[![Gem Version](https://badge.fury.io/rb/mrmanga.svg)](https://badge.fury.io/rb/mrmanga)
+[![Gem](https://img.shields.io/gem/dtv/mrmanga.svg)]()
+[![Gemnasium](https://img.shields.io/gemnasium/4ndv/mrmanga.svg)]()
+
 #### Aka mintmanga/readmanga downloader
 
-## Installation
+## Features
+
+* mintmanga and readmanga support
+* Automatic PDF creation with correct metadata (Title, Author, Keywords)
+* Outlines in PDF (chapters/pages)
+* Multithreaded download
+* Download only specified volumes
+
+## Linux/Mac Installation
 
     $ gem install mrmanga
 
+Requires Ruby 2.3+, ImageMagick (or GraphicsMagick), libxml2 (for nokogiri)
+
+## Windows Installation
+
+Download and install ruby 2.4 from here: https://rubyinstaller.org/downloads/
+
+**DONT UNCHECK ANY CHECKBOXES!**
+
+After installation, you will be asked to install devtools, just press enter in this screen and wait.
+
+Download and install ImageMagick from here: http://imagemagick.org/script/download.php
+
+Open CMD and enter this command:
+
+```bash
+$ gem install mrmanga --no-ri
+```
+
+Now you can use it in any folder where you want to store your downloads, just simply type `mrmanga` in console and follow the instructions.
+
 ## Usage
 
     $ mrmanga
 
-And follow the instructions
+And follow the instructions. By default, it will download to the folder where you runned it.
+
+## Future and TODOs
+
+* EPUB generation (GEPUB) with cover selection
+* More usable CLI
+* Non-interactive mode
 
 ## Development
 

data/lib/mrmanga/cli.rb

@@ -1,5 +1,17 @@
 module Mrmanga
   class CLI
+    def parse_volumes_range(string)
+      return 'all' if string == 'all'
+
+      if /^\d+-\d+$/ =~ string
+        # 13-37 syntax
+        a = string.split('-')
+        return (a[0]..a[1]).to_a
+      end
+
+      string.tr(' ', '').split(',').map(&:to_i)
+    end
+
     def interactive_shell
       require 'highline/import'
 
@@ -13,7 +25,30 @@ module Mrmanga
         q.validate = regex
       end
 
-      create_pdfs = agree 'Create pdfs for volumes? (Y/n)'
+      # TODO: Ask for volumes to download
+
+      puts "Just press Enter to download all the volumes, or specity volumes using this: 1-5 or this: 1, 2, 3, 4, 5 (or 1,2,3,4,5) syntaxes. Also you can download one volume by entering it's number (like this: 1)"
+
+      volumes = ask('Which volumes should i download?  ') { |q| q.default = 'all' }
+
+      volumes = parse_volumes_range(volumes)
+
+      puts "Will download these volumes: #{volumes.join(', ')}" if volumes != 'all'
+
+      downloader_settings = {
+        threads: ask('How many threads should i use to download? (6)  ', Integer) { |q| q.default = 6 },
+        volumes: volumes
+      }
+
+      create_pdfs = agree('Create pdfs for volumes?') { |q| q.default = 'yes' }
+
+      pdf_settings = {
+        disable_outline_pages: false
+      }
+
+      if create_pdfs
+        pdf_settings[:disable_outline_pages] = !agree('Add pages in PDF outline?') { |q| q.default = 'no' }
+      end
 
       say 'Parsing manga info'
 
@@ -21,16 +56,14 @@ module Mrmanga
 
       say 'Parsed, downloading'
 
-      dl = Mrmanga::Downloader.new(manga)
+      dl = Mrmanga::Downloader.new(manga, downloader_settings)
 
       manga.volumes.each do |vol, _|
-        puts "Downloading volume #{vol}"
-
         volume = dl.download_volume(vol)
 
-        if create_pdfs
+        if create_pdfs && volume
           puts "Rendering pdf of Vol.#{volume[:volume]}"
-          Mrmanga::PdfRenderer.new(manga, volume[:volume], volume[:pages])
+          Mrmanga::PdfRenderer.new(manga, volume[:volume], volume[:pages], pdf_settings)
         end
       end
     end

data/lib/mrmanga/downloader.rb

@@ -1,18 +1,30 @@
 require 'down'
 require 'fileutils'
 require 'parallel'
+require 'progressbar'
 
 module Mrmanga
   class Downloader
-    def initialize(manga)
+    def initialize(manga, settings)
       @manga = manga
 
+      @settings = settings
+
       @name = @manga.info[:info][:name]
 
       raise "Folder '#{@name}' already exists" if File.directory?(@name)
     end
 
     def download_volume(volume)
+      if @settings[:volumes] != 'all'
+        unless @settings[:volumes].include?(volume)
+          puts "Skipping Vol. #{volume}"
+          return false
+        end
+      end
+
+      puts "Downloading volume #{volume}"
+
       prefix = "#{@name}/vol#{volume}"
 
       parser = Mrmanga::Parser.new
@@ -22,13 +34,17 @@ module Mrmanga
       downloaded = {}
 
       @manga.volumes[volume].each do |volch|
-        puts "Downloading vol.#{volch[0]} ch.#{volch[1]}"
         pages = parser.get_chapter_pages(@manga, volch[0], volch[1])
 
-        Parallel.each_with_index(pages, in_threads: 6) do |page, index|
-          puts "Downloading page #{index + 1}"
+        progress = ProgressBar.create(title: "Downloading vol.#{volch[0]} ch.#{volch[1]}", total: pages.count)
+
+        Parallel.each_with_index(pages, in_threads: @settings[:threads]) do |page, index|
+          progress.increment
 
           temp = Down.download(page[:link], open_timeout: 20, read_timeout: 20)
+
+          temp.close # Windows needs this
+
           ext = File.extname(temp.path)
 
           new_path = File.join(prefix, "#{volch[0]} - #{volch[1]} - #{index + 1}#{ext}")
@@ -39,6 +55,8 @@ module Mrmanga
         end
 
         downloaded[volch[1]] = pages
+
+        progress.finish
       end
 
       {

data/lib/mrmanga/manga.rb

@@ -14,6 +14,10 @@ module Mrmanga
       @info[:metadata] = metadata
     end
 
+    def add_original_chapters(orig_ch)
+      @info[:original_chapters] = orig_ch
+    end
+
     def volumes
       @info[:volch].group_by(&:first)
     end

data/lib/mrmanga/parser.rb

@@ -21,7 +21,9 @@ module Mrmanga
 
       noko_first = Nokogiri::HTML(Faraday.get("http://#{parsed[:site]}#{first_link}?mature=1").body)
 
-      volch = noko_first.css('#chapterSelectorSelect > option').map { |el| el.attr('value') }
+      volch_with_orig = noko_first.css('#chapterSelectorSelect > option').map { |el| [el.attr('value'), el.text] }
+
+      volch = volch_with_orig.map(&:first)
 
       regex_volch = /^\/[\w]+\/vol(\d+)\/(\d+).*$/
 
@@ -30,13 +32,22 @@ module Mrmanga
 
         raise "Wrong url: #{vl}" unless match
 
-        match.to_a.drop(1)
+        match.to_a.drop(1).map(&:to_i)
       end
 
       volch.reverse!
 
+      orig_names = {}
+
+      volch.each do |item|
+        orig_names[item[0]] = {} unless orig_names.key?(item[0])
+
+        orig_names[item[0]][item[1]] = volch_with_orig.pop.last
+      end
+
       manga = Mrmanga::Manga.new
 
+      manga.add_original_chapters(orig_names)
       manga.add_info(
         site: parsed[:site],
         name: parsed[:name]

data/lib/mrmanga/pdf_renderer.rb

@@ -3,7 +3,7 @@ require 'mini_magick'
 
 module Mrmanga
   class PdfRenderer
-    def initialize(manga, volume, chapters)
+    def initialize(manga, volume, chapters, settings)
       info = manga.info[:metadata].clone
 
       title = info[:Title]
@@ -18,7 +18,6 @@ module Mrmanga
 
       chapters.each do |ch, pages|
         puts "Chapter #{ch}"
-
         outline_map[ch] = []
 
         pages.each do |page|
@@ -45,15 +44,29 @@ module Mrmanga
         section info[:Title]
 
         outline_map.each do |chapter, pages|
-          section "Chapter #{chapter}", destination: pages.first do
-            pages.each do |page_number|
-              page title: "Page #{page_number}", destination: page_number
+          section manga.info[:original_chapters][volume][chapter], destination: pages.first do
+            unless settings[:disable_outline_pages]
+              pages.each do |page_number|
+                page title: "Page #{page_number}", destination: page_number
+              end
             end
           end
         end
       end
 
-      doc.render_file "#{manga.info[:info][:name]}/#{title} Vol. #{volume}.pdf"
+      # Normalize filename (may contain inappropriate chars)
+
+      # Removing non-word chars
+      title.gsub!(/[^[[[:word:]]| |.]+]/, '')
+      # Stripping spaces, dots, underscores, dashes from start and end
+      title.gsub!(/^[\.|_| |-]+/, '')
+      title.gsub!(/[\.|_| |-]+$/, '')
+
+      filename = "#{manga.info[:info][:name]}/#{title} Vol. #{volume}.pdf"
+
+      doc.render_file filename
+
+      puts "Rendered to #{filename}"
     end
   end
 end

data/lib/mrmanga/version.rb

@@ -1,3 +1,3 @@
 module Mrmanga
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/mrmanga.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'down', '~> 4.0'
   spec.add_dependency 'parallel', '~> 1.11'
   spec.add_dependency 'mini_magick', '~> 4.8'
+  spec.add_dependency 'progressbar', '~> 1.8'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrmanga
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrey Viktorov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.8'
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement