mangdown 0.7.1 → 0.7.2

data/lib/mangdown/manga.rb

@@ -1,46 +1,47 @@
-module Mangdown
-  class Manga
-    include ::Mangdown::Tools
-
-    attr_reader :chapters, :chapters_list, :name, :uri
-
-    def initialize(uri, name)
-      @uri = uri
-      @name = name
-      @chapters = []
-      @chapters_list = []
-      @doc = get_doc(@uri)
-      @root = get_root(@uri) 
-
-      get_chapters_list
-    end
-
-    def get_chapters_list
-      @doc.css('div#chapterlist td a').each do |chapter|
-        @chapters_list << ([@root + chapter['href'], chapter.text])
-      end
-
-      @doc = "Nokogiri::HTML::Document"
-    end
- 
-    def get_chapter(index) 
-      
-      uri, name = @chapters_list[index]
-    
-      unless @chapters.find {|chp| (chp.name == name) or (chp.uri == uri)}
-        # this is far from ideal
-        chapter_klass = if @root.include?('mangareader')
-          MRChapter
-	elsif @root.include?('fakku')
-   	  FKChapter
-	else
-	  NO_Chapter
-	end
-     
-     	@chapters << chapter_klass.new(uri, name)
-      else
-        nil
-      end
-    end
-  end
-end
+module Mangdown
+  class Manga
+    include ::Mangdown::Tools
+
+    attr_reader :chapters, :chapters_list, :name, :uri
+
+    def initialize(uri, name)
+      @uri = uri
+      @name = name
+
+      #Keeping these chapter objects in memory could be expensive
+      @chapters = []
+      @chapters_list = []
+
+      get_chapters_list
+    end
+
+    def get_chapters_list
+      doc = ::Mangdown::Tools.get_doc(@uri)
+      root = ::Mangdown::Tools.get_root(@uri)
+
+      #get the link with chapter name and uri
+      doc.css('div#chapterlist td a').each do |chapter|
+        @chapters_list << ([root + chapter['href'], chapter.text])
+      end
+    end
+ 
+    def get_chapter(index) 
+      
+      root = ::Mangdown::Tools.get_root(@uri)
+      uri, name = @chapters_list[index]
+    
+      unless @chapters.find {|chp| (chp.name == name) or (chp.uri == uri)}
+        # this is far from ideal
+        chapter_klass = if root.include?('mangareader')
+          MRChapter
+        else
+          NO_Chapter
+        end
+     
+        @chapters << chapter_klass.new(uri, name)
+      else
+        puts "This chapter has already been added" 
+      end
+    end
+  end
+end

data/lib/mangdown/mangdown_hash.rb

@@ -1,8 +1,8 @@
-module Mangdown
-  class MDHash < ::Hash
-    def get_manga
-      Manga.new(self[:uri], self[:name])
-    end
-  end
-end
-
+module Mangdown
+  class MDHash < ::Hash
+    def get_manga
+      Manga.new(self[:uri], self[:name])
+    end
+  end
+end
+

data/lib/mangdown/page.rb

@@ -1,16 +1,21 @@
-module Mangdown
-  class Page
-    attr_reader :filename, :uri
-
-    def initialize( uri, filename )
-      @filename = filename + '.jpg'
-      @uri = uri
-    end
-
-    def download
-      File.open(@filename, 'wb') do |file|
-        file.write(open(URI.encode(@uri, '[]')).read)
-      end
-    end
-  end
-end
+module Mangdown
+  class Page
+    attr_reader :filename, :uri
+
+    def initialize( uri, filename )
+
+      # this will probably become a problem when adding different
+      # Manga sites which may use different file types than .jpg
+      @filename = filename + '.jpg'
+      @uri = uri
+    end
+
+    # this method should probably be moved somewhere else because
+    # pages, chapters and mangas can all be "downloaded"
+    def download
+      File.open(@filename, 'wb') do |file|
+        file.write(open(URI.encode(@uri, '[]')).read)
+      end
+    end
+  end
+end

data/lib/mangdown/popular.rb

