javlibrary 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8559cdbac936b3bcce4b4b1874a83e6c4fec7d5a
-  data.tar.gz: add8596d32995e49735406632e96be9d3abcb0ab
+  metadata.gz: c397e79bab44e6163aa9c2fd0b854b449e8d0db9
+  data.tar.gz: 8dfbd699be7a1f259c1adf89a75914aa08aa8803
 SHA512:
-  metadata.gz: 00f955519bc0737d9f56d759f889ef6ad12541cd37c2d303814b5962182f74c49b16007a6d93ca1f04d0f10e6becc5459effce931d5d3fedbfd89c943bc770d7
-  data.tar.gz: 836c6711b07fe18ceee137a09fb3c7cbee61b773754d4119342d7ce6af08f57933386bb8aeefe739c6bad05227800375f30bbe0f6a556fb62910e2f55cb2c18c
+  metadata.gz: d13f2461c778dd98578dd81e99a2d7a1767906a1663f09740ca2f8f5561a1d03f9f70870b1aded735e8beb38448dbaf44ff3d275f342ecf2173e9c8c8a4b094d
+  data.tar.gz: 847f291b7087b8975690bd144aaae583174edfa36724c86c24e4ee162fdc2a7de0faa0c313adab5669a32457c3a216859789a704ab4fb9581f272249c765c384

data/lib/javlibrary.rb

@@ -6,18 +6,28 @@ require 'nokogiri'
 require 'mysql2'
 require 'pp'
 
-PASSWORD = ""
+class Javlibrary
+    JAVLIBRARY_URL = [ "jav11b.com", "javlibrary.com" ]
+
+    def initialize(database_name = 'javlibrary', user = 'root', pwd = 'default')
+        # Define client variable
+        @database = database_name
+        @username = user
+        @password = pwd
+
+        # Define default Javlibrary url
+        @url = JAVLIBRARY_URL[0]
+    end
 
-module Javlibrary
     def client
         client = Mysql2::Client.new(:host => "127.0.0.1",
-                                    :username => "root",
-                                    :password => PASSWORD,
-                                    :database => "javlibrary_new")
+                                    :username => @user,
+                                    :password => @password,
+                                    :database => @database)
     end
 
-    def Javlibrary.downloader(identifer)
-        baseurl = "http://www.jav11b.com/cn/?v=#{identifer}"
+    def downloader(identifer)
+        baseurl = "http://www.#{@url}/cn/?v=#{identifer}"
         response = Mechanize.new
         response.user_agent = Mechanize::AGENT_ALIASES.values[rand(21)]
         begin
@@ -53,7 +63,7 @@ module Javlibrary
         #result["cast"] = details[-1]; result["genres"] = video_genres; result["img_url"] = video_jacket_img
     end
 
-    def Javlibrary.video_info_insert(client, index, identifer, actor_hash, genres_hash)
+    def video_info_insert(client, index, identifer, actor_hash, genres_hash)
         title, id, date, director, maker, label, cast_tmp, genres_tmp, img_url = downloader(identifer).split('$')
         cast = cast_tmp.split.reject(&:empty?)
         genres = genres_tmp.split.reject(&:empty?)
@@ -79,8 +89,8 @@ module Javlibrary
         client.close
     end
 
-    def download_all_video
-        client = Javlibrary.client
+    def download_all_videos
+        client = client
         result = client.query("SELECT video_num, video_label FROM label WHERE video_download=0")
         client.close
 
@@ -90,6 +100,7 @@ module Javlibrary
         end
 
         video_array = video_array.each_slice(5000).to_a
+
         actor_hash = Javlibrary::actor_hash
         genre_hash = Javlibrary::genre_hash
         thread_pool = Array::new
