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

removed small image support

Browse Source
This commit is contained in:
albert
2012-03-13 18:28:32 -04:00
parent 938541c98f
commit 7269ec0076
27 changed files with 17 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/amazon_backup.rb
View File

@@ -28,10 +28,6 @@ class AmazonBackup < ActiveRecord::Base
AWS::S3::S3Object.store("preview/#{post.md5}.jpg", open(post.preview_file_path, "rb"), Danbooru.config.amazon_s3_bucket_name)
end
if File.exists?(post.medium_file_path)
AWS::S3::S3Object.store("medium/#{post.md5}.jpg", open(post.medium_file_path, "rb"), Danbooru.config.amazon_s3_bucket_name)
end
if File.exists?(post.large_file_path)
AWS::S3::S3Object.store("large/#{post.md5}.jpg", open(post.large_file_path, "rb"), Danbooru.config.amazon_s3_bucket_name)
end

2
app/models/forum_topic.rb
View File

@@ -1,6 +1,6 @@
class ForumTopic < ActiveRecord::Base
attr_accessible :title, :original_post_attributes, :as => [:member, :privileged, :contributor, :janitor, :moderator, :admin, :default]
attr_accessible :is_sticky, :is_locked, :is_deleted, :as => [:admin, :moderator]
attr_accessible :is_sticky, :is_locked, :is_deleted, :as => [:janitor, :admin, :moderator]
belongs_to :creator, :class_name => "User"
belongs_to :updater, :class_name => "User"
has_many :posts, :class_name => "ForumPost", :order => "forum_posts.id asc", :foreign_key => "topic_id", :dependent => :destroy

3
app/models/pool.rb
View File

@@ -12,7 +12,8 @@ class Pool < ActiveRecord::Base
before_validation :initialize_creator, :on => :create
after_save :create_version
before_destroy :create_mod_action_for_destroy
attr_accessible :name, :description, :post_ids, :post_id_array, :is_active, :post_count
attr_accessible :name, :description, :post_ids, :post_id_array, :post_count, :as => [:member, :privileged, :contributor, :janitor, :moderator, :admin, :default]
attr_accessible :is_active, :as => [:janitor, :moderator, :admin]
scope :active, where("is_active = true")
def self.name_to_id(name)

66
app/models/post.rb
View File