@@ -1,52 +1,63 @@
-module Mangdown
-  class PopularManga
-    include ::Mangdown::Tools
-
-    attr_reader :uri, :mangas_list, :mangas, :name
-
-    def initialize(uri, num_mangas, name = "My Pop Manga")
-      @uri = uri 
-      @num_mangas = num_mangas
-      @name = name
-
-      @mangas_list = []
-      @mangas = []
-
-      @root = get_root(@uri) 
-
-      get_mangas_list
-    end
-
-    def get_manga(index)
-      uri, name = @mangas_list[index - 1]
-      unless @mangas.find {|manga| (manga.name == name) or (manga.uri == uri)}
-        @mangas << Manga.new( uri, name )
-      else
-	nil
-      end
-    end
-
-    def get_mangas_list
-      (@num_mangas / 30.0).ceil.times do |time|
-        get_pop_page_manga(time).each { |manga| @mangas_list << manga }
-      end
-
-      @doc = "Nokogiri::HTML::Document"
-    end
-
-    def get_pop_page_manga(time)
-      num = 30 * (time)
-      page = @root + '/popular/' + num.to_s
-      get_doc(page)
-
-      last = (@num_mangas > 30) ? 30 : @num_mangas
-      @num_mangas -= 30
-
-      get_manga_on_page[0..(last - 1)]
-    end
-
-    def get_manga_on_page
-      @doc.css('h3 a').map {|a| [@root + a['href'], a.text]}
-    end
-  end
-end
+module Mangdown
+  class PopularManga
+
+    attr_reader :uri, :mangas_list, :mangas, :name
+
+    def initialize(uri, num_mangas = 0, name = "My Pop Manga")
+      @uri = uri 
+      @num_mangas = num_mangas
+      @name = name
+
+      @mangas_list = []
+
+      #Depreciated
+      @mangas = []
+
+      get_mangas_list
+    end
+
+    #Depreciated
+    def get_manga(number)
+      puts "This has been depreciated, don't use PopularManga @mangas!"
+      uri  = @mangas_list[number - 1][:uri]
+      name = @mangas_list[number - 1][:name]
+
+      unless @mangas.find {|manga| (manga.name == name) or 
+                                   (manga.uri == uri)}
+        @mangas << Manga.new( uri, name )
+      else
+        puts "This manga has already been added.."
+      end
+    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
+        end
+      end
+
+      def get_pop_page_manga(time)
+        root = ::Mangdown::Tools.get_root(@uri)
+
+        num = 30 * (time)
+        page = root + '/popular/' + num.to_s
+        doc = ::Mangdown::Tools.get_doc(page)
+
+        last = (@num_mangas > 30) ? 30 : @num_mangas
+        @num_mangas -= 30
+
+        get_manga_on_page(doc, root)[0..(last - 1)]
+      end
+
+      def get_manga_on_page(doc, root)
+        doc.css('h3 a').map do |a| 
+          h = MDHash.new
+          h[:uri], h[:name] = (root + a['href']), a.text
+          h
+        end
+      end
+  end
+end

data/lib/mangdown/tools.rb

