jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/r888888888/danbooru

Browse Source
This commit is contained in:
Toks
2015-05-23 12:14:03 -04:00
parent 0ac21b1623 d9fa9c043e
commit 101a9d20e3
18 changed files with 125 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
README → README.md
View File

@@ -1,23 +1,23 @@
=== Installation
### Installation
It is recommended that you install Danbooru on a Debian-based system
since most of the required packages are available on APT. Danbooru
since most of the required packages are available on APT. Danbooru
has been successfully installed on Fedora, CentOS, FreeBSD, and OS X.
The INSTALL.debian install script is straightforward and should be
simple to adapt for other platforms. If you want something similar to
Danbooru that is easier to install, try Shimmie
(http://code.shishnet.org/shimmie2/). Shimmie uses PHP and MySQL and
should be straightforward to install on most hosts.
simple to adapt for other platforms.
For best performance, you will need at least 256MB of RAM for
PostgreSQL and Rails. The memory requirement will grow as your
database gets bigger.
database gets bigger.
On production Danbooru uses PostgreSQL 9.4, but any 9.x release should
work.
Use your operating system's package management system whenever
possible. This will simplify the process of installing init scripts,
which will not always happen when compiling from source.
=== Troubleshooting
### Troubleshooting
These instructions won't work for everyone. If your setup is not
working, here are the steps I usually recommend to people:
@@ -37,7 +37,7 @@ debug your Nginx configuration file.
4) Check all log files.
=== IQDB Integration
### IQDB Integration
In order to enable IQDB integration, you must compile and run the IQDB server somewhere (preferably on the local server). There are two Danbooru configuration settings that you must then set: iqdb_hostname_and_port and iqdb_file.

12
app/assets/javascripts/uploads.js
View File

@@ -46,7 +46,11 @@
Danbooru.Upload.initialize_info_bookmarklet = function() {
$("#source-info ul").hide();
$("#fetch-data-bookmarklet").click(function(e) {
$.get(e.target.href).success(Danbooru.Upload.fill_source_info);
var xhr = $.get(e.target.href);
xhr.success(Danbooru.Upload.fill_source_info);
xhr.fail(function(data) {
$("#source-info span#loading-data").html("Error: " + data.responseJSON["message"])
});
e.preventDefault();
});
$("#fetch-data-bookmarklet").trigger("click");
@@ -63,7 +67,11 @@
Danbooru.error("Error: Source is not a URL");
} else {
$("#source-info span#loading-data").show();
$.get("/source.json?url=" + encodeURIComponent(source)).success(Danbooru.Upload.fill_source_info);
var xhr = $.get("/source.json?url=" + encodeURIComponent(source));
xhr.success(Danbooru.Upload.fill_source_info);
xhr.fail(function(data) {
$("#source-info span#loading-data").html("Error: " + data.responseJSON["message"])
});
}
e.preventDefault();
});

10
app/controllers/sources_controller.rb
View File

@@ -12,4 +12,14 @@ class SourcesController < ApplicationController
end
end
end
private
def rescue_exception(exception)
respond_with do |format|
format.json do
render :json => {:message => exception.to_s}, :status => :error
end
end
end
end

16
app/models/post.rb
View File

@@ -20,6 +20,7 @@ class Post < ActiveRecord::Base
before_save :update_tag_post_counts
before_save :set_tag_counts
before_save :set_pool_category_pseudo_tags
before_create :autoban
before_validation :strip_source
before_validation :initialize_uploader, :on => :create
before_validation :parse_pixiv_id
@@ -290,6 +291,12 @@ class Post < ActiveRecord::Base
def disapproved_by?(user)
PostDisapproval.where(:user_id => user.id, :post_id => id).exists?
end
def autoban
if has_tag?("banned_artist")
self.is_banned = true
end
end
end
module PresenterMethods
@@ -1490,7 +1497,13 @@ class Post < ActiveRecord::Base
def update_iqdb_async
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
if has_tag?("ugoira")
run_at = 10.seconds.from_now
else
run_at = Time.from_now
end
delay(:queue => host, :run_at => run_at).update_iqdb
end
end
end
@@ -1558,6 +1571,7 @@ class Post < ActiveRecord::Base
def reload(options = nil)
super
reset_tag_array_cache
@pools = nil
@tag_categories = nil
@typed_tags = nil
self

5
app/models/tag.rb
View File

@@ -192,6 +192,11 @@ class Tag < ActiveRecord::Base
if category
category_id = categories.value_for(category)
# in case a category change hasn't propagated to this server yet,
# force an update the local cache. This may get overwritten in the
# next few lines if the category is changed.
tag.update_category_cache
if category_id != tag.category && !tag.is_locked? && (CurrentUser.is_builder? || tag.post_count <= 50)
tag.update_column(:category, category_id)
tag.update_category_cache_for_all

24
app/models/tag_alias.rb
View File

