javlibrary 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eccb00912d355abe97bbfc69fda2c5455acca48
-  data.tar.gz: c1955ec501ab0cdfa098871c766a06acdbf480d0
+  metadata.gz: 5723255f77cb9d65e915321b64e063c022df08d4
+  data.tar.gz: 83f8061363421299df8f6f4311e11b3b252a91c7
 SHA512:
-  metadata.gz: 36d0bb16e9aec71b743f9fdeb605f679f638ce152b2060fc9b566b078a1083ca81b12d339a653d94d9defefaf150ab4cef3bc8a5f1df47151411d5c7bf83989d
-  data.tar.gz: c38c3768171a33fb7c803e354f050ccb61d6d702d253c66560e07052fd3364fe8abface55f9e19821abe824ea49406726dad5ad8a0b1beacc8ecf4d6eb8ec30a
+  metadata.gz: 0ca9c744206fa58ecdd25fe61598bc75c60b9197c7249c701a18c4ad26647df3de006c5fad3a3a096e54fb88a22822189ab0238f269667cfc077d75efdcf20aa
+  data.tar.gz: 48fb079df16f3bf5f40922057c4a4cdad4cab2ed7ccc12c97c77f7943e00013e7bff5034c1e5f377e9dc14e7b6fe0ec958f99a44c27d4dbc4ba9023f58a848ab

data/lib/javlibrary.rb

@@ -65,10 +65,12 @@ class Javlibrary
         #result["cast"] = details[-1]; result["genres"] = video_genres; result["img_url"] = video_jacket_img
     end
 
-    def video_info_insert(client, index, identifer, actor_hash, genres_hash)
+    def video_info_insert(index, identifer, actor_hash, genres_hash)
+        client = client()
+
         result = downloader(identifer)
-        return nil if result == nil
 
+        return nil if result == nil
         title, id, date, director, maker, label, cast_tmp, genres_tmp, img_url = result.split('$')
         cast = cast_tmp.split.reject(&:empty?)
         genres = genres_tmp.split.reject(&:empty?)
@@ -76,24 +78,34 @@ class Javlibrary
             client.query("INSERT INTO video (video_id,video_name,license,url,director,label,date,maker)
             VALUES (#{index},'#{title}','#{id}','#{img_url}','#{director}','#{label}','#{date}','#{maker}')")
         rescue
-            return
+            client.query("UPDATE label SET video_download=1 WHERE video_num=#{index}")
+            return nil
         end
         cast.each do |a|
             a_tmp = actor_hash[a]
             next if a_tmp == nil
-            client.query("INSERT INTO v2a (v2a_fk_video,v2a_fk_actor) VALUES(#{index}, #{a_tmp.to_i})")
+            begin
+                client.query("INSERT INTO v2a (v2a_fk_video,v2a_fk_actor) VALUES(#{index}, #{a_tmp.to_i})")
+            rescue
+                next
+            end
         end
 
         genres.each do |g|
             g_tmp = genres_hash[g]
             next if g_tmp == nil
-            client.query("INSERT INTO v2c (v2c_fk_video,v2c_fk_category) VALUES(#{index}, #{g_tmp.to_i})")
+            begin
+                client.query("INSERT INTO v2c (v2c_fk_video,v2c_fk_category) VALUES(#{index}, #{g_tmp.to_i})")
+            rescue
+                next
+            end
         end
 
         client.query("UPDATE label SET video_download=1 WHERE video_num=#{index}")
+        client.close
     end
 
-    def download_all_videos
+    def download_all_videos_thread
         client = client()
         result = client.query("SELECT video_num, video_label FROM label WHERE video_download=0")
         client.close
@@ -112,22 +124,37 @@ class Javlibrary
         video_array.each do |group|
             # Create a download thread
             thread_temp = Thread.new {
-                client = client()
                 group.each do |item|
                     begin
-                        video_info_insert(client, item['video_num'], item['video_label'],
+                        video_info_insert(item['video_num'], item['video_label'],
                             actor_hash, genre_hash)
                     rescue
                         next
                     end
                 end
-                client.close
             }
             thread_pool << thread_temp
         end
+
         thread_pool.map(&:join)
     end
 
+    def download_all_videos
+        client = client()
+        result = client.query("SELECT * FROM label WHERE video_download=0")
+        actor_hash = actor_hash()
+        genre_hash = genre_hash()
+        result.each do |item|
+            begin
+                video_info_insert(client, item['video_num'], item['video_label'],
+                    actor_hash, genre_hash)
+            rescue
+                next
+            end
+        end
+        client.close
+    end
+
     def actor_hash
         client = client()
         actor_hash = Hash.new

data/lib/javlibrary/version.rb

@@ -1,3 +1,3 @@
 class Javlibrary
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: javlibrary
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Yuanhao Sun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- javlibrary-0.2.10.gem
+- javlibrary-0.2.11.gem
+- javlibrary-0.2.8.gem
+- javlibrary-0.2.9.gem
 - javlibrary.gemspec
 - lib/javlibrary.rb
 - lib/javlibrary/version.rb