mangdown 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ea88db18ac42922a837cb3ed76307d35af9bea
-  data.tar.gz: c9594ac2a9dba91e307bda03ea3f3630a265591f
+  metadata.gz: 0d85a1d5f0bf974970fcc26e817583bfcf16226b
+  data.tar.gz: 9b8108fd038b01dd78eda987753c38a4e21c0f94
 SHA512:
-  metadata.gz: c4d252007f729afbff7a8d6da1257feec608da2db20fdc7940cfa2f6f875b2e4766f83022dd2845b7a8925be09ae0c043e5ba74cad4edaf369e9392e65363531
-  data.tar.gz: 528ec01731d20658013268171ea7c168235f0f8572a5fb3948e1c5bc52648a3151b4b8ba2a72feefd4909dde55b3dec2574fb8a8e707b00762b24936dc0e5491
+  metadata.gz: c61a0df176b08ed90f5f4a56a8215aa027af64a2f3ed89a7ae722c5cf8d7b32e005b2d8c4851b7ba23abfae80506651e8459b8ee2b66d4c761572cafc6406034
+  data.tar.gz: 638112e648008bde76e405c5309b19223cde0a9d684ee4827cfd0901b4170ca723edabab0374884799ef937f4b2e429144a30b7dcc4728f4a78ce999a0100608

data/lib/mangdown.rb

@@ -4,7 +4,11 @@ require 'yaml'
 require 'zip'
 require 'filemagic'
 
-require_relative 'mangdown/mangdown'
+module Mangdown
+  ADAPTERS = []
+
+  DOWNLOAD_DIR ||= Dir.home + '/manga'
+end
 
 require_relative 'mangdown/adapter'
 adapters = "#{File.expand_path('../mangdown/adapter', __FILE__)}/*.rb"
@@ -12,18 +16,16 @@ Dir[adapters].each do |f|
   require_relative f 
 end
 
+require_relative 'mangdown/equality'
 require_relative 'mangdown/tools'
 require_relative 'mangdown/properties'
 require_relative 'mangdown/uri'
 require_relative 'mangdown/page'
 require_relative 'mangdown/chapter'
 require_relative 'mangdown/manga'
-require_relative 'mangdown/popular'
 require_relative 'mangdown/manga_list.rb'
 require_relative 'mangdown/cbz'
 require_relative 'mangdown/commands'
 require_relative 'mangdown/mangdown_hash'
 
-if $0 == __FILE__
-  puts '*** Use "M.help" for commands ***'
-end
+

data/lib/mangdown/adapter.rb

@@ -3,22 +3,43 @@ module Mangdown
     class Base
       
       attr_reader :root
-      def initialize(uri, doc)
-        @uri, @doc = uri, doc
-        #@root                  = '' 
-        #@manga_list_css        = ''
-        #@chapter_list_css      = ''
-        #@manga_name_css        = ''
-        #@manga_list_uri        = '' 
-        #@manga_link_prefix     = '' 
-        #@reverse_chapters      = true || false
-        #@manga_uri_regex       = /.*/i 
-        #@chapter_uri_regex     = /.*/i
-        #@page_uri_regex        = /.*/i
+      def initialize(uri, doc, name)
+        @uri, @doc, @name = uri, doc, name
+        #@root                    = '' 
+        #@manga_list_css          = ''
+        #@chapter_list_css        = ''
+        #@manga_name_css          = ''
+        #@chapter_name_css        = ''
+        #@chapter_manga_name_css  = ''
+        #@chapter_number_css        = ''
+        #@manga_list_uri          = '' 
+        #@manga_link_prefix       = '' 
+        #@reverse_chapters        = true || false
+        #@manga_uri_regex         = /.*/i 
+        #@chapter_uri_regex       = /.*/i
+        #@page_uri_regex          = /.*/i
+      end
+
+      def self.type
+        name.split('::').last.downcase.to_sym
       end
 
       def type
-        self.class.to_s.split('::').last.downcase.to_sym
+        self.class.type
+      end
+
+      # Override this if you want to use an adapter name for a site that is 
+      # not matched in the site's url
+      # e.g. CoolAdapterName < Adapter::Base
+      # def site
+      #   "mangareader"
+      # end
+      def self.site
+        type.to_s
+      end
+
+      def site
+        self.class.site
       end
 
       # Must return true/false if uri represents a manga for adapter
