From c41d2a733be6616cd1f4a153a1c8d55e1bcbce58 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Wed, 26 Mar 2014 17:20:34 -0700
Subject: [PATCH] bug fixes for iqdb

---
 app/logical/iqdb/command.rb | 2 +-
 app/logical/iqdb/server.rb  | 8 ++++++--
 app/models/post.rb          | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/logical/iqdb/command.rb b/app/logical/iqdb/command.rb
index 5e2cfde75..1b7d97644 100644
--- a/app/logical/iqdb/command.rb
+++ b/app/logical/iqdb/command.rb
@@ -7,7 +7,7 @@ module Iqdb
     end
 
     def process(&block)
-      IO.popen("iqdb #{database}", "w", &block)
+      IO.popen("iqdb command #{database}", "w", &block)
     end
 
     def add(post)
diff --git a/app/logical/iqdb/server.rb b/app/logical/iqdb/server.rb
index cc8471c77..d4f9175c1 100644
--- a/app/logical/iqdb/server.rb
+++ b/app/logical/iqdb/server.rb
@@ -13,7 +13,7 @@ module Iqdb
     end
 
     def open
-      @socket = TCPSocket.new(hostname, port)
+      @socket = TCPSocket.open(hostname, port)
     end
 
     def close
@@ -31,13 +31,17 @@ module Iqdb
       request do
         hex = post.id.to_s(16)
         socket.puts "add 0 #{hex}:#{post.preview_file_path}"
+        socket.puts "done"
+        socket.read
       end
     end
 
     def remove(post_id)
       request do
-        hext = post_id.to_s(16)
+        hex = post_id.to_s(16)
         socket.puts "remove 0 #{hex}"
+        socket.puts "done"
+        socket.read
       end
     end
 
diff --git a/app/models/post.rb b/app/models/post.rb
index 0345bf874..15ba73de7 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1282,7 +1282,7 @@ class Post < ActiveRecord::Base
     end
 
     def update_iqdb_async
-      if Danbooru.config.iqdb_hostname_and_port
+      if Danbooru.config.iqdb_hostname_and_port && File.exists?(preview_file_path)
         Danbooru.config.all_server_hosts.each do |host|
           delay(:queue => host).update_iqdb
         end
@@ -1290,7 +1290,7 @@ class Post < ActiveRecord::Base
     end
 
     def remove_iqdb_async
-      if Danbooru.config.iqdb_hostname_and_port
+      if Danbooru.config.iqdb_hostname_and_port && File.exists?(preview_file_path)
         Danbooru.config.all_server_hosts.each do |host|
           Post.delay(:queue => host).remove_iqdb(id)
         end