@@ -198,11 +198,15 @@ class TagAlias < ActiveRecord::Base
def rename_wiki_and_artist
antecedent_wiki = WikiPage.titled(antecedent_name).first
if antecedent_wiki.present? && WikiPage.titled(consequent_name).blank?
CurrentUser.scoped(creator, creator_ip_addr) do
antecedent_wiki.update_attributes(
:title => consequent_name
)
if antecedent_wiki.present?
if WikiPage.titled(consequent_name).blank?
CurrentUser.scoped(creator, creator_ip_addr) do
antecedent_wiki.update_attributes(
:title => consequent_name
)
end
else
update_forum_topic_for_wiki_conflict
end
end
@@ -249,6 +253,16 @@ class TagAlias < ActiveRecord::Base
end
end
def update_forum_topic_for_wiki_conflict
if forum_topic
CurrentUser.scoped(User.admins.first, "127.0.0.1") do
forum_topic.posts.create(
:body => "The tag alias [[#{antecedent_name}]] -> [[#{consequent_name}]] has conflicting wiki pages. [[#{consequent_name}]] should be updated to include information from [[#{antecedent_name}]] if necessary."
)
end
end
end
def reject!
update_column(:status, "deleted")
clear_all_cache

2
app/views/posts/show.html.erb
View File

@@ -149,7 +149,7 @@
<meta name="always-resize-images" content="<%= CurrentUser.user.always_resize_images? %>">
<meta property="og:title" content="<%= @post.presenter.humanized_essential_tag_string %> - <%= Danbooru.config.app_name %>">
<meta property="og:description" content="<%= @post.presenter.humanized_tag_string %>">
<meta property="og:image" content="<%= @post.preview_file_url %>">
<meta property="og:image" content="http://<%= Danbooru.config.hostname %><%= @post.large_file_url %>">
<!-- Twitter properties -->
<% if @post.twitter_card_supported? %>

2
test/factories/tag.rb
View File

@@ -1,6 +1,6 @@
FactoryGirl.define do
factory(:tag) do
name {Faker::Name.first_name.downcase}
name {"#{Faker::Name.first_name.downcase}#{rand(1000)}"}
post_count 0
category {Tag.categories.general}
related_tags ""

2
test/fixtures/vcr_cassettes/ugoira-converter.yml vendored
View File

@@ -749,7 +749,7 @@ http_interactions:
recorded_at: Wed, 22 Oct 2014 23:29:57 GMT
- request:
method: get
uri: http://i1.pixiv.net/img-zip-ugoira/img/2014/10/05/23/42/23/46378654_ugoira1920x1080.zip
uri: http://i3.pixiv.net/img-zip-ugoira/img/2014/10/05/23/42/23/46378654_ugoira1920x1080.zip
body:
encoding: US-ASCII
string: ''

12
test/functional/bulk_update_requests_controller_test.rb
View File

@@ -44,9 +44,9 @@ class BulkUpdateRequestsControllerTest < ActionController::TestCase
context "for the creator" do
should "succeed" do
assert_difference("BulkUpdateRequest.count", -1) do
delete :destroy, {:id => @bulk_update_request.id}, {:user_id => @user.id}
end
delete :destroy, {:id => @bulk_update_request.id}, {:user_id => @user.id}
@bulk_update_request.reload
assert_equal("rejected", @bulk_update_request.status)
end
end
@@ -64,9 +64,9 @@ class BulkUpdateRequestsControllerTest < ActionController::TestCase
context "for an admin" do
should "succeed" do
assert_difference("BulkUpdateRequest.count", -1) do
delete :destroy, {:id => @bulk_update_request.id}, {:user_id => @admin.id}
end
delete :destroy, {:id => @bulk_update_request.id}, {:user_id => @admin.id}
@bulk_update_request.reload
assert_equal("rejected", @bulk_update_request.status)
end
end
end

8
test/functional/tag_aliases_controller_test.rb
View File

@@ -72,14 +72,6 @@ class TagAliasesControllerTest < ActionController::TestCase
end
end
context "create action" do
should "create a tag alias" do
assert_difference("TagAlias.count", 1) do
post :create, {:tag_alias => {:antecedent_name => "xxx", :consequent_name => "yyy"}}, {:user_id => @user.id}
end
end
end
context "destroy action" do
setup do
@tag_alias = FactoryGirl.create(:tag_alias)

8
test/functional/tag_implications_controller_test.rb
View File

@@ -75,14 +75,6 @@ class TagImplicationsControllerTest < ActionController::TestCase
end
end
context "create action" do
should "create a tag implication" do
assert_difference("TagImplication.count", 1) do
post :create, {:tag_implication => {:antecedent_name => "xxx", :consequent_name => "yyy"}}, {:user_id => @user.id}
end
end
end
context "destroy action" do
setup do
CurrentUser.scoped(@user, "127.0.0.1") do

4
test/unit/downloads/deviant_art_test.rb
View File

