mangdown 0.8.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 633df46c12b46c060731d829ece8d2e050385435
-  data.tar.gz: 16cb0f86943496a2c184f60487b5adf71456dcba
+  metadata.gz: beac9cf983e8dae6123c6ccd3ccdbac2e2de4298
+  data.tar.gz: 84010f24f9890d8157815a7ed0b3430453d88bca
 SHA512:
-  metadata.gz: 654e248dc8de1af7697ba9adea5caf2492c3be5027d929c8a56964494442204e8bbadf67516e1763a038bd75a5cc607d6910ee4b4d6cb8cb77f7c88ef4da99a4
-  data.tar.gz: a1d030830a97b497060af161140b8c4bba5ca6111e8427fa3c3348cc33914e81a9b5a60c62f7c4d29bea11c749d3ca866f33654fbff7263872f981e14708aa37
+  metadata.gz: 4689e520bb6574dd69b2a1bbea4154092ea0a7ce0999a70ee08c58fc3a0d5cf0bf930264664b7c6d8b05c511e91f37b670a1ec65c16e27a2e25bc839f7b5642a
+  data.tar.gz: 510899de271d3dff43a09b82ea7d543d86b4522c68af6607f0b83a2215cec800231dbcad68d680a18225a9084a5d532e74bc57686e4dfb0dc27cfd0eaf6d24c3

data/doc/help.txt

@@ -1,4 +1,4 @@
-========================================================================
+====================================================================
 Mangdown
 
 Commands
@@ -11,23 +11,32 @@ Commands
 
 
 
-    **Use Mangdown::MDHash#get_manga to get a Mangdown::Manga object**
+    **Use Mangdown::MDHash#to_manga to get a Mangdown::Manga object**
 
-    naruto = results[0].get_manga
+    naruto = results[0].to_manga
 
 
 
-    M#download(manga, int = 0, int = -1) 
+    Mangdown::Manga#download(int = 0, int = -1) 
                   - Will download a manga (Mangdown::Manga object) 
                     from the first int (index of the first chapter) 
                     to the last int  (index of the last chapter) to 
-                    a subdirectory named  #{manga.name}".  If no 
-                    indexes are given, all chapters are downloaded.
+                    a subdirectory of the set DOWNLOAD_DIR which 
+                    is the Dir.home directory by default named  
+                    #{manga.name}".  If no indexes are given, all 
+                    chapters are downloaded.
 
-    M.download(naruto, 500, 549)
+    # naruto is the Mangdown::Manga object from the example above
+    naruto.download(500, 549)
 
-    
+    Mangdown::Manga#download_to(dir, int = 0, int = -1)
+                   - Same as download above, but you can provide
+                     the directory when the manga subdirectory 
+                     will be downloaded
 
+    # naruto is the Mangdown::Manga object from the example above
+    naruto.download_to(Dir.home + '/manga', 500, 549)
+    
     M#clean_up     - Will delete .manga_list.yml file from the home
                      directory
 

data/lib/mangdown/cbz.rb

@@ -50,7 +50,7 @@ module Mangdown
       # 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 unless num
+      return name unless num
 
       zeros_to_add = (3-num.length) > 0 ? (3-num.length) : 0
       num = "0" * zeros_to_add + num

data/lib/mangdown/chapter.rb

@@ -1,6 +1,7 @@
 module Mangdown
 	class Chapter
 
+    include Enumerable
 		attr_reader :name, :uri, :pages, :manga, :chapter
 
 		def initialize(name, uri)
@@ -14,42 +15,29 @@ module Mangdown
 			get_pages
 		end
 
+    # enumerates through pages
+    def each
+      @pages.each {|page| yield(page) if block_given?}
+    end
+
 		# explicit conversion to chapter
 		def to_chapter
 			self
 		end
 
-    def download
-      warn "#download is depreciated use #download_to"
-
-      dir = File.expand_path(@name)
-      Dir.mkdir(dir) unless Dir.exists?(dir)
-      
-      threads = []
-      @pages.each do |page| 
-        threads << Thread.new(page) do |this_page| 
-          this_page.download_to(dir)
-        end
-      end
-
-      threads.each {|thread| thread.join}
-      return @pages.length
-		end
-
 		# download all pages in a chapter
 		def download_to(dir)
       dir = File.expand_path(dir + '/' + @name)
       Dir.mkdir(dir) unless Dir.exists?(dir)
       
       threads = []
