mangdown 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6443de1c0cb154bfc68bd4b1f5cea81f58946693
-  data.tar.gz: 8726490e4b2178e714ab66db8ee27afafe4107db
+  metadata.gz: 633df46c12b46c060731d829ece8d2e050385435
+  data.tar.gz: 16cb0f86943496a2c184f60487b5adf71456dcba
 SHA512:
-  metadata.gz: 767c5e5aeb49ff9b2e28d16035ff718d054bded41e78cf690c53659593663469eb98fd22ac03cef0f6b08bbe58c50637450427150f998e319c76c08affc3497a
-  data.tar.gz: 064ca3d79312925c8b919dc9383aedfc8c8884ec8aa40abb923053b1ba1fa9f076a892f2a817a47c44d1146bee3e5a7a84c7d89ed249c94746857c173614993f
+  metadata.gz: 654e248dc8de1af7697ba9adea5caf2492c3be5027d929c8a56964494442204e8bbadf67516e1763a038bd75a5cc607d6910ee4b4d6cb8cb77f7c88ef4da99a4
+  data.tar.gz: a1d030830a97b497060af161140b8c4bba5ca6111e8427fa3c3348cc33914e81a9b5a60c62f7c4d29bea11c749d3ca866f33654fbff7263872f981e14708aa37

data/db/chapter_script.rb

@@ -0,0 +1,30 @@
+require_relative '../lib/mangdown'
+require 'logger'
+
+module DB
+  extend self 
+
+  def create_chapters!(start_char, end_char, site_id) 
+    logger = Logger.new('migrate_log.log')
+
+    a_mangas = Manga.select do |m|
+      m.name.downcase[0] >= start_char and 
+        m.name.downcase[0] <= end_char and 
+        m.site_id == site_id 
+    end 
+
+    a_mangas.each do |manga|
+      begin
+        m = Mangdown::Manga.new(manga.name, manga.uri)
+        m.chapters_list.each do |md_hash| 
+          Chapter.create(md_hash.to_h.merge({manga_id: manga.id}))
+        end
+      rescue Exception => error
+        logger.error(Time.now.to_s + ' ' + error.message)
+        next
+      end
+    end
+  end
+end
+
+ 

data/db/environment.rb

@@ -0,0 +1,12 @@
+require 'active_record'
+require 'yaml'
+require 'erb'
+
+require_relative '../db/mangdown_db.rb'
+
+require_relative '../models/site.rb' 
+require_relative '../models/manga.rb' 
+require_relative '../models/chapter.rb' 
+require_relative '../models/page.rb' 
+
+Mangdown::DB.establish_connection

data/db/mangdown_db.rb

@@ -0,0 +1,46 @@
+module Mangdown
+  class DB 
+    config_path = File.expand_path(File.dirname(__FILE__) + '/config.yml')
+    @@config = YAML.load(ERB.new(File.read(config_path)).result)
+
+    def self.establish_connection
+      ActiveRecord::Base.establish_connection(@@config)
+    end 
+
+    def self.establish_base_connection
+      ActiveRecord::Base.establish_connection(
+        @@config.merge(
+          {
+            "database" => "postgres",
+            "schema_search_path" => "public",
+          }
+        )
+      )
+    end
+
+    def self.connection
+      ActiveRecord::Base.connection
+    end
+
+    def self.create_database
+      connection.create_database(
+        @@config["database"],
+        @@config,
+      )
+    end
+
+    def self.drop_database
+      connection.drop_database(
+        @@config["database"],
+      )
+    end
+
+    def self.migrate
+      ActiveRecord::Migrator.migrate(
+        File.expand_path(File.dirname(__FILE__) + '/migrate'), nil
+      )
+    end
+  end
+end
+
+

data/db/migrate/001_add_tables.rb

@@ -0,0 +1,55 @@
+require_relative '../../lib/mangdown'
+
+class AddTables < ActiveRecord::Migration
+  def up
+    create_table :sites do |t|
+      t.string :name
+      t.string :uri
+    end
+
+    Site.create({                                     #1
+      name: 'mangareader', 
+      uri: 'http://www.mangareader.net/alphabetical',
+    })
+    Site.create({                                     #2
+      name: 'mangafox',
+      uri:  'http://mangafox.me/manga/',
+    }) 
+
+    create_table :mangas do |t|
+      t.string  :name
+      t.string  :uri
+      t.integer :site_id
+    end
+
+    mangareader = Mangdown::MangaList.new( Site.find(1).uri )
+    mangafox    = Mangdown::MangaList.new( Site.find(2).uri )
+
+    mangareader.mangas.each do |md_hash|
+      Manga.create(md_hash.merge( {site_id: 1}))
+    end
+
+    mangafox.mangas.each do |md_hash|
+      Manga.create(md_hash.merge( {site_id: 2}))
+    end
+
+    create_table :chapters do |t|
+      t.string  :name
+      t.string  :uri
+      t.integer :manga_id
+    end
+
+    create_table :pages do |t|
+      t.string  :name
+      t.string  :uri
+      t.integer :chapter_id
+    end
+  end
+
+  def down
+    drop_table :sites
+    drop_table :mangas
+    drop_table :chapters
+    drop_table :pages
+  end
+end