@@ -97,7 +108,7 @@ module Javlibrary
         video_array.each do |group|
             # Create a download thread
             thread_temp = Thread.new {
-                client = Javlibrary.client
+                client = client
                 group.each do |item|
                     begin
                         video_info_insert(client, item['video_num'], item['video_label'],
@@ -107,6 +118,7 @@ module Javlibrary
                     end
                 end
                 client.close
+                GC.start
             }
             thread_pool << thread_temp
         end
@@ -114,7 +126,7 @@ module Javlibrary
     end
 
     def actor_hash
-        client = Javlibrary.client
+        client = client
         actor_hash = Hash.new
         client.query("SELECT * FROM actor").each do |item|
             actor_hash["#{item['actor_name']}"] = item['actor_id']
@@ -125,7 +137,7 @@ module Javlibrary
     end
 
     def genre_hash
-        client = Javlibrary.client
+        client = client
         category_hash = Hash.new
         client.query("SELECT * FROM category").each do |item|
             category_hash["#{item['category_name']}"] = item['category_id']
@@ -135,10 +147,10 @@ module Javlibrary
         category_hash
     end
 
-    def Javlibrary.genres
+    def genres
         response = Mechanize.new; genres = Array.new
         begin
-            response.get "http://www.jav11b.com/cn/genres.php"
+            response.get "http://www.#{@url}/cn/genres.php"
         rescue
             retry
         end
@@ -150,7 +162,7 @@ module Javlibrary
     end
 
     def genres_insert
-        client = Javlibrary.client
+        client = client
         genres = genres()
         genres.each do |e|
             begin
@@ -163,7 +175,9 @@ module Javlibrary
         client.close
     end
 
-    def Javlibrary.author_page_num(nokogiri_doc)
+    alias download_all_genres genres_insert
+
+    def author_page_num(nokogiri_doc)
         last_page = 1
         nokogiri_doc.search('//div[@class="page_selector"]/a[@class="page last"]').each do |row|
             last_page = row['href'].split("=")[-1].to_i
@@ -172,9 +186,9 @@ module Javlibrary
     end
 
     def get_all_actor
-        firsturl = "http://www.jav11b.com/cn/star_list.php?prefix="
+        firsturl = "http://www.#{@url}/cn/star_list.php?prefix="
 
-        client = Javlibrary.client
+        client = client
         'A'.upto('Z') do |alphabet|
             tempurl = firsturl + alphabet
             begin
@@ -212,9 +226,11 @@ module Javlibrary
         client.close
     end
 
-    def Javlibrary.download_video_label(actor_id)
-        firsturl = "http://www.jav11b.com/ja/vl_star.php?s=#{actor_id}"
-        baseurl = "http://www.jav11b.com/ja/vl_star.php?&mode=&s=#{actor_id}&page="
+    alias download_all_actors get_all_actor
+
+    def download_video_label(actor_id)
+        firsturl = "http://www.#{@url}/ja/vl_star.php?s=#{actor_id}"
+        baseurl = "http://www.#{@url}/ja/vl_star.php?&mode=&s=#{actor_id}&page="
 
         begin
             response = RestClient.get firsturl
@@ -246,7 +262,7 @@ module Javlibrary
             end
         end
 
-        client = Javlibrary.client
+        client = client
         result.each do |e|
             begin
                 client.query("INSERT INTO label (video_label, video_download) VALUES ('#{e}', '0')")
@@ -257,8 +273,8 @@ module Javlibrary
         client.close
     end
 
-    def Javlibrary.select_actor(type)
-        client = Javlibrary.client
+    def select_actor(type)
+        client = client
         result = client.query("SELECT actor_label FROM actor WHERE type='#{type}'")
         client.close
 
@@ -267,7 +283,7 @@ module Javlibrary
         end
     end
 
-    def download_all_video_label
+    def download_all_video_labels
         thread_pool =[]
         'A'.upto('Z').each do |alphabet|
             thread_temp = Thread.new{
@@ -278,10 +294,10 @@ module Javlibrary
         thread_pool.map(&:join)
     end
 
-    module_function :client
-    module_function :download_all_video
-    module_function :actor_hash, :genre_hash
-    module_function :genres_insert
-    module_function :get_all_actor
-    module_function :download_all_video_label
+    # module_function :client
+    # module_function :download_all_videos
+    # module_function :actor_hash, :genre_hash
+    # module_function :genres_insert(download_all_genres)
+    # module_function :get_all_actor(download_all_actors)
+    # module_function :download_all_video_labels
 end

data/lib/javlibrary/version.rb

@@ -1,3 +1,3 @@
 module Javlibrary
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: javlibrary
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Yuanhao Sun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler