rubyhexagon 0.4.0 → 0.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 34c8430199af7c9d7c8e2efb98cf8da90cbcdf09
+  data.tar.gz: 5675d205567c98595d52b5651eefe4fdd99f5dc6
+SHA512:
+  metadata.gz: 4907ea016fa1d66489323f71cf10ed2ff9bd07a251f7462c6d7c09d8820115477ae9f5378431b583724ce81d9866fe6626db07cbc2947c94a1e05a94168e7738
+  data.tar.gz: 6aa265a2deb00c532ec2fcc0d7ac60a79fea98cd5b237f5c628ea1846dc91ccab034cb045dc121e3db9bb5543bd878eb4c08d7aad0e0b69f3efed6237c37237a

data/lib/api.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 
@@ -20,104 +20,60 @@
 require "standard/http"
 
 module E621
-  attr_reader :user
   class API
-    # Variable mod is the module (Post, Pool, Set,...) this API is called for.
-    def initialize(mod=nil)
+    def initialize(user=nil,pass=nil)
       @http   = HTTP.new
-      @mod    = mod
-      @user   = user_login
+      login(user,pass) if !defined? @@login
+    end
+    # A wrapper function to fit into the general theme better.
+    def post_list(*args)
+      post_index(*args)
     end
     # Send commands to API and parse all answers, even errors.
     # Also make it work with POST and GET requests.
     def method_missing(method,*args)
-      if [:get,:post].include?(method) then
-        action,request,cookie = args
-        r,tries = request2body(request,cookie),0
-        begin
-          json = @http.__send__(method,"/#@mod/#{action}.json",r)
-        rescue Timeout::Error
-          sleep 2**tries
-          tries += 1
-          #E621.log.debug("#@mod/#{action} failed: #{e.class}")
-          raise if tries >= 4
-          # if we see more than 4 timeout errors, then there
-          # is something wrong
-          retry
-        end
-        #raise APIError,json["reason"] if json.include?("success") && !json["success"]
-        return json
-      else
-        raise NoMethodError, "undefined method #{method} for #{self.class}"
-      end
+      request = request2body(args.first)
+      method = method.to_s.split("_")
+      m = case method[0]
+          when "post" then
+            case method[1]
+            when "show" then :get
+            else :post
+            end
+          else :post
+          end
+      @http.__send__(m,"/#{method.join("/")}.json",request)
     end
     private
     # This helper function provides the functionality of translating Ruby Hashes
     # into HTTP POST body strings.
-    def request2body(r,c)
-      s = String.new
-      r.each do |k,v|
-        s += "&" unless s == String.new
+    def request2body(request)
+      query = @@login ? "#@@login&" : String.new
+      request = request.map do |k,v|
         if v.is_a?(Hash) then
-          t = String.new
-          v.each do |e,a|
-            t += "&" unless t == String.new
-            t += "#{k}[#{e}]=#{a}"
-          end
-          s += t
-        else
-          s += "#{k}=#{v}"
+          raise Argumenterror, "Hashes as request values aren't allowed."
+        elsif v.is_a?(Array) then
+          v = v.join(",")
         end
+        "#{k}=#{v}"
       end
-      s += "&#@@login" if !c
-      return s
+      query += request.join("&")
+      return query
     end
     # Perform an API and site login. This function needs to be called once
     # before any actual API call can be made.
-    def user_login
-      # Cookie login gets eliminated for now.
-      name,pass = String.new, String.new
-      # Perform a re-login if the last time is older than x days. Or if there is
-      # no cookie.
-      passwd = File.expand_path(Config.paths["passwd"])
-      if File.exist?(passwd) then
-        File.open(passwd){|f|@passwd=f.read.parse}
+    def login(user,pass)
+      if user == nil && pass == nil then
+        @@login = nil
       else
