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

uploads: mark old columns as ignored.

Browse Source 
Mark old columns as ignored in preparation for dropping them. Make the
rating and tag_string nullable so they don't have to be set when
creating uploads and can be ignored too.
This commit is contained in:
evazion
2022-02-02 22:10:11 -06:00
parent 054b0b4d0a
commit 2dfec29da7
5 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/uploads_controller.rb
View File

@@ -5,12 +5,12 @@ class UploadsController < ApplicationController
skip_before_action :verify_authenticity_token, only: [:create], if: -> { request.xhr? }
def new
@upload = authorize Upload.new(uploader: CurrentUser.user, uploader_ip_addr: CurrentUser.ip_addr, rating: "q", tag_string: "", source: params[:url], referer_url: params[:ref], **permitted_attributes(Upload))
@upload = authorize Upload.new(uploader: CurrentUser.user, uploader_ip_addr: CurrentUser.ip_addr, source: params[:url], referer_url: params[:ref], **permitted_attributes(Upload))
respond_with(@upload)
end
def create
@upload = authorize Upload.new(uploader: CurrentUser.user, uploader_ip_addr: CurrentUser.ip_addr, rating: "q", tag_string: "", **permitted_attributes(Upload))
@upload = authorize Upload.new(uploader: CurrentUser.user, uploader_ip_addr: CurrentUser.ip_addr, **permitted_attributes(Upload))
@upload.save
respond_with(@upload)
end

11
app/models/upload.rb
View File

@@ -3,7 +3,12 @@
class Upload < ApplicationRecord
extend Memoist
MAX_VIDEO_DURATION = 140
self.ignored_columns = %i[
file_path content_type rating tag_string backtrace post_id md5_confirmation
server parent_id md5 file_ext file_size image_width image_height
artist_commentary_desc artist_commentary_title include_artist_commentary
context translated_commentary_title translated_commentary_desc
]
attr_accessor :file
@@ -75,7 +80,7 @@ class Upload < ApplicationRecord
end
def self.search(params)
q = search_attributes(params, :id, :created_at, :updated_at, :source, :referer_url, :uploader, :status, :backtrace, :upload_media_assets, :media_assets)
q = search_attributes(params, :id, :created_at, :updated_at, :source, :referer_url, :status, :uploader, :upload_media_assets, :media_assets)
q.apply_default_order(params)
end
@@ -104,7 +109,7 @@ class Upload < ApplicationRecord
media_asset = MediaAsset.upload!(media_file)
update!(media_assets: [media_asset], status: "completed")
rescue Exception => e
update!(status: "error: #{e.message}", backtrace: e.backtrace.join("\n"))
update!(status: "error: #{e.message}")
end
def self.available_includes