@@ -38,7 +59,36 @@ module Mangdown
 
       # Must return a string
       def manga_name
-        doc.css(@manga_name_css).text
+        if is_manga?
+          doc.css(@manga_name_css).text
+        elsif is_chapter?
+          chapter_manga_name
+        end
+      end
+
+      def chapter_name
+        if @name
+          @name.sub(/\s(\d+)$/) { |num| ' ' + num.to_i.to_s.rjust(5, '0') }
+        else
+          doc.css(@chapter_name_css).text
+        end
+      end
+
+      def chapter_manga_name
+        if @name
+          @name.slice(/(^.+)\s/, 1) 
+        else
+          doc.css(@chapter_manga_name_css).text
+        end
+      end
+
+      def chapter_number
+        raise NoMethodError, "Not a chapter" unless is_chapter?
+        if @name
+          @name.slice(/\d+\z/).to_i 
+        else
+          doc.css(@chapter_number_css).text
+        end
       end
 
       # Must return a uri for a page given the arguments
@@ -61,11 +111,12 @@ module Mangdown
       # [manga_uri, manga_name, adapter_type]
       # If block given, then the block may alter this array
       # Only valid mangas should be returned (using is_manga?(uri))
-      def manga_list
+      def collect_manga_list
         doc.css(@manga_list_css).map { |a| 
-          manga = ["#{@manga_link_prefix}#{a[:href]}",a.text.strip,type]
-          next(nil) unless is_manga?(manga.first)
-          block_given? ? yield(manga) : manga
+          manga = ["#{@manga_link_prefix}#{a[:href]}", a.text.strip, type]
+          if is_manga?(manga.first)
+            block_given? ? yield(manga) : manga
+          end
         }.compact
       end
 
@@ -75,9 +126,11 @@ module Mangdown
       # Only valid chapters should be returned (using is_chapter?(uri))
       def manga_chapters
         chapters = doc.css(@chapter_list_css).map { |a|
-          chapter = [(root + a[:href].sub(root, '')),a.text.strip,type]
-          next(nil) unless is_chapter?(chapter.first)
-          block_given? ? yield(chapter) : chapter 
+          link = root + a[:href].sub(root, '')
+          chapter = [link, a.text.strip, type]
+          if is_chapter?(chapter.first)
+            block_given? ? yield(chapter) : chapter 
+          end
         }.compact
         @reverse_chapters ? chapters.reverse : chapters
       end

data/lib/mangdown/adapter/mangafox.rb

@@ -2,21 +2,21 @@ module Mangdown
   class Mangafox < Adapter::Base
     Mangdown::ADAPTERS << self
 
-    def initialize(uri, doc)
+    def initialize(uri, doc, name)
       super
-			@manga_list_css        = 'div.manga_list li a'
-			@chapter_list_css      = 'a.tips'
-			@root                  = 'http://mangafox.me'
+      @manga_list_css        = 'div.manga_list li a'
+      @chapter_list_css      = 'a.tips'
+      @root                  = 'http://mangafox.me'
       @manga_list_uri        = "#{@root}/manga"
       @manga_name_css        = "#title h1"
-			@manga_link_prefix     = ''
-			@reverse_chapters      = true
+      @manga_link_prefix     = ''
+      @reverse_chapters      = true
       @manga_uri_regex       = 
         /#{@root}\/manga\/[^\/]+?\//i
       @chapter_uri_regex     = 
         /#{@manga_uri_regex}(v\d+\/)?(c\d+\/)(1\.html)/i
       @page_uri_regex        = /.+\.(png|jpg|jpeg)$/i
-		end
+    end
 
     def manga_name
       CGI.unescapeHTML(super.sub(/ Manga/, '').downcase).upcase

data/lib/mangdown/adapter/mangahere.rb

@@ -2,21 +2,21 @@ module Mangdown
   class Mangahere < Adapter::Base
     Mangdown::ADAPTERS << self
 
-    def initialize(uri, doc)
+    def initialize(uri, doc, name)
       super
-			@root                  = 'http://www.mangahere.co'
-			@manga_list_css        = 'a.manga_info'
+      @root                  = 'http://www.mangahere.co'
+      @manga_list_css        = 'a.manga_info'
       @manga_name_css        = 'h1.title'