-        @passwd = {"name"=>"","pass"=>"","last_login"=>0}
-      end
-      if (Time.now.to_i-@passwd["last_login"].to_i) < 3.days then
-        @@login = @passwd["login"]
-      else 
-        if @passwd["name"] != "" && @passwd["pass"] != "" then
-          name,pass = @passwd["name"],@passwd["pass"]
-        else
-          puts "No user data found. Please provide user data."
-          name,pass = get_credentials
-          @passwd["name"],@passwd["pass"] = name,pass
-          # Store that data for later use.
-        end
-        request = "name=#{name}&password=#{pass}"
+        request = {name:name,password:pass}
         body = @http.get("/user/login.json",request)
         if body.has_key?("success") && (!body["success"] || body["success"] == "failed") then
           raise AuthentificationError, "Username or password wrong!"
         else
           @@login = "login=#{body["name"]}&password_hash=#{body["password_hash"]}"
-          @passwd["login"] = @@login # Save login string for later use.
         end
-        @passwd["last_login"] = Time.now.to_i
-        # Write everything back!
-        File.open(passwd,"w"){|f|f.print @passwd.to_json}
       end
-      return @passwd["name"]
-    end
-    # If there is no data saved for login, ask the user. They must know!
-    def get_credentials
-      print "Username: "
-      name = $stdin.gets.chomp
-      print "Password: "
-      pass = `stty_o=$(stty -g);stty -echo;read pass;stty $stty_o; echo $pass`.chomp
-      puts
-      return [name,pass]
     end
   end
 end

data/lib/container.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 
@@ -20,7 +20,7 @@
 module E621
   class Container
     def method_missing(method)
-      if instance_variables.include?("@#{method}".to_sym) then
+      if instance_variables.include?("@#{method}".to_sym) && method != :api then
         return instance_variable_get("@#{method}")
       else
         raise NoMethodError, "undefined method #{method} for #{self.class}"

data/lib/pool.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 

data/lib/post.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 
@@ -22,90 +22,29 @@ require "digest/md5"
 module E621
   class Post < Container
     def initialize(post)
