rubyhexagon 0.1.3 → 0.1.4

data/lib/examples/sync.rb

@@ -77,16 +77,21 @@ class Sync
       File.open(File.expand_path(E621::Config.paths["j#{mod}s"])) do |f|
         sets = f.read.parse
       end
-      @set_files = File.expand_path(E621::Config.paths["sets"])
+      @set_files = File.expand_path(E621::Config.paths["#{mod}s"])
       api = API.new(mod)
       sets.each do |oset|
         id = mod == "set" ? oset["id"] : oset
         if mod == "set" then
-          set = Set.new(api.get("show", {"id"=>id}))
+          set = Set.new(id)
         elsif mod == "pool" then
-          set = Pool.new(api.get("show", {"id"=>id}))
+          set = Pool.new(id)
+        end
+        begin
+          set.name = set.name.gsub("_"," ")
+        rescue
+          @log.error("Error on #{mod} #{id}")
+          raise
         end
-        set.name = set.name.gsub("_"," ")
         @log.info("Fetching #{mod} \"#{set.name}\"")
         set.name = "Love_Can_Be_Different" if set.name == "Love_can_be_different"
         set.name = set.name.gsub("_"," ").encode("us-ascii", :invalid => :replace, :undef => :replace, :replace => "")
@@ -97,6 +102,7 @@ class Sync
         end 
         File.open(@set_files+"/#{name}.json"){|f|@posts = f.read.parse}
         @posts.store("updated_at",0) if !@posts.has_key?("updated_at")
+        @posts.store("downloads",@posts["posts"]) if @posts["posts"]
         next if set.updated_at.to_i <= @posts["updated_at"].to_i
         dname = mod == "pool" ? set.name : name
         Dir.mkdir(dname) unless File.exist?(dname)
@@ -106,21 +112,22 @@ class Sync
           download(post,dname,set,i)
           i += 1
         end
-        advanced_set(oset) if mod == "set"
+        advanced_set(oset,name,set) if mod == "set"
+        @posts["updated_at"] = set.updated_at.to_i
+        jposts = @posts.to_json
+        File.open(@set_files+"/#{name}.json","w"){|f|f.print jposts}
       end
     end
-    @posts["updated_at"] = set.updated_at.to_i
-    jposts = @posts.to_json
-    File.open(@set_files+"/#{name}.json","w"){|f|f.print jposts}
   end
 
-  def set(set)
+  def advanced_set(set,name,s)
     sid, owner, query = set["id"], set["owner"], set["search"]
-    if owner == uid then
+    if owner == @uid then
       Search.new("fav:maxine_red #{query} order:id".split(" ")).each_post do |post|
         next if @posts["downloads"].include?(post.id)
-        download(post,name,set)
+        download(post,name,s)
       end
+      api = API.new("set")
       set = api.get("show", {"id"=>sid})
       posts = set["posts"].map{|post|Post.new(post).id}
       name = set["shortname"]

data/lib/pool.rb

@@ -23,7 +23,13 @@ module E621
   class Pool < Container
     def initialize(post)
       @api = API.new("pool")
-      set_variables(post)
+      if post.is_a?(Hash) then
+        set_variables(post)
+      elsif post.is_a?(Fixnum) then
+        set_variables(@api.get("show",{"id"=>post}))
+      else
+        raise ArgumentError, "Parameter must be Hash or Number."
+      end
     end
 
     def keys

data/lib/rubyhexagon.rb

@@ -30,5 +30,5 @@ require "pool"
 
 module E621
   Name = "rubyhexagon"
-  Version = "0.1.3"
+  Version = "0.1.4"
 end

data/lib/set.rb

@@ -20,7 +20,7 @@
 module E621
   class Set < Container
     def initialize(post)
-      @api,@page = API.new("set"),1
+      @api = API.new("set")
       if post.is_a?(Hash) then
         set_variables(post)
       elsif post.is_a?(Fixnum) then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyhexagon
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies: []
 description: Rubyhexagon provides Ruby bindings for the e621 [dot] net API.
 email: maxine_red1@yahoo.com