-      @pages.each do |page| 
+      each do |page| 
         threads << Thread.new(page) do |this_page| 
-          this_page.download_to(dir)
+          Tools.no_time_out {this_page.download_to(dir)}
         end
       end
 
       threads.each {|thread| thread.join}
-      return @pages.length
 		end
 
 		private
@@ -57,22 +45,30 @@ module Mangdown
 			# get page objects for all pages in a chapter
 			def get_pages
         threads = []
-        get_num_pages(get_page_doc(1)).times do |page|
-          threads << Thread.new(page) do |this_page|
-            hash = get_page(get_page_doc(this_page + 1)) 
-            @pages << hash.to_page 
+
+        num_pages = get_num_pages(Tools.get_doc(uri))
+        1.upto(num_pages) do |num|
+          threads << Thread.new(num) do |this_num|
+            Tools.no_time_out do
+              tries = 0
+              until doc = get_page_doc(this_num) || tries > 2
+                tries += 1
+              end
+              return unless doc
+              @pages << get_page(doc)
+            end
           end
-				end
+        end
 
         threads.each {|thread| thread.join}
-        return @pages.length
 			end
 
-     # get the number of pages
+      # get the number of pages in a chapter
 			def get_num_pages(doc)
 				# the select is a dropdown menu of chapter pages
         doc.css('select')[1].css('option').length
 			end	
+
   end
 
 	# mangareader chapter object
@@ -87,10 +83,8 @@ module Mangdown
         page_uri = Mangdown::Uri.new(uri_str).downcase
 
         Tools.get_doc(page_uri)
-      #rescue OpenURI::HTTPError => error 
-      #  print "Chapter: #{@chapter}, page: #{num}, "
-      #  print " uri: #{page_uri} >> "
-      #  puts  error.message 
+      rescue SocketError => error 
+        STDERR.puts( "#{error.message} | #{name} | #{num}" )
       end
 		
 			# get the page uri and name
@@ -100,7 +94,9 @@ module Mangdown
 				MDHash.new(
 					uri: image['src'], 
 					name: (image['alt'] + ".jpg")
-				)
+        ).to_page
+      rescue NoMethodError => error
+        puts 'doc was ' + doc.class
 			end
 	end
 
@@ -110,13 +106,15 @@ module Mangdown
 
       # get the doc for a given page number
       def get_page_doc(num)