-			@chapter_list_css      = '.detail_list ul a'
+      @chapter_list_css      = '.detail_list ul a'
       @manga_list_uri        = "#{@root}/mangalist/"
-			@manga_link_prefix     = ''
-			@reverse_chapters      = true
+      @manga_link_prefix     = ''
+      @reverse_chapters      = true
       @manga_uri_regex       = 
         /#{@root}\/manga\/([^\/]+\/)?/i
       @chapter_uri_regex     = 
         /#{@manga_uri_regex}(v\d+\/)?(c\d+\/)(1\.html)?/i
       @page_uri_regex        = /.+\.(png|jpg|jpeg)$/i
-		end
+    end
 
     def manga_name
       CGI.unescapeHTML(super.downcase).upcase

data/lib/mangdown/adapter/mangapanda.rb

@@ -4,7 +4,7 @@ module Mangdown
   class Mangapanda < Mangareader
     Mangdown::ADAPTERS << self
 
-    def initialize(uri, doc)
+    def initialize(uri, doc, name)
       @root = 'http://www.mangapanda.com'
       super
     end

data/lib/mangdown/adapter/mangareader.rb

@@ -2,7 +2,7 @@ module Mangdown
   class Mangareader < Adapter::Base
     Mangdown::ADAPTERS << self
 
-    def initialize(uri, doc)
+    def initialize(uri, doc, name)
       super
 			@root                  ||= 'http://www.mangareader.net'
 			@manga_list_css        = 'ul.series_alpha li a'
@@ -23,7 +23,8 @@ module Mangdown
     end
 
     def build_page_uri(uri, manga, chapter, page_num)
-      "#{root}/#{manga.gsub(' ', '-')}/#{chapter}/#{page_num}"
+      slug = slug(manga)
+      "#{root}/#{slug}/#{chapter}/#{page_num}"
     end
 
     def num_pages
@@ -45,6 +46,10 @@ module Mangdown
     def page_image
       doc.css('img')[0]
     end
+
+    def slug(string)
+      string.gsub(' ', '-').gsub(/[:,]/, '')
+    end
   end
 end
 

data/lib/mangdown/adapter/no_adapter_error.rb

@@ -0,0 +1,9 @@
+module Mangdown
+  module Adapter
+    class NoAdapterError < StandardError
+      def initialize(site)
+        super("Bad Site: No Properties Specified for Site: #{site.inspect}")
+      end
+    end
+  end
+end

data/lib/mangdown/adapter/wiemanga.rb

@@ -2,30 +2,30 @@ module Mangdown
   class Wiemanga < Adapter::Base
     Mangdown::ADAPTERS << self
 
-    def initialize(uri, doc)
+    def initialize(uri, doc, name)
       super
-			@root                  = 'http://www.wiemanga.com'
+      @root                  = 'http://www.wiemanga.com'
       @manga_list_uri        = 
         "#{@root}/search/?name_sel=contain&author_sel=contain" +
         "&completed_series=either"
       @manga_name_css        = '.bookmessagebox h1'
-			@manga_list_css        = 'a.resultbookname'
-			@chapter_list_css      = 
+      @manga_list_css        = 'a.resultbookname'
+      @chapter_list_css      = 
         '.chapterlist tr:not(:first-child) .col1 a'
-			@manga_link_prefix     = '' 
-			@reverse_chapters      = true
+      @manga_link_prefix     = '' 
+      @reverse_chapters      = true
       @manga_uri_regex       = /#{@root}\/manga\/([^\/]+)(\.html)?/i
       @chapter_uri_regex     = 
         /#{@root}\/chapter\/([^\/]+)\/(\d+)(\/|\.html)?/i
       @page_uri_regex        = /.+\.(png|jpg|jpeg)$/i
-		end
+    end
 
     def manga_name
       super.sub(/ Manga$/, "")
     end
 
     def build_page_uri(uri, manga, chapter, page_num)
-      "#{uri}-#{page_num}.html"
+      "#{uri.sub(/\/+$/, '')}-#{page_num}.html"
     end
 
     def num_pages

data/lib/mangdown/cbz.rb

@@ -4,56 +4,57 @@ module Mangdown
     extend ::Mangdown::Tools
 
     def all(main_dir)