@@ -7,13 +7,13 @@ module Downloads
@source = "http://mochikko.deviantart.com/art/RESOLUTION-339610451"
@tempfile = Tempfile.new("danbooru-test")
@download = Downloads::File.new(@source, @tempfile.path)
VCR.use_cassette("download-deviant-art-html", :record => :new_episodes) do
VCR.use_cassette("download-deviant-art-html", :record => :none) do
@download.download!
end
end
should "set the direct image link as the source" do
assert_equal("http://www.deviantart.com/download/339610451/resolution_by_mochikko-d5m713n.jpg?token=f828643e6e86a658e80f362745a0b20e20880fc6&ts=1414021578", @download.source)
assert_equal("http://fc03.deviantart.net/fs71/f/2012/330/e/7/resolution_by_mochikko-d5m713n.jpg", @download.source)
end
should "work" do

4
test/unit/downloads/pixiv_test.rb
View File

@@ -231,8 +231,8 @@ module Downloads
should "download the full size image instead of the thumbnail" do
assert_rewritten(@p0_full_size_image_3, @p0_large_thumbnail, "rewrite-pixiv-new-manga-p0-large-thumbnail")
assert_rewritten(@p1_full_size_image_3, @p1_large_thumbnail, "rewrite-pixiv-new-manga-p1-large-thumbnail")
assert_downloaded(@p0_file_size, @p0_large_thumbnail, "download-pixiv-new-manga-p0-large-thumbnail", :all)
assert_downloaded(@p1_file_size, @p1_large_thumbnail, "download-pixiv-new-manga-p1-large-thumbnail", :all)
assert_downloaded(@p0_file_size, @p0_large_thumbnail, "download-pixiv-new-manga-p0-large-thumbnail")
assert_downloaded(@p1_file_size, @p1_large_thumbnail, "download-pixiv-new-manga-p1-large-thumbnail")
end
end

2
test/unit/pool_test.rb
View File

@@ -87,7 +87,7 @@ class PoolTest < ActiveSupport::TestCase
should "update any new posts that were added" do
@p1.reload
assert_equal("pool:#{@pool.id}", @p1.pool_string)
assert_equal("pool:#{@pool.id} pool:series", @p1.pool_string)
end
end

39
test/unit/post_test.rb
View File

@@ -33,18 +33,23 @@ class PostTest < ActiveSupport::TestCase
end
end
should "remove the post from all pools" do
pool = FactoryGirl.create(:pool)
pool.add!(@post)
@post.expunge!
pool.reload
assert_equal("", pool.post_ids)
end
context "that belongs to a pool" do
setup do
@pool = FactoryGirl.create(:pool)
@pool.add!(@post)
@post.reload
@post.expunge!
end
should "destroy the record" do
@post.expunge!
assert_equal([], @post.errors.full_messages)
assert_equal(0, Post.where("id = ?", @post.id).count)
should "remove the post from all pools" do
@pool.reload
assert_equal("", @pool.post_ids)
end
should "destroy the record" do
assert_equal([], @post.errors.full_messages)
assert_equal(0, Post.where("id = ?", @post.id).count)
end
end
end
@@ -425,6 +430,18 @@ class PostTest < ActiveSupport::TestCase
@post = FactoryGirl.create(:post)
end
context "with a banned artist" do
setup do
@artist = FactoryGirl.create(:artist)
@artist.ban!
@post = FactoryGirl.create(:post, :tag_string => @artist.name)
end
should "ban the post" do
assert_equal(true, @post.is_banned?)
end
end
context "with an artist tag that is then changed to copyright" do
setup do
CurrentUser.user = FactoryGirl.create(:builder_user)

13
test/unit/tag_alias_test.rb
View File

@@ -99,6 +99,19 @@ class TagAliasTest < ActiveSupport::TestCase
@alias = FactoryGirl.create(:tag_alias, :antecedent_name => "aaa", :consequent_name => "bbb", :forum_topic => @topic)
end
context "and conflicting wiki pages" do
setup do
@wiki1 = FactoryGirl.create(:wiki_page, :title => "aaa")
@wiki2 = FactoryGirl.create(:wiki_page, :title => "bbb")
end
should "update the topic when processed" do
assert_difference("ForumPost.count") do
@alias.rename_wiki_and_artist
end
end
end
should "update the topic when processed" do
assert_difference("ForumPost.count") do
@alias.process!

3
test/unit/upload_test.rb
View File

@@ -255,13 +255,14 @@ class UploadTest < ActiveSupport::TestCase
VCR.use_cassette("ugoira-converter", :record => :none) do
assert_difference(["Post.count", "PixivUgoiraFrameData.count"]) do
@upload.process!
assert_equal([], @upload.errors.full_messages)
end
post = Post.last
assert_not_nil(post.pixiv_ugoira_frame_data)
assert_equal("0d94800c4b520bf3d8adda08f95d31e2", post.md5)
assert_equal(60, post.image_width)
assert_equal(60, post.image_height)
assert_equal("http://i1.pixiv.net/img-zip-ugoira/img/2014/10/05/23/42/23/46378654_ugoira1920x1080.zip", post.source)
assert_equal("http://i3.pixiv.net/img-zip-ugoira/img/2014/10/05/23/42/23/46378654_ugoira1920x1080.zip", post.source)
assert_operator(File.size(post.large_file_path), :>, 0)
assert_operator(File.size(post.preview_file_path), :>, 0)
end