* Refactor iqdb response collection
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -53,6 +53,6 @@ end
|
||||
|
||||
group :development do
|
||||
gem 'ruby-prof'
|
||||
gem 'sql-logging'
|
||||
# gem 'sql-logging'
|
||||
end
|
||||
|
||||
|
||||
@@ -190,8 +190,6 @@ GEM
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sql-logging (3.0.8)
|
||||
rails (> 3.0.0)
|
||||
statistics2 (0.54)
|
||||
term-ansicolor (1.3.0)
|
||||
tins (~> 1.0)
|
||||
@@ -264,7 +262,6 @@ DEPENDENCIES
|
||||
simple_form
|
||||
simplecov
|
||||
sprockets-rails
|
||||
sql-logging
|
||||
statistics2
|
||||
term-ansicolor
|
||||
therubyracer
|
||||
|
||||
@@ -24,7 +24,7 @@ protected
|
||||
|
||||
def create_by_post
|
||||
@post = Post.find(params[:post_id])
|
||||
@results = Iqdb::Server.default.similar(@post.id, 3)
|
||||
@results = Iqdb::Server.default.query(3, @post.preview_file_path)
|
||||
render :layout => false, :action => "create_by_post"
|
||||
end
|
||||
end
|
||||
@@ -14,7 +14,7 @@ module Iqdb
|
||||
|
||||
def find_similar
|
||||
if Danbooru.config.iqdb_hostname_and_port
|
||||
@matches = Iqdb::Server.new(*Danbooru.config.iqdb_hostname_and_port).query(3, @download.file_path).matches
|
||||
@matches = Iqdb::Server.default.query(3, @download.file_path).matches
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2,7 +2,8 @@ module Iqdb
|
||||
module Responses
|
||||
class Collection
|
||||
attr_reader :responses
|
||||
delegate :each, :empty?, :any?, :to => :matches
|
||||
include Enumerable
|
||||
delegate :<=>, :each, :to => :matches
|
||||
|
||||
def initialize(response_string)
|
||||
@responses = response_string.split(/\n/).map do |string|
|
||||
|
||||
@@ -49,15 +49,6 @@ module Iqdb
|
||||
end
|
||||
end
|
||||
|
||||
def similar(post_id, results, flags = FLAG_DISCARD_COMMON_COEFFS)
|
||||
request do
|
||||
hex_id = post_id.to_s(16)
|
||||
socket.puts "sim 0 #{flags} #{results} #{hex_id}"
|
||||
socket.puts "done"
|
||||
responses = Responses::Collection.new(socket.read)
|
||||
end
|
||||
end
|
||||
|
||||
def query(results, filename, flags = FLAG_DISCARD_COMMON_COEFFS)
|
||||
request do
|
||||
socket.puts "query 0 #{flags} #{results} #{filename}"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<% if @download.matches.any? %>
|
||||
<% if @download.any? %>
|
||||
<h3>Similar</h3>
|
||||
<% @download.matches.each do |match| %>
|
||||
<% @download.each do |match| %>
|
||||
<%= PostPresenter.preview(Post.find(match.post_id)) %>
|
||||
<% end %>
|
||||
<% else %>
|
||||
|
||||
Reference in New Issue
Block a user