data/db/pages_script.rb

@@ -0,0 +1,24 @@
+require_relative '../lib/mangdown'
+require 'logger'
+
+
+module DB
+  extend self
+
+
+  def create_pages!(chapter_id)
+    logger = Logger.new('migration_log.log')
+    chapter = Chapter.find(chapter_id)
+    m_chapter = Mangdown::MDHash.new({
+      name: chapter.name, uri:chapter.uri
+    }).to_chapter
+    m_chapter.pages.each do |page|
+      Page.create({
+        name: page.name, uri: page.uri, chapter_id: chapter_id
+      })
+    end
+  rescue Exception => error
+    logger.error( error.message )
+  end
+end
+

data/lib/mangdown/chapter.rb

@@ -1,7 +1,7 @@
 module Mangdown
 	class Chapter
 
-		attr_reader :name, :uri, :pages
+		attr_reader :name, :uri, :pages, :manga, :chapter
 
 		def initialize(name, uri)
       @manga = name.slice(/(^.+)\s/, 1) 
@@ -67,7 +67,13 @@ module Mangdown
         threads.each {|thread| thread.join}
         return @pages.length
 			end
-	end
+
+     # get the number of pages
+			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
 	class MRChapter < Chapter
@@ -75,12 +81,16 @@ module Mangdown
 	
       # get the doc for a given page number
       def get_page_doc(num)
-        doc = Tools.get_doc(
-          Mangdown::Uri.new( 
-            @properties.root                                + 
-            "/#{@manga.gsub(' ', '-')}/#{@chapter}/#{num}"
-          ).downcase
-        )
+        root     = @properties.root
+        manga    = @manga.gsub(' ', '-')
+        uri_str  = "#{root}/#{manga}/#{@chapter}/#{num}"
+        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 
       end
 		
 			# get the page uri and name
@@ -92,12 +102,6 @@ module Mangdown
 					name: (image['alt'] + ".jpg")
 				)
 			end
-
-			# get the number of pages
-			def get_num_pages(doc)
-				# the select is a dropdown menu of chapter pages
-        doc.css('select')[1].children.length
-			end
 	end
 
 	# mangafox chapter object
@@ -127,7 +131,7 @@ module Mangdown
 
 			# get the number of pages
 			def get_num_pages(doc)
-				doc.css('select')[1].children.length - 1
+        super - 1
 			end
 	end
 end

data/lib/mangdown/commands.rb

@@ -39,16 +39,13 @@ module M
       manga[:name].downcase.include?(search.downcase)
     end
     
-		search_result.empty? ? (puts "Could not find manga") : search_result
+    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)
-    if manga.class == MDHash
-			manga = manga.to_manga
-    end
-
+		manga = manga.to_manga
     Tools::Downloader.new(manga, first, last)
   end
 

data/lib/mangdown/mangdown.rb

@@ -2,15 +2,6 @@ module Mangdown
 
 	extend self
 
-  def to_s
-		"<#{self.class}::#{self.object_id}" <<
-		@name ? " : #{@name}" : '' <<
-		name  ? " : #{name}"  : '' <<
-		@uri  ? "	: #{@uri}"  : '' <<
-		uri   ? " : #{uri}"   : '' <<
-		">"
-	end
-
   def eql?(other)
     (self.name == other.name) and (self.uri == other.uri)
   end

data/lib/mangdown/popular.rb

@@ -39,11 +39,11 @@ module Mangdown
       end
 
       def get_pop_page_manga(time)
-        root = ::Mangdown::Tools.get_root(@uri)
+        root = Tools.get_root(@uri)
 
         num = 30 * (time)
         page = root + '/popular/' + num.to_s
-        doc = ::Mangdown::Tools.get_doc(page)
+        doc = Tools.get_doc(page)
 
         last = (@num_mangas > 30) ? 30 : @num_mangas
         @num_mangas -= 30
@@ -53,9 +53,10 @@ module Mangdown
 
       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
+          MDHash.new({
+            uri: (root + a['href']),
+            name: a.text
+          })
         end
       end
   end

data/lib/mangdown/properties.rb

@@ -9,6 +9,8 @@ module Mangdown
       case site 
       when /mangareader/
 				mangareader
+      when /mangapanda/
+        mangareader
       when /mangafox/
 				mangafox
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies: []
 description: A gem to download Manga, (pg integration in dev)
 email: jphager2@gmail.com
@@ -17,6 +17,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- db/chapter_script.rb
+- db/environment.rb
+- db/mangdown_db.rb
+- db/migrate/001_add_tables.rb
+- db/pages_script.rb
 - doc/help.txt
 - lib/mangdown.rb
 - lib/mangdown/cbz.rb