-			# Make sure all sub dirs are checked
-			validate_file_or_dir_names(main_dir)
-			# Make sure all sub dirs have files checked
-			check_dir(main_dir) { |dir| validate_file_or_dir_names(dir)}
-			# Create cbz files for all sub dirs
-			cbz_sub_dirs(main_dir)
+      main_dir = String(main_dir)
+      # Make sure all sub dirs are checked
+      validate_file_or_dir_names(main_dir)
+      # Make sure all sub dirs have files checked
+      each_dir_or_page(main_dir) { |dir| validate_file_or_dir_names(dir)}
+      # Create cbz files for all sub dirs
+      cbz_sub_dirs(main_dir)
+    end
+
+    def one(dir)
+      dir = String(dir)
+      validate_file_or_dir_names(dir)
+      cbz_dir(dir)
     end
 
     private
     def cbz_dir(dir)
+      dir = dir.to_s.sub(/\/*$/, "")
+      
       zip_file_name = dir + '.cbz'
-      dir += '/' unless dir[-1] == '/'
+      return if File.exist?(zip_file_name)
 
       ::Zip::File.open(zip_file_name, ::Zip::File::CREATE) do |zip|
-        Dir[File.join(dir, '**', '**')].each do |file|
-          zip.add(file.sub(dir, ''), file)
+        file_matcher = File.join(dir, '**', '**')
+        dir << "/"
+
+        Dir.glob(file_matcher).each do |file|
+          filename = file.sub(dir, '')
+          zip.add(filename, file)
         end
       end
     end
 
     def cbz_sub_dirs(dir)
-      check_dir(dir) do |sub_dir|
+      each_dir_or_page(dir) do |sub_dir|
         cbz_dir(sub_dir)
       end
     end 
 
-    def check_dir(dir)
-      Dir.glob(dir + '/*').each do |file_name| 
-        #do block on each file name, but skip .cbz files
-        next if file_name.include?('.cbz')
-        yield(file_name)
+    def each_dir_or_page(dir)
+      Dir.glob(dir + '/*').each do |filename| 
+        next if filename.include?('.cbz')
+        yield(filename)
       end
     end 
 
     def validate_file_or_dir_names(dir)
-      check_dir(dir) do |file_name|
-        checked_name = check_file_or_dir_name(file_name)
+      each_dir_or_page(dir) do |file_name|
+        checked_name = Tools.valid_path_name(file_name)
         File.rename(file_name, checked_name)
       end
     end
-
-    def check_file_or_dir_name(name)
-      # slice the last number in the file or directory name,
-      # which will be either the page number or the chapter number
-      num = name.slice(/(\d+)(\.jpg)*\Z/, 1)
-      return name unless num
-
-      zeros_to_add = (3-num.length) > 0 ? (3-num.length) : 0
-      num = "0" * zeros_to_add + num
-      name.sub(/(\d+)(\.jpg)*\Z/, num + '\2')
-    end 
   end
 end

data/lib/mangdown/chapter.rb

@@ -1,24 +1,33 @@
 module Mangdown
-	class Chapter
+  class Chapter
 
     include Equality
     include Enumerable
-		attr_reader :name, :uri, :pages, :manga, :chapter
 
-		def initialize(name, uri)
+    attr_reader :uri, :pages
+
+    def initialize(uri, name = nil, manga = nil, chapter = nil)
       # use a valid name
-			@name       = name.sub(/\s(\d+)$/) { |num| 
-        ' ' + num.to_i.to_s.rjust(3, '0')
-      }
-      @manga      = name.slice(/(^.+)\s/, 1) 
-      @chapter    = name.slice(/\d+\z/).to_i 
-			@uri        = Mangdown::Uri.new(uri)
-      @properties = Properties.new(@uri)
-			@pages      = []
+      @name = name 
+      @manga = manga
+      @chapter = chapter
+      @uri = Mangdown::Uri.new(uri)
+      @properties = Properties.new(@uri, nil, nil, name)
+
+      load_pages
+    end
+
+    def name
+      @name ||= @properties.chapter_name
+    end
+
+    def manga
+       @manga ||= @properties.manga_name
+    end
 
-			get_pages
-      @pages.sort_by! {|page| page.name}
-		end
+    def chapter
+      @chapter ||= @properties.chapter_number
+    end
 
     def inspect
       "#<#{self.class} @name=#{name} @uri=#{uri} " +
@@ -28,76 +37,97 @@ module Mangdown
     alias_method :to_s, :inspect
 
     # enumerates through pages
-    def each
-      block_given? ? @pages.each { |page| yield(page) } : @pages.each
+    def each(&block)
+      @pages.each(&block)
+    end
+
+    # explicit conversion to chapter
+    def to_chapter
+      self
+    end
+
+    def to_path
+      @path ||= set_path
+    end
+
+    def set_path(dir = nil)
+      dir ||= File.join(DOWNLOAD_DIR, manga)
+      path = File.join(dir, name)
+      path = Tools.valid_path_name(path)
+      @path = Tools.relative_or_absolute_path(path)
     end
 
-		# explicit conversion to chapter
-		def to_chapter
-			self
-		end
+    def cbz(dir = to_path)
+      CBZ.one(dir)
+    end
 
-		# download all pages in a chapter
-		def download_to(dir)
-      dir   = Tools.relative_or_absolute_path(dir, @name)
-      pages = map {|page| page.to_page}
-      failed    = []
+    # download all pages in a chapter
+    def download_to(dir = nil)
+      pages = map(&:to_page)
+      failed = []
       succeeded = []
 
-      Dir.mkdir(dir) unless Dir.exists?(dir)
-      Tools.hydra_streaming(pages) do |stage, page, data=nil|
+      setup_download_dir!(dir)
+
+      Tools.hydra_streaming(pages) do |stage, page, data = nil|
         case stage
         when :failed
           failed << page
         when :succeeded
           succeeded << page
         when :before
-          path = page.file_path(dir)
-          !File.exist?(path)
+          !page.file_exist?(to_path)
         when :body
-          unless failed.include?(page)
-            path = page.file_path(dir)
-            File.open(path, 'ab') { |file| file.write(data) } 
-          end
+          page.append_file_data(to_path, data) unless failed.include?(page)
         when :complete
-          unless failed.include?(page)
-            path = page.file_path(dir)
-            FileUtils.mv(path, "#{path}.#{Tools.file_type(path)}")
-          end
+          page.append_file_ext(to_path) unless failed.include?(page)
         end
       end
-      FileUtils.rm_rf(dir) if succeeded.empty?
 
-      !succeeded.empty?
-		end
+      FileUtils.rm_r(to_path) if succeeded.empty?
 
-		private
-    # get page objects for all pages in a chapter
-    def get_pages
-      pages = (1..@properties.num_pages).map {|num| get_page_hash(num)}
+      { failed: failed, succeeded: succeeded }
+    end
+
+    private
+    def setup_download_dir!(dir)
+      set_path(dir)
+      FileUtils.mkdir_p(to_path) unless Dir.exists?(to_path)
+    end
 
+    def load_pages
+      @pages ||= []
+
+      fetch_each_page do |page| @pages << page end
+      @pages.sort_by!(&:name)
+    end
+
+    # get page objects for all pages in a chapter
+    def fetch_each_page
+      pages = build_page_hashes
       Tools.hydra(pages) do |page, body|
-        @pages << get_page(page.uri, Nokogiri::HTML(body))
+        page = get_page(page.uri, Nokogiri::HTML(body))
+        yield(page)
       end
     end
 
-    # get the doc for a given page number
-    def get_page_hash(num)
-      uri_str = @properties.build_page_uri(uri, @manga, @chapter, num)
-
-      MDHash.new(
-        uri: Mangdown::Uri.new(uri_str).downcase, name: num
-      )
+    # get the docs for number of pages 
+    def build_page_hashes
+      (1..@properties.num_pages).map { |num|  
+        uri_str = @properties.build_page_uri(uri, manga, chapter, num)
+        uri = Mangdown::Uri.new(uri_str).downcase 
+        MDHash.new(uri: uri, name: num, chapter: name, manga: manga)
+      }
     end
 
     # get the page name and uri
     def get_page(uri, doc)
       properties = Properties.new(uri, nil, doc)
-      MDHash.new(
-        uri:  properties.page_image_src, 
-        name: properties.page_image_name,
-        site: properties.type
-      )
+      uri = properties.page_image_src 
+      page = properties.page_image_name
+      site = properties.type
+
+      MDHash.new(uri: uri, name: page, chapter: name, manga: manga, site: site)
     end
   end
 end