-        doc = Tools.get_doc(
+        Tools.get_doc(
           Mangdown::Uri.new(
-            @properties.root                               + 
+            @properties.root                                + 
             "/manga/#{@manga.gsub(' ', '_')}/c#{@chapter}/" + 
             "#{num}.html"
           ).downcase
         )
+      rescue SocketError => error 
+        STDERR.puts( "#{error.message} | #{name} | #{num}" )
       end
 
 			# get the page name and uri
@@ -126,7 +124,7 @@ module Mangdown
 				MDHash.new(
 					uri: image[:src], 
 					name: image[:src].sub(/.+\//, '')
-				)
+        ).to_page
 			end
 
 			# get the number of pages

data/lib/mangdown/commands.rb

@@ -41,13 +41,6 @@ module M
     
     search_result
   end
-  
-	# download a manga (accepts MDHash) between the chapters given
-	# by default the entire manga will be downloaded
-  def download(manga, first = 0, last = -1)
-		manga = manga.to_manga
-    Tools::Downloader.new(manga, first, last)
-  end
 
 	# cbz all subdirectories in a directory
   def cbz(dir)
@@ -56,8 +49,9 @@ module M
 
 	# display help file
   def help
-    help_file = File.expand_path('../../doc/help.txt', 
-                                 File.dirname(__FILE__))
+    help_file = File.expand_path(
+      '../../doc/help.txt', File.dirname(__FILE__)
+    )
     puts File.open(help_file, 'r').read
   end
 

data/lib/mangdown/manga.rb

@@ -1,59 +1,73 @@
 module Mangdown
 
+  DOWNLOAD_DIR ||= Dir.home + '/manga'
+
 	# mangdown manga object, which holds chapters
   class Manga
 
-    attr_reader :name, :uri, :chapters, :chapters_list 
+    include Enumerable
+    attr_reader :name, :uri, :chapters, :enum 
 
     def initialize(name, uri)
 			@name = name
 			@uri  = uri
-
-      #Keeping these chapter objects in memory could be expensive
       @chapters = []
-      @chapters_list = []
 
-      get_chapters_list
+      get_chapters
     end
 
-		# explicit conversion to manga
-		def to_manga 
-			self
-		end
-
-		# get push MDHashes of manga chapters to @chapters 
-    def get_chapters_list
-			properties = Properties.new(@uri)
-      doc        = Tools.get_doc(@uri)
-			root       = properties.root
-
-      #get the link with chapter name and uri
-      doc.css(properties.manga_css_klass).each do |chapter|
-				@chapters_list << MDHash.new(
-					uri: (root + chapter[:href].sub(root, '')), 
-					name: chapter.text,
-				) 
+    public 
+      # download to current directory convenience method
+      def download(*args)
+        download_to(DOWNLOAD_DIR,*args)
+      end
+      
+      # download using enumerable
+      def download_to(dir, start = 0, stop = -1)
+        dir += "/#{name}"
+        reset(start, stop)
+        Dir.mkdir(dir) unless Dir.exist?(dir)
+        loop do
+          self.next.to_chapter.download_to(dir)
+        end
       end
 
-			@chapters_list.reverse! if properties.reverse 
-    end
+      # explicit conversion to manga
+      def to_manga 
+        self
+      end
 
-    # returns a MDHash if the chapter is found in @chapters 
-    def chapter_found(chapter)
-      @chapters.find do |chp| 
-        (chp.name == chapter[:name]) or (chp.uri == chapter[:uri])
+      # each for enumerating through chapters
+      def each
+        @chapters.each {|chapter| yield(chapter) if block_given?}
+      end 
+
+      # go through the chapters one at a time
+      def next
+        @enum || reset
+        @enum.next
       end
-    end
 
-		# pushes a Chapter object into @chapters unless it is already there
-    def get_chapter(index) 
-      chapter  = @chapters_list[index] 
+      # reset enum for next
+      def reset(start = 0, stop = -1)
+        @enum = each[start..stop].lazy
+      end
+  
+      # get push MDHashes of manga chapters to @chapters 
+      def get_chapters
+        properties = Properties.new(@uri)
+        doc        = Tools.get_doc(@uri)
+        root       = properties.root
 
-      unless chapter_found(chapter) 
-				@chapters << chapter.to_chapter 
-      else
-        puts "This chapter has already been added" 
+        #get the link with chapter name and uri
+        doc.css(properties.manga_css_klass).each do |chapter|
+          @chapters << MDHash.new(
+            uri: (root + chapter[:href].sub(root, '')), 
+            name: chapter.text,
+          ) 
+        end
+
+        @chapters.reverse! if properties.reverse 
       end
-    end
   end
 end

data/lib/mangdown/page.rb

@@ -1,6 +1,7 @@
 class Mangdown::Page
 
 	include Mangdown 
+  include Comparable
 
 	attr_reader :name, :uri
 
@@ -9,27 +10,24 @@ class Mangdown::Page
 		@uri  = Mangdown::Uri.new(uri) 
 	end
 
+  # space ship operator for sorting
+  def <=>(other)
+    self.name <=> other.name
+  end
+
 	# explicit conversion to page 
 	def to_page
 		self
 	end	
 
-  # download the page
-	def download
-    warn "#download is depreciated use #download_to"
-		return nil if File.exist?(@name)
-    File.open(@name, 'wb') do |file|
-			file.write(open(uri).read)
-		end
-	end
-
   # downloads to specified directory
-  def download_to(dir)
-    path = dir + '/' + @name
+  def download_to(dir = Dir.pwd)
+    path = dir + '/' + name
     # don't download again
-    return nil if File.exist?(path)
-    File.open(path, 'wb') do |file| 
-      file.write(open(uri).read)
-    end
+    return if File.exist?(path)
+    image = open(uri).read
+    File.open(path, 'wb') {|file| file.write(image)}
+  rescue SocketError => error
+    STDERR.puts( "#{error.message} | #{name} | #{uri}" )
   end
 end

data/lib/mangdown/popular.rb

@@ -1,45 +1,32 @@
 module Mangdown
   class PopularManga
 
-    attr_reader :uri, :mangas_list, :mangas, :name
+    include Enumerable
+    attr_reader :uri, :mangas, :name
 
-    def initialize(uri, num_mangas = 0, name = "My Pop Manga")
-      @uri = uri 
+    def initialize(uri, num_mangas = 30, name = "My Pop Manga")
+      @uri        = uri 
       @num_mangas = num_mangas
-      @name = name
-
-      @mangas_list = []
-
-      #Depreciated
-      @mangas = []
+      @name       = name
+      @mangas     = []
 
       get_mangas_list
     end
 
-    #Depreciated use MDHash.get_manga
-    def get_manga(number)
-      puts "This has been depreciated, don't use PopularManga @mangas!"
-      manga  = @mangas_list[number - 1]
-
-      unless @mangas.find {|mnga| (mnga.name == manga[:name]) or 
-                                   (mnga.uri == manga[:uri])}
-        @mangas << manga.to_manga
-      else
-        puts "This manga has already been added.."
-      end
+    # iterate over mangas (for enumerable)
+    def each
+      @mangas.each {|manga| yield(manga) if block_given?}
     end
 
     private
       def get_mangas_list
         (@num_mangas / 30.0).ceil.times do |time|
-          get_pop_page_manga(time).each do |manga| 
-            @mangas_list << manga
-          end
+          @mangas += get_pop_page_manga(time) 
         end
       end
 
       def get_pop_page_manga(time)
-        root = Tools.get_root(@uri)
+        root = Tools.get_root(uri)
 
         num = 30 * (time)
         page = root + '/popular/' + num.to_s

data/lib/mangdown/tools.rb

@@ -4,16 +4,7 @@ module Mangdown
   module Tools
     extend self
   
-		def return_to_start_dir 
-			start = Dir.pwd
-			yield
-			Dir.chdir(start)
-    rescue Exception => error
-      Dir.chdir(start)
-      raise error
-		end
-
-    def get_doc(uri)
+		def get_doc(uri)
 			@doc = ::Nokogiri::HTML(open(uri))
     end
 
@@ -22,69 +13,9 @@ module Mangdown
     end
     
     def no_time_out(tries = 3, &block)
-      tries -= 1
-      begin 
-        timeout(120) { yield } 
-      rescue Timeout::Error
-        tries >= 0 ? no_time_out(tries, &block) : :timed_out
-      end
-    end
-
-    class Downloader
-      include Tools
-
-      def initialize(manga, first, last)
-        @tempfile = File.expand_path("#{manga.name}_temp.yml")
-
-        chapters = slow_get_chapters(manga, first, last)
-        slow_dl_chapters(chapters)
-      end
-
-      def slow_get_chapters(manga, bgn, nd)
-        # get Manga object from file if it exists
-        if File.exist?(@tempfile)
-          manga_from_file = YAML
-            .load(File.open(@tempfile, 'r').read) 
-        end
-
-        # if the manga is from tempfile and the manga has chapters
-        # then check if it has the right chapters 
-        if manga_from_file and (manga_from_file.chapters.length > 0)
-          frst = (manga.chapters_list[bgn][:name] == 
-                 manga_from_file.chapters.first.name) 
-          lst = (manga.chapters_list[nd][:name] == 
-                 manga_from_file.chapters.last.name)
-          manga = manga_from_file if (frst and lst)
-        else
-          threads = []
-          manga.chapters_list[bgn..nd].each_index do |index|
-            threads << Thread.new(index) do |i|
-              no_time_out {manga.get_chapter(i + bgn)}
-            end
-          end
-          threads.each {|thread| thread.join}
-        end
-
-        File.open(@tempfile, 'w') {|f| f.write(manga.to_yaml)}
-
-        manga
-      end
-
-      def slow_dl_chapters(manga)
-        dir = File.expand_path(manga.name)
-        Dir.mkdir(dir) unless Dir.exist?(dir)
-
-        threads = []
-        manga.chapters.each do |chap|
-          threads << Thread.new(chap) do |this_chap|
-            no_time_out {this_chap.download_to(dir)}
-          end
-        end
-
-        threads.each {|thread| thread.join}
-
-        File.delete(@tempfile)
-      end
+      timeout(30) { yield } 
+    rescue Timeout::Error
+      retry if (tries -= 1) >= 0  
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies: []
 description: A gem to download Manga, (pg integration in dev)
 email: jphager2@gmail.com
@@ -73,5 +73,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Downloads Manga
+summary: Downloads Manga, 0.9.0 has some big API changes
 test_files: []