-      set_variables(post)
-    end
-
-    def download_data
-      host,port = @file_url.sub(%r{^.+?//},"").sub(%r{/.+$},""),@file_url.match(/^https/) ? 443 : 80
-      http = HTTP.new(host,port)
-      body = String.new
-      while Digest::MD5.hexdigest(body) != @md5 do
-        body = http.get(@file_url.sub(/^.+?\.net/,""),"")["body"]
-      end
-      return body
-    end
-
-    def download(where)
-      if @file_url then
-        host,port = @file_url.sub(%r{^.+?//},"").sub(%r{/.+$},""),@file_url.match(/^https/) ? 443 : 80
+      @api = API.new
+      if post.is_a?(Fixnum) || (post.is_a?(String) && post.match(/^[0-9,a-f]+$/i)) then
+        post = if post.is_a?(String) && post.length == 32 then {md5:post}
+               elsif post.is_a?(Fixnum) || (post.is_a?(String) && post.match(/^\d+$/)) then
+                 {id:post.to_i}
+               else
+                 raise ArgumentError, "Neither an ID nor a MD5 Hash."
+               end
+        post = @api.post_show(post)
+      elsif post.is_a?(Hash) then # Variable post is ready to use. Do nothing.
       else
-        host,port = "static1.e621.net",443
-        @file_url = "/data/#{@md5[0,2]}/#{@md5[2,2]}/#@md5.#@file_ext"
+        raise ArgumentError, "Post only accepts an id, a MD5 hashsum or a Ruby hash."
       end
-      http = HTTP.new(host,port)
-      if !File.exist?(where) then
-        body = ""
-        while Digest::MD5.hexdigest(body) != @md5 do
-          body = http.get(@file_url.sub(/^.+?\.net/,""),"")["body"]
-        end
-        File.open(where,"w") do |f|
-          f.print body
-        end
-      else
-        md5 = String.new
-        File.open(where,"r") do |f|
-          md5 = Digest::MD5.hexdigest(f.read)
-        end
-        if md5 != @md5 then
-          body = ""
-          while Digest::MD5.hexdigest(body) != @md5 do
-            body = http.get(@file_url.sub(/^.+?\.net/,""),"")["body"]
-          end
-          File.open(where,"w") do |f|
-            f.print body
-          end
-        end
-      end
-    end
-
-    def add_to_set(id)
-      api = API.new("set")
-      api.post("add_post",{"post_id"=>@id,"set_id"=>id})
-    end
-
-    def remove_from_set(id)
-      api = API.new("set")
-      api.post("remove_post",{"post_id"=>@id,"set_id"=>id})
-    end
-
-    def favorite
-      api = API.new("favorite")
-      api.post("create",{"id"=>@id})
-    end
-
-    def unfavorite
-      api = API.new("favorite")
-      api.post("destroy",{"id"=>@id})
-    end
-
-    def vote(dir)
-      dir = if dir >= 0 then 1 elsif dir < 0 then -1 end
-      api = API.new("post")
-      api.post("vote",{"id"=>@id,"score"=>dir})
-    end
-
-    def keys
-      return instance_variables.map{|i|i.to_s.sub("@","")}
+      set_variables(post)
     end
-    
-    def to_json(b=nil)
-      json_hash = Hash.new
-      instance_variables.each do |i|
-        v = instance_variable_get(i)
-        v = v.is_a?(Time) ? v.to_i : v
-        json_hash.store(i.to_s.sub("@",""),v)
+    alias show initialize
+    # Cast a vote! Any value above 0 votes up, every value below 0 votes down.
+    # Zero itself causes an error.
+    def vote(direction)
+      if    direction > 0 then @api.post_vote(1)
+      elsif direction < 0 then @api.post_vote(-1)
+      else raise ArgumentError, "Zero isn't allowed for voting results."
       end
-      return json_hash.to_json
     end
   end
 end

data/lib/rubyhexagon.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 
@@ -23,12 +23,11 @@ require "standard/error"
 require "standard/time"
 
 require "api"
-require "config"
 require "container"
 require "search"
 require "pool"
 
 module E621
   Name = "rubyhexagon"
-  Version = "0.4.0"
+  Version = "0.4.1"
 end

data/lib/search.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 
@@ -18,56 +18,64 @@
 =end
 
 require "post"
+require "thread"
 
 module E621
-  attr_reader :posts
   class Search
     # commands update/download
-    def initialize(query)
-      @api,@mt      = API.new("post"),Mutex.new
-      @bad_tags     = /(\s|^)(#{Config.blacklist.map{|x|Regexp.escape(x)}.join("|")})(\s|$)/
-      @request = {"limit"=>100,"page"=>1,"tags"=>query.join("+")}
-      fetch
+    def initialize(query,page=1)
+      @api, @queue  = API.new, SizedQueue.new(4096)
+      @request      = {limit:100,page:page,tags:query.url_encode}
     end
 
-    def next!
-      @request["page"] += 1
-      fetch
+    def next_page
+      @request[:page] += 1
     end
 
+    def previous_page
+      @request[:page] -= 1
+    end
+    # Return each post via a block and process them individually.
+    # This could cause a race condition in the unlikely manner when the queue is
+    # empty and not being filled again, but the worker is still runnning.
     def each_post
-      while @posts != Array.new do
-        @posts.each do |post|
+      fetch_all
+      until !@worker.status do
+        until @queue.empty? do
+          post = @queue.pop
           yield post
         end
-        next!
       end
     end
 
-    def page
-      return @request["page"]
-    end
-
-    def page=(page)
-      @request["page"]=page
+    def posts
       fetch
     end
 
-    def previous!
-      @request["page"] -= 1
-      fetch
+    def page
+      return @request[:page]
     end
 
-    def to_json(a=nil,b=nil)
-      posts = @posts.map{|o|o.to_json}
-      {"name"=>@name,"queries"=>@queries,"posts"=>posts}.to_json
+    def page=(page)
+      @request[:page] = page
     end
+
     private
     def fetch
-      @posts = @api.post("index",@request).map do |post|
-        #Post.new(post) unless post["tags"].match(@bad_tags) || post["score"] <= 30
-        Post.new(post) unless post["tags"].match(@bad_tags)
+      @api.post_list(@request).map do |post|
+        Post.new(post)
       end.compact
     end
+    def fetch_all
+      @worker = Thread.new do
+        until (posts = @api.post_list(@request)) == Array.new do
+          posts.each do |post|
+            post = Post.new(post)
+            @queue << post if post
+          end
+          next_page
+        end
+      end
+    end
   end
 end

data/lib/set.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 

data/lib/standard/error.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 

data/lib/standard/hash.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 

data/lib/standard/http.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 
@@ -25,28 +25,25 @@ module E621
       @http = Net::HTTP.new(host,port)
       @http.use_ssl = true if port == 443
     end
-    # Small wrapper function for post calls. This way a proper logging is
-    # guaranteed.
-    def post(url,request)
-      return parse_body(@http.post(url,request))
-    end
-    # Small wrapper function for get calls. This way a proper logging is
-    # guaranteed.
-    def get(url,request)
-      return parse_body(@http.get("#{url}?#{request}"))
-    end
-    # #geti gives an immediate response in the form of bytes downloaded. This
-    # won't be included in the gems though.
-    def geti(url,request)
-      uri = "#{url}?#{request}"
-      count = (@http.head(uri)["content-length"].to_i/1024.0).round(1)
-      clength,message = count.to_s.length,String.new
-      @http.get("#{url}?#{request}") do |body|
-        message += body
-        mlength = (message.length/1024.0).round(1)
-        print "Downloaded #{" "*(clength-mlength.to_s.length)}#{mlength}/#{count}kB\r"
+    def method_missing(method, *args)
+      if [:get,:post].include?(method) then
+        tries,url,request = 0, *args
+        begin
+          response = case method
+                     when :get  then @http.get("#{url}?#{request}")
+                     when :post then @http.post(url,request)
+                     end
+        rescue
+          sleep 2**tries
+          tries += 1
+          raise if tries >= 8
+          retry
+        end
+        response = parse_body(response)
+      else
+        raise NoMethodError, "undefined method #{method} for #{self.class}"
       end
-      return {"body"=>message}
+      return response
     end
     private
     # As every body gets processed the same, just put it into a seperate method.
@@ -64,18 +61,30 @@ module E621
     # Parse all code that returns not in JSON to actual JSON like hashes.
     def errorcode(code,url)
       body = {"success"=>false,"reason"=>""}
-      body["reason"] =  if    code.match(/3\d{2}/)  then "We got redirected!"
-                        elsif code.match(/403/)     then "Access denied!"
-                        elsif code.match(/404/)     then "File not found!"
-                        elsif code.match(/420/)     then "Record could not be saved!"
-                        elsif code.match(/421/)     then "User it throttled, try again later!"
-                        elsif code.match(/422/)     then "The resource is locked!"
-                        elsif code.match(/423/)     then "Resource already exists!"
-                        elsif code.match(/4\d{2}/)  then "We made a bad request!"
-                        elsif code.match(/500/)     then "Internal server error!"
-                        elsif code.match(/503/)     then "Server has too much load!"
-                        elsif code.match(/5\d{2}/)  then "Some unkown server side error!"
-                        else "HTTP response code out of range!!"
+      body["reason"] =  if    code.match(/3\d{2}/)  then
+                          "We got redirected!"
+                        elsif code.match(/403/)     then
+                          "Access denied!"
+                        elsif code.match(/404/)     then
+                          "File not found!"
+                        elsif code.match(/420/)     then
+                          "Record could not be saved!"
+                        elsif code.match(/421/)     then
+                          "User is throttled, try again later!"
+                        elsif code.match(/422/)     then
+                          "The resource is locked!"
+                        elsif code.match(/423/)     then
+                          "Resource already exists!"
+                        elsif code.match(/4\d{2}/)  then
+                          "We made a bad request!"
+                        elsif code.match(/500/)     then
+                          "Internal server error!"
+                        elsif code.match(/503/)     then
+                          "Server has too much load!"
+                        elsif code.match(/5\d{2}/)  then
+                          "Some unkown server side error!"
+                        else
+                          "HTTP response code out of range!!"
                         end
       return body
     end

data/lib/standard/int.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 

data/lib/standard/string.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 
@@ -18,6 +18,7 @@
 =end
 
 require "json"
+require "cgi"
 
 class String
   # Make json parsing a lot easier and less to write.
@@ -27,6 +28,9 @@ class String
   def to_ascii
     self.gsub("_"," ").encode("us-ascii", :invalid => :replace, :undef => :replace, :replace => "")
   end
+  def url_encode
+    CGI.escape(self)
+  end
   # Remove all tags inside of a string.
   def clean
     self.gsub(/<.+?>/,"")

data/lib/standard/time.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
+  Copyright 2014, 2015 Maxine Red <maxine@furfind.net>
 
   This file is part of rubyhexagon.
 
@@ -19,7 +19,7 @@
 class Time
   # A general to_s function for Time objects.
   def to_s
-    self.strftime("%b %e,%Y %I:%M %p")
+    self.strftime("%b %e,%Y %I:%M:%S %p")
   end
   # This methods takes a block and returns how long it took to execute that block.
   def self.measure

metadata

@@ -1,64 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: rubyhexagon
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - Maxine Red
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
-dependencies: []
+date: 2016-01-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 description: Rubyhexagon provides Ruby bindings for the e621 [dot] net API.
-email: maxine_red1@yahoo.com
-executables:
-- e621
+email: maxine@furfind.net
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/set.rb
-- lib/examples/sync.rb
-- lib/examples/add.rb
-- lib/examples/db.rb
+- lib/api.rb
+- lib/container.rb
 - lib/pool.rb
 - lib/post.rb
-- lib/standard/time.rb
-- lib/standard/http.rb
+- lib/rubyhexagon.rb
+- lib/search.rb
+- lib/set.rb
 - lib/standard/error.rb
-- lib/standard/int.rb
 - lib/standard/hash.rb
+- lib/standard/http.rb
+- lib/standard/int.rb
 - lib/standard/string.rb
-- lib/config.rb
-- lib/container.rb
-- lib/rubyhexagon.rb
-- lib/api.rb
-- lib/search.rb
-- bin/e621
+- lib/standard/time.rb
 homepage: https://github.com/maxine-red/rubyhexagon
 licenses:
 - GPL-3.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rubyhexagon, Ruby bindings for e621[dot]net.
 test_files: []

data/bin/e621

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-=begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
-
-  This file is part of rubyhexahon.
-
-  rubyhexahon is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  rubyhexahon is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with rubyhexahon.  If not, see <http://www.gnu.org/licenses/>.
-=end
-
-$:.unshift File.dirname(__FILE__)+"/../lib"
-
-require "rubyhexagon"
-
-$0 = "E621 #{ARGV[0]} #{ARGV[1]}"
-
-require "examples/#{ARGV.shift}"

data/lib/config.rb

@@ -1,46 +0,0 @@
-=begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
-
-  This file is part of rubyhexagon.
-
-  rubyhexagon is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  rubyhexagon is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with rubyhexagon.  If not, see <http://www.gnu.org/licenses/>.
-=end
-module E621
-  class Config
-    def self.config
-      return @@config
-    end
-
-    def self.paths
-      return @@paths
-    end
-
-    def self.blacklist
-      return @@blacklist
-    end
-
-    def self.config=(config)
-      if File.exist?(config) then
-        File.open(config) do |f|
-          c = f.read.parse
-          @@paths     = c.delete("paths")
-          @@blacklist = c.delete("blacklist")
-          @@config    = c
-        end
-      else
-        raise ArgumentError, "No configuration file specified. Broken installation!"
-      end
-    end
-  end
-end

data/lib/examples/add.rb

@@ -1,57 +0,0 @@
-=begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
-
-  This file is part of rubyhexagon.
-
-  rubyhexagon is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  rubyhexagon is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with rubyhexagon.  If not, see <http://www.gnu.org/licenses/>.
-=end
-
-require "json"
-
-include E621
-
-mod = ARGV.shift
-
-$0 = "E621 #{mod}"
-
-E621::Config.config = File.expand_path("~/.hexagon/conf.json")
-Dir.chdir(File.expand_path(E621::Config.paths["home"])) do
-  pools, api = Array.new, API.new(mod)
-  File.open(File.expand_path(E621::Config.paths["j#{mod}s"])) do |f|
-    pools = JSON.parser.new(f.read).parse
-  end
-  puts "Old count: #{pools.length}"
-  candidates = ARGV.map{|x|x.to_i}.reject{|x|x==0}
-  puts "Adding candidates: #{candidates.length}"
-  new = ARGV.map{|x|x.to_i}.reject{|x|x==0||pools.include?(x)}
-  new.each do |id|
-    pool = api.post("show",{"id"=>id})
-    if pool["id"] && mod == "pool" then
-      pools << id
-    elsif pool["id"] && mod == "set" then
-      pools << {"id"=>pool["id"],"owner"=>pool["user_id"]}
-    end
-  end
-  puts "Adding: #{new.length}"
-  if mod == "pool" then
-    pools = pools.sort.uniq
-  elsif mod == "set" then
-    pools = pools.sort{|k1,k2|k1["id"]<=>k2["id"]}.uniq
-  end
-  puts "New count: #{pools.length}"
-  pools = pools.to_json
-  File.open(File.expand_path(E621::Config.paths["j#{mod}s"]),"w") do |f|
-    f.print pools
-  end
-end

data/lib/examples/db.rb

@@ -1,143 +0,0 @@
-=begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
-
-  This file is part of rubyhexagon.
-
-  rubyhexagon is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  rubyhexagon is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with rubyhexagon.  If not, see <http://www.gnu.org/licenses/>.
-=end
-
-require "logger"
-require "thread"
-require "pg"
-
-include E621
-
-$form = "%b %e, %Y %I:%M:%S %p"
-
-require "search"
-require "pool"
-require "set"
-
-Thread.abort_on_exception = true
-
-class DB
-  def initialize(database)
-    @pg = PG.connect(dbname:database)
-    @mt = Mutex.new
-  end
-  def exec(query)
-    @mt.synchronize do
-      result = @pg.exec(query)
-      return result
-    end
-  end
-  def escape_string(str)
-    @pg.escape_string(str)
-  end
-end
-
-class Sync
-  def initialize
-    E621::Config.config = File.expand_path("~/.hexagon/conf.json")
-    if $stdout.tty? then
-      @log = Logger.new($stdout)
-      @log.level = Logger::DEBUG
-    else
-      @log = Logger.new(File.expand_path(E621::Config.paths["logging"]))
-      @log.level = Logger::INFO
-    end
-    @log.formatter = proc do |sev,dat,prog,msg|
-      "#{Time.now.strftime($form)} [#{sev.pad(5)}] #{msg}#$/"
-    end
-    api = API.new("user") # Used for login
-    @log.info("Program #$0 started.")
-    @uid = api.get("index",{"name"=>api.user}).first["id"]
-    @max_wait = 1
-    Dir.chdir(File.expand_path(E621::Config.paths["files"]))
-    @db = DB.new("danbooru")
-    @queue = Queue.new
-    @mt = Mutex.new
-  end
-
-  def threads
-    return E621::Config.threads
-  end
-  
-  def worker(mod)
-    if mod == "post" then
-      fetch_posts
-    end
-  end
-
-  def fetch_posts
-    lid = @db.exec("SELECT id FROM e621.posts ORDER BY id DESC LIMIT 1;").first
-    if lid then
-      lid = lid["id"].to_i
-    else
-      lid = 0
-    end
-    posts = Search.new(["order:id", "id:#{lid}.."])
-    @cols = ["id","tags","artist","created_at","score","md5","file_ext","description","rating","width","height","has_children","parent_id","file_size"]
-    posts.each_post do |post|
-      @queue << [post,"#{post.md5[0,2]}/#{post.md5[2,2]}/#{post.md5}.#{post.file_ext}"]
-    end
-  end
-  def download
-    Thread.current.exit if @queue.empty?
-    post,path = @queue.pop
-    m = String.new
-    path.split("/")[0,2].each do |d|
-      m += "#{d}/"
-      Dir.mkdir(m) unless File.exists?(m)
-    end
-    tries = 0
-    begin
-      post.download(path)
-    rescue
-      raise if tries > 8
-      tries += 1
-      sleep 2
-      retry
-    end
-    data = @cols.map do |x|
-      y=post.__send__(x.to_sym)
-      y = y.to_i if x == "created_at"
-      y = y.join(" ") if x == "artist"
-      y != nil ? @db.escape_string(y.to_s) : "NULL"
-    end
-    if !@db.exec("SELECT id FROM e621.posts WHERE id = #{post.id};").first then
-      query = "INSERT INTO e621.posts (#{@cols.join(",")}) VALUES ('#{data.join("','")}');".gsub("'NULL'","NULL")
-      @db.exec(query)
-      @mt.synchronize do
-        @log.info("Added post ##{post.id.pad(6," ")} to library.")
-      end
-    end
-  end
-end
-sync = Sync.new
-posts = Thread.new do
-  sync.worker("post")
-end
-sleep 4
-downloads = Array.new
-10.times do
-  downloads << Thread.new do
-    loop do
-      sync.download
-    end
-  end
-end
-
-posts.join
-downloads.each{|d|d.join}

data/lib/examples/sync.rb

@@ -1,187 +0,0 @@
-=begin
-  Copyright 2014 Maxine Red <maxine_red1@yahoo.com>
-
-  This file is part of rubyhexagon.
-
-  rubyhexagon is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  rubyhexagon is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with rubyhexagon.  If not, see <http://www.gnu.org/licenses/>.
-=end
-
-require "logger"
-
-include E621
-
-mod = ARGV.shift
-
-$form = "%b %e, %Y %I:%M:%S %p"
-
-require mod
-
-class Sync
-  def initialize
-    E621::Config.config = File.expand_path("~/.hexagon/conf.json")
-    if $stdout.tty? then
-      @log = Logger.new($stdout)
-      @log.level = Logger::DEBUG
-    else
-      @log = Logger.new(File.expand_path(E621::Config.paths["logging"]))
-      @log.level = Logger::INFO
-    end
-    @log.formatter = proc do |sev,dat,prog,msg|
-      "#{Time.now.strftime($form)} [#{sev.pad(5)}] #{msg}#$/"
-    end
-    api = API.new("user") # Used for login
-    @log.info("Program #$0 started.")
-    @uid = api.get("index",{"name"=>api.user}).first["id"]
-    @max_wait = 1
-  end
-  
-  def worker(mod)
-    @mod = mod
-    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
-      end
-      @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(id)
-        elsif mod == "pool" then
-          set = Pool.new(id)
-        end
-        begin
-          set.name = set.name.gsub("_"," ")
-        rescue
-          @log.error("Error on #{mod} #{id}")
-          net = Net::HTTP.new("e621.net",443)
-          net.use_ssl = true
-          body = net.get("/#{mod}/show/#{id}").body
-          File.open("/tmp/e621.html","w"){|f|f.print body}
-          if body.match("ActiveRecord::RecordNotFound")
-            pools_f, pools = File.expand_path("~/.hexagon/#{mod}s.json"), Array.new
-            File.open(pools_f) do |f|
-              pools = f.read.parse
-            end
-            pools.delete(id)
-            File.open(pools_f,"w") do |f|
-              f.print pools.to_json
-            end
-            @log.info("Removed: #{mod} ##{id} doesn't exist anymore.")
-            puts "Removed: #{mod} ##{id} doesn't exist anymore."
-          end
-          next
-        end
-        @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 => "")
-        set.name = set.name.gsub(/[^0-9, ,_,a-z,\-]/i,"").sub(/\s+$/,"")
-        name = mod == "set" ? set.shortname : id.pad(5)
-        if !File.exists?(@set_files+"/#{name}.json") then
-          File.open(@set_files+"/#{name}.json","w"){|f|f.print "{\"downloads\":[],\"updated_at\":0}"}
-        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)
-        i = 0
-        set.each_post do |post|
-          i += 1
-          next if @posts["downloads"].include?(post.id)
-          download(post,dname,set,i)
-        end
-        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
-  end
-
-  def advanced_set(set,name,s)
-    sid, owner, query = set["id"], set["owner"], set["search"]
-    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,s)
-      end
-      api = API.new("set")
-      set = api.get("show", {"id"=>sid})
-      posts = set["posts"].map{|post|Post.new(post).id}
-      name = set["shortname"]
-      local = Dir["#{name}/*"].reject{|x|x.match(/db$/)}.map{|x|x.split(".")[1].to_i}.sort.uniq
-      (posts-local).each do |id|
-        post = Post.new({"id"=>id})
-        f = post.remove_from_set(sid)
-        if f["success"] then
-          s = "Removed Post #{" "*(6-post.id.to_s.length)}#{post.id} from \"#{set["name"]}\""
-          puts "#{Time.now.strftime($form)}: \e[1;33m#{s}\e[0m"
-          @log.info(s)
-        else
-          s = "#{f["reason"].to_s.gsub(/<.+?>/,"")}."
-          puts "#{Time.now.strftime($form)}: \e[1;31m#{s}\e[0m"
-          @log.info(s)
-        end
-      end
-      (local-posts).each do |id|
-        next if id == 0
-        post = Post.new({"id"=>id})
-        f = post.add_to_set(sid)
-        if f["success"] then
-          s = "Added Post #{" "*(6-post.id.to_s.length)}#{post.id} to \"#{set["name"]}\"."
-          puts "#{Time.now.strftime($form)}: #{s}"
-          @log.info(s)
-        else
-          s = "#{f["reason"].gsub(/<.+?>/,"")}. Removing local file."
-          puts "#{Time.now.strftime($form)}: #{s}"
-          @log.info(s)
-          File.unlink(Dir["#{set["shortname"]}/*.#{"0"*(8-post.id.to_s.length)}#{post.id}.*"].first)
-        end
-      end
-    end
-  end
-  def download(post,name,set,id=0)
-    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
-      string = [set.id.pad(5),id.pad(4),post.id.pad(8),artist,name.downcase.gsub(/\s/,"_"),post.file_ext]
-    end
-    string = string.join(".")
-    tries = 0
-    begin
-      post.download("#{name}/#{string}")
-    rescue
-      raise if tries > 4
-      tries += 1
-      puts "#{Time.now.strftime($form)}: #$!"
-      @log.info("#$!")
-      sleep 1
-      retry
-    end
-    File.utime(post.created_at,post.created_at,"#{name}/#{string}")
-    @posts["downloads"] << post.id
-    jposts = @posts.to_json
-    File.open(@set_files+"/#{name}.json","w"){|f|f.print jposts}
-    s = "Downloaded post #{" "*(6-post.id.to_s.length)}#{post.id} from \"#{set.name}\"."
-    puts "#{Time.now.strftime($form)}: #{s}"
-    sleep(rand*@max_wait)
-    @log.info(s)
-  end
-end
-sync = Sync.new
-sync.worker(mod)