rubyhexagon 0.2.6 → 0.3.1

data/lib/examples/sync.rb

@@ -18,7 +18,6 @@
 =end
 
 require "logger"
-require "pg"
 
 include E621
 
@@ -45,35 +44,11 @@ class Sync
     @log.info("Program #$0 started.")
     @uid = api.get("index",{"name"=>api.user}).first["id"]
     @max_wait = 1
-    tags
   end
   
-  def tags
-    tags = File.expand_path("~/.hexagon/tags.json")
-    if !File.exist?(tags) then
-      @tags = Array.new
-    else
-      File.open(tags) do |f|
-        @tags = f.read.parse
-      end
-    end
-    @tags = @tags.sort{|k1,k2|k1["id"]<=>k2["id"]}
-    api = API.new("tag")
-    body,page = [2],1
-    until body == Array.new do
-      body = api.get("index",{"limit"=>0,"order"=>"count","after_id"=>@tags.last["id"],"page"=>page})
-      body = body.map{|x|x["name"] = x["name"].encode("us-ascii", :invalid => :replace, :undef => :replace, :replace => "");x}
-      @tags += body
-      page += 1
-    end
-    jtags = @tags.to_json
-    File.open(tags,"w"){|f|f.print jtags}
-    @tags = @tags.reject{|x|x["type"]!=1}.map{|x|x["name"]}
-  end
-
   def worker(mod)
     @mod = mod
-    Dir.chdir(File.expand_path("~/Dropbox/Furry/e621/#{mod}s")) do
+    Dir.chdir(File.expand_path("~/Pictures/e621/#{mod}s")) do
       sets = Array.new
       File.open(File.expand_path(E621::Config.paths["j#{mod}s"])) do |f|
         sets = f.read.parse
@@ -180,14 +155,7 @@ class Sync
     end
   end
   def download(post,name,set,id=0)
-    artist = post.tags.split(/\s+/).map do |t|
-      @tags[@tags.index(t)] if @tags.index(t)
-    end
-    begin
-      artist = artist.compact.first.sub("_(artist)","")
-    rescue
-      artist = "unknown"
-    end
+    artist = post.artist.first
     if @mod == "set" then
       string = [post.created_at.to_i,post.id.pad(8),artist+"_"+name,post.file_ext]
     elsif @mod == "pool" then

data/lib/rubyhexagon.rb

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

metadata

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