@@ -68,7 +68,6 @@ class Post < ActiveRecord::Base
RemoteFileManager.new(file_path).distribute
RemoteFileManager.new(real_preview_file_path).distribute
RemoteFileManager.new(ssd_preview_file_path).distribute if Danbooru.config.ssd_path
RemoteFileManager.new(medium_file_path).distribute if has_medium?
RemoteFileManager.new(large_file_path).distribute if has_large?
end
@@ -76,13 +75,11 @@ class Post < ActiveRecord::Base
RemoteFileManager.new(file_path).delete
RemoteFileManager.new(real_preview_file_path).delete
RemoteFileManager.new(ssd_preview_file_path).delete if Danbooru.config.ssd_path
RemoteFileManager.new(medium_file_path).delete if has_medium?
RemoteFileManager.new(large_file_path).delete if has_large?
end
def delete_files
FileUtils.rm_f(file_path)
FileUtils.rm_f(medium_file_path)
FileUtils.rm_f(large_file_path)
FileUtils.rm_f(ssd_preview_file_path) if Danbooru.config.ssd_path
FileUtils.rm_f(real_preview_file_path)
@@ -96,14 +93,6 @@ class Post < ActiveRecord::Base
"#{Rails.root}/public/data/original/#{file_path_prefix}#{md5}.#{file_ext}"
end
def medium_file_path
if has_medium?
"#{Rails.root}/public/data/medium/#{file_path_prefix}#{md5}.jpg"
else
file_path
end
end
def large_file_path
if has_large?
"#{Rails.root}/public/data/large/#{file_path_prefix}#{md5}.jpg"
@@ -132,23 +121,11 @@ class Post < ActiveRecord::Base
"/data/original/#{file_path_prefix}#{md5}.#{file_ext}"
end
def medium_file_url
if has_medium?
if is_flash?
"/data/preview/480x200-flash.png"
else
"/data/medium/#{file_path_prefix}#{md5}.jpg"
end
else
file_url
end
end
def large_file_url
if has_large?
"/data/large/#{file_path_prefix}#{md5}.jpg"
else
medium_file_url
file_url
end
end
@@ -166,13 +143,6 @@ class Post < ActiveRecord::Base
def file_url_for(user)
case user.default_image_size
when "medium"
if image_width > Danbooru.config.medium_image_width
medium_file_url
else
file_url
end
when "large"
if image_width > Danbooru.config.large_image_width
large_file_url
@@ -187,13 +157,6 @@ class Post < ActiveRecord::Base
def file_path_for(user)
case user.default_image_size
when "medium"
if image_width > Danbooru.config.medium_image_width
medium_file_path
else
file_path
end
when "large"
if image_width > Danbooru.config.large_image_width
large_file_path
@@ -216,35 +179,14 @@ class Post < ActiveRecord::Base
end
module ImageMethods
def has_medium?
image_width > Danbooru.config.medium_image_width
end
def has_large?
image_width > Danbooru.config.large_image_width
end
def medium_image_width
[Danbooru.config.medium_image_width, image_width].min
end
def large_image_width
[Danbooru.config.large_image_width, image_width].min
end
def medium_image_height
if is_flash?
return 200
end
ratio = Danbooru.config.medium_image_width.to_f / image_width.to_f
if ratio < 1
(image_height * ratio).to_i
else
image_height
end
end
def large_image_height
ratio = Danbooru.config.large_image_width.to_f / image_width.to_f
if ratio < 1
@@ -256,9 +198,6 @@ class Post < ActiveRecord::Base
def image_width_for(user)
case user.default_image_size
when "medium"
medium_image_width
when "large"
large_image_width
@@ -269,9 +208,6 @@ class Post < ActiveRecord::Base
def image_height_for(user)
case user.default_image_size
when "medium"
medium_image_height
when "large"
large_image_height

4
app/models/upload.rb
View File

@@ -134,7 +134,6 @@ class Upload < ActiveRecord::Base
def generate_resizes(source_path)
if is_image?
generate_resize_for(Danbooru.config.small_image_width, Danbooru.config.small_image_width, source_path, 85)
generate_resize_for(Danbooru.config.medium_image_width, nil, source_path) if image_width > Danbooru.config.medium_image_width
generate_resize_for(Danbooru.config.large_image_width, nil, source_path) if image_width > Danbooru.config.large_image_width
end
end
@@ -220,9 +219,6 @@ class Upload < ActiveRecord::Base
when Danbooru.config.small_image_width
"#{Rails.root}/public/data/preview/#{prefix}#{md5}.jpg"
when Danbooru.config.medium_image_width
"#{Rails.root}/public/data/medium/#{prefix}#{md5}.jpg"
when Danbooru.config.large_image_width
"#{Rails.root}/public/data/large/#{prefix}#{md5}.jpg"
end

4
app/models/user.rb
View File

@@ -21,7 +21,7 @@ class User < ActiveRecord::Base
validates_uniqueness_of :name, :case_sensitive => false
validates_uniqueness_of :email, :case_sensitive => false, :if => lambda {|rec| rec.email.present?}
validates_length_of :password, :minimum => 5, :if => lambda {|rec| rec.new_record? || rec.password.present?}
validates_inclusion_of :default_image_size, :in => %w(medium large original)
validates_inclusion_of :default_image_size, :in => %w(large original)
validates_confirmation_of :password
validates_presence_of :email, :if => lambda {|rec| rec.new_record? && Danbooru.config.enable_email_verification?}
validates_presence_of :comment_threshold
@@ -432,7 +432,7 @@ class User < ActiveRecord::Base
include ApiMethods
def initialize_default_image_size
self.default_image_size = "Medium"
self.default_image_size = "large"
end
def can_update?(object, foreign_key = :user_id)