@@ -1,110 +1,114 @@
-module Mangdown
-  module Tools
-    extend self
-  
-    def get_doc(uri)
-      @doc = ::Nokogiri::HTML(open(uri))
-    end
-
-    def get_root(uri)
-      @root = ::URI::join(uri, "/").to_s[0..-2] 
-    end
-
-    def to_s
-      "<#{self.class}::#{self.object_id} : #{@name} : #{@uri}>"
-    end
-
-    def eql?(other)
-      (@name == other.name) and (@uri == other.uri)
-    end
-
-    def ==(other)
-      puts 'You may want to use :eql?'
-      super
-    end
-
-    def no_time_out(tries = 3)
-      begin 
-        timeout(120) do
-          yield 
-	end
-      rescue
-	if tries > 0
-          tries -= 1
-	  puts "Tries left: #{tries}"
-	  no_time_out(tries)
-	else
-	  return
-	end
-      end
-    end
-
-    def slow_get_chapters(manga, bgn, nd)
-      @@file_name = File.expand_path("#{manga.name}_temp.yml")
-
-      exists = File.exist?(@@file_name)
-      manga_from_file = YAML.load(File.open(@@file_name, 'r').read) if exists
-
-      if manga_from_file and (manga_from_file.chapters.length > 0)
-	frst = (manga.chapters_list[bgn][1] ==
-				manga_from_file.chapters.first.name) 
-	lst = (manga.chapters_list[nd][1] == manga_from_file.chapters.last.name)
-        manga = manga_from_file if (frst and lst)
-      else
-	manga.chapters_list[bgn..nd].each_index do |i|
-    	  no_time_out {manga.get_chapter(i + bgn)}
-	end
-      end
-
-      File.open(@@file_name, 'w') {|f| f.write(manga.to_yaml)}
-
-      manga
-    end
-
-    def slow_dl_chapters(manga)
-      start_dir = Dir.pwd
-      Dir.mkdir(manga.name) unless Dir.exist?(manga.name)
-      Dir.chdir(manga.name)
-
-      manga.chapters.each do |chap|
-        # puts "DL - #{chap.name}.."
-        no_time_out {chap.download}
-      end
-
-      File.delete(@@file_name)
-      Dir.chdir(start_dir)
-    end
-
-    def check_file_or_dir_name(name)
-      num = name.slice(/(\d+)(\.jpg)*\Z/, 1)
-    
-      if num
-        while num.length < 3
-          num = '0' + num
-        end
-    
-        name = name.sub(/(\d+)(\.jpg)*\Z/, num + '\2')
-      end
-
-      name
-    end 
-
-    def check_dir(dir)
-      Dir.glob(dir + '/*').each do |d| 
-        next if d.include?('.cbz')
-        yield(d)
-      end
-    end 
-
-    def validate_file_or_dir_names(dir)
-      check_dir(dir) do |e|
-        f = check_file_or_dir_name(e)
-
-        unless f == e
-          File.rename(e, f)
-        end
-      end
-    end
-  end
-end
-
+module Mangdown
+  module Tools
+    extend self
+  
+    def get_doc(uri)
+      @doc = ::Nokogiri::HTML(open(uri))
+    end
+
+    def get_root(uri)
+      @root = ::URI::join(uri, "/").to_s[0..-2] 
+    end
+
+    def to_s
+      "<#{self.class}::#{self.object_id} : #{@name} : #{@uri}>"
+    end
+
+    def eql?(other)
+      (@name == other.name) and (@uri == other.uri)
+    end
+
+    def ==(other)
+      puts 'You may want to use :eql?'
+      super
+    end
+
+    def no_time_out(tries = 3)
+      begin 
+        timeout(120) do
+          yield 
+        end
+            rescue
+        if tries > 0
+                tries -= 1
+          puts "Tries left: #{tries}"
+          no_time_out(tries)
+        else
+          return
+        end
+      end
+    end
+
+    def slow_get_chapters(manga, bgn, nd)
+      @@file_name = File.expand_path("#{manga.name}_temp.yml")
+
+      exists = File.exist?(@@file_name)
+
+      if exists
+        manga_from_file = YAML.load(File.open(@@file_name, 'r').read) 
+      end
+
+      if manga_from_file and (manga_from_file.chapters.length > 0)
+        frst = (manga.chapters_list[bgn][1] == 
+               manga_from_file.chapters.first.name) 
+        lst = (manga.chapters_list[nd][1] == 
+               manga_from_file.chapters.last.name)
+        manga = manga_from_file if (frst and lst)
+      else
+        manga.chapters_list[bgn..nd].each_index do |i|
+          no_time_out {manga.get_chapter(i + bgn)}
+        end
+      end
+
+      File.open(@@file_name, 'w') {|f| f.write(manga.to_yaml)}
+
+      manga
+    end
+
+    def slow_dl_chapters(manga)
+      start_dir = Dir.pwd
+      Dir.mkdir(manga.name) unless Dir.exist?(manga.name)
+      Dir.chdir(manga.name)
+
+      manga.chapters.each do |chap|
+        # puts "DL - #{chap.name}.."
+        no_time_out {chap.download}
+      end
+
+      File.delete(@@file_name)
+      Dir.chdir(start_dir)
+    end
+
+    def check_file_or_dir_name(name)
+      num = name.slice(/(\d+)(\.jpg)*\Z/, 1)
+    
+      if num
+        while num.length < 3
+          num = '0' + num
+        end
+    
+        name = name.sub(/(\d+)(\.jpg)*\Z/, num + '\2')
+      end
+
+      name
+    end 
+
+    def check_dir(dir)
+      Dir.glob(dir + '/*').each do |d| 
+        next if d.include?('.cbz')
+        yield(d)
+      end
+    end 
+
+    def validate_file_or_dir_names(dir)
+      check_dir(dir) do |e|
+        f = check_file_or_dir_name(e)
+
+        unless f == e
+          File.rename(e, f)
+        end
+      end
+    end
+  end
+end
+