chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Automatic rubocop cleanups

Browse source
This commit is contained in:
Christoph Haas 2025-02-03 01:08:08 +01:00
parent 890906929f
commit 2ec80b4bde
3 changed files with 96 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.rubocop.yml
View file

@ -1,5 +1,5 @@
# Style/Encoding: Style/Encoding:
# Enabled: false Enabled: false
Layout/LineLength: Layout/LineLength:
Max: 99 Max: 99

104
app/controllers/packages_controller.rb
View file

@ -1,7 +1,6 @@
class PackagesController < ApplicationController class PackagesController < ApplicationController
# Allow legacy /uploadfile URL without CSRF protection # Allow legacy /uploadfile URL without CSRF protection
protect_from_forgery :except => :legacy_uploadfile protect_from_forgery except: :legacy_uploadfile
def list def list
@packages = query_packages.paginate(page: params[:page], per_page: 6) @packages = query_packages.paginate(page: params[:page], per_page: 6)
@ -20,9 +19,7 @@ class PackagesController < ApplicationController
# Highlight a certain screenshot (by ID). This is used by the logs.slim # Highlight a certain screenshot (by ID). This is used by the logs.slim
# view to link to a certain screenshot of a package. # view to link to a certain screenshot of a package.
if params[:highlight] @highlight_id = params[:highlight].to_i if params[:highlight]
@highlight_id = params[:highlight].to_i
end
if @package.nil? if @package.nil?
@packagename = params[:name] @packagename = params[:name]
@ -48,8 +45,8 @@ class PackagesController < ApplicationController
@invalid_images = [] @invalid_images = []
# If Javascript is disabled a user may submit an empty selection of images. # If Javascript is disabled a user may submit an empty selection of images.
if params[:file] == nil if params[:file].nil?
flash[:error] = "You have not selected any images." flash[:error] = 'You have not selected any images.'
redirect_to upload_path redirect_to upload_path
return return
end end
@ -59,7 +56,7 @@ class PackagesController < ApplicationController
files = params[:file] files = params[:file]
# Turn into array if a single image was uploaded through AJAX # Turn into array if a single image was uploaded through AJAX
files=[files] if files.class != Array files = [files] if files.class != Array
files.each do |img| files.each do |img|
new_screenshot = @package.screenshots.new(simage: img) new_screenshot = @package.screenshots.new(simage: img)
@ -71,12 +68,12 @@ class PackagesController < ApplicationController
new_screenshot.version = @package.version new_screenshot.version = @package.version
# ActiveStorage does not yet create a file checksum automatically. # ActiveStorage does not yet create a file checksum automatically.
# Let's do that. It helps detect duplicate uploads later. # Let's do that. It helps detect duplicate uploads later.
new_screenshot.image_fingerprint = Digest::MD5.hexdigest(File.read img.path) new_screenshot.image_fingerprint = Digest::MD5.hexdigest(File.read(img.path))
# Check that this screenshot is not a duplicate for this package # Check that this screenshot is not a duplicate for this package
if @package.screenshots.where(image_fingerprint: new_screenshot.image_fingerprint).any? if @package.screenshots.where(image_fingerprint: new_screenshot.image_fingerprint).any?
auditlog "Duplicate image with fingerprint #{new_screenshot.image_fingerprint} found. Rejecting.", auditlog "Duplicate image with fingerprint #{new_screenshot.image_fingerprint} found. Rejecting.",
package: @package package: @package
all_errors << "Your file #{img.original_filename} is a duplicate. Sorry." all_errors << "Your file #{img.original_filename} is a duplicate. Sorry."
else else
# TODO: Can the upload get approved automatically? # TODO: Can the upload get approved automatically?
@ -86,8 +83,8 @@ class PackagesController < ApplicationController
# But this makes it easier to track who screenshots belong to. # But this makes it easier to track who screenshots belong to.
unless user_signed_in? unless user_signed_in?
sign_in User.create_pseudo_user sign_in User.create_pseudo_user
auditlog "New pseudo user for anonymous upload created and logged in.", auditlog 'New pseudo user for anonymous upload created and logged in.',
package: @package, screenshot: new_screenshot package: @package, screenshot: new_screenshot
end end
new_screenshot.user = current_user new_screenshot.user = current_user
new_screenshot.approve! if can?(:approve, new_screenshot) new_screenshot.approve! if can?(:approve, new_screenshot)
@ -97,23 +94,21 @@ class PackagesController < ApplicationController
new_screenshot.save! new_screenshot.save!
auditlog "Screenshot #{new_screenshot.id} uploaded successfully.", auditlog "Screenshot #{new_screenshot.id} uploaded successfully.",
screenshot: new_screenshot, package: @package screenshot: new_screenshot, package: @package
@valid_images.push new_screenshot @valid_images.push new_screenshot
end end
else else
errors = new_screenshot.errors[:simage] errors = new_screenshot.errors[:simage]
auditlog "Screenshot #{img.original_filename} invalid (#{errors}).", auditlog "Screenshot #{img.original_filename} invalid (#{errors}).",
package: @package package: @package
#@invalid_images.push img.original_filename # @invalid_images.push img.original_filename
#raise # raise
all_errors << "Your file #{img.original_filename} #{errors.join(' and ')}." all_errors << "Your file #{img.original_filename} #{errors.join(' and ')}."
end end
end end
if all_errors.any? flash[:error] = all_errors if all_errors.any?
flash[:error] = all_errors
end
# # Redirect back to upload form if all uploads were invalid # # Redirect back to upload form if all uploads were invalid
# unless @valid_images.any? # unless @valid_images.any?
@ -130,16 +125,14 @@ class PackagesController < ApplicationController
# ' #{image.image_file_name} (#{image.errors[:image].join(' and ')}) # ' #{image.image_file_name} (#{image.errors[:image].join(' and ')})
# Inform the admins about the upload # Inform the admins about the upload
if @valid_images.any? AdminMailer.with(package: @package).new_uploads_email.deliver_now if @valid_images.any?
AdminMailer.with(package: @package).new_uploads_email.deliver_now
end
# Rails does not allow dots in the URL. So we cannot use the 'respond_to' # Rails does not allow dots in the URL. So we cannot use the 'respond_to'
# and 'format' ways to handle parameters. Instead the 'returns' parameters # and 'format' ways to handle parameters. Instead the 'returns' parameters
# is set in routes.rb to signal that this method was called by AJAX. # is set in routes.rb to signal that this method was called by AJAX.
if params[:returns] == :json if params[:returns] == :json
# TODO: send all_errors back as JSON and make Javascript display it in #messages # TODO: send all_errors back as JSON and make Javascript display it in #messages
render :json => {errors: all_errors.join(' ')} render json: { errors: all_errors.join(' ') }
else else
redirect_to package_path redirect_to package_path
end end
@ -167,11 +160,11 @@ class PackagesController < ApplicationController
new_screenshot.version = @package.version new_screenshot.version = @package.version
new_screenshot.save new_screenshot.save
auditlog "Screenshot #{new_screenshot.id} uploaded successfully from legacy upload form.", auditlog "Screenshot #{new_screenshot.id} uploaded successfully from legacy upload form.",
screenshot: new_screenshot, package: @package screenshot: new_screenshot, package: @package
redirect_to package_path(params[:packagename]) redirect_to package_path(params[:packagename])
else else
auditlog "Screenshot upload rejected. Errors: #{new_screenshot.errors.to_a}", auditlog "Screenshot upload rejected. Errors: #{new_screenshot.errors.to_a}",
package: @package package: @package
head :not_acceptable head :not_acceptable
end end
end end
@ -184,9 +177,9 @@ class PackagesController < ApplicationController
# - Is this the user's own screenshot? (anonymous) # - Is this the user's own screenshot? (anonymous)
if can? :hide, @screenshot if can? :hide, @screenshot
auditlog "Screenshot #{@screenshot.id} hidden", auditlog "Screenshot #{@screenshot.id} hidden",
package: @screenshot.package package: @screenshot.package
@screenshot.hide! @screenshot.hide!
flash['notice'] = "Screenshot hidden." flash['notice'] = 'Screenshot hidden.'
redirect_back(fallback_location: package_path(name: @screenshot.package.name)) redirect_back(fallback_location: package_path(name: @screenshot.package.name))
else else
head :forbidden head :forbidden
@ -201,9 +194,9 @@ class PackagesController < ApplicationController
# - Is this the user's own screenshot? (anonymous) # - Is this the user's own screenshot? (anonymous)
if can? :unhide, @screenshot if can? :unhide, @screenshot
auditlog "Screenshot #{@screenshot.id} un-hidden", auditlog "Screenshot #{@screenshot.id} un-hidden",
package: @screenshot.package package: @screenshot.package
@screenshot.unhide! @screenshot.unhide!
flash['notice'] = "Screenshot un-hidden." flash['notice'] = 'Screenshot un-hidden.'
redirect_back(fallback_location: package_path(name: @screenshot.package.name)) redirect_back(fallback_location: package_path(name: @screenshot.package.name))
else else
head :forbidden head :forbidden
@ -218,17 +211,17 @@ class PackagesController < ApplicationController
# - Is this the user's own screenshot? (anonymous) # - Is this the user's own screenshot? (anonymous)
if can? :destroy, @screenshot if can? :destroy, @screenshot
auditlog "Screenshot #{@screenshot.id} deleted", auditlog "Screenshot #{@screenshot.id} deleted",
package: @screenshot.package package: @screenshot.package
@screenshot.destroy @screenshot.destroy
# Increase the rejection counter for the user (social scoring) # Increase the rejection counter for the user (social scoring)
# if the screenshot is new and pending approval # if the screenshot is new and pending approval
if !@screenshot.approved unless @screenshot.approved
@screenshot.user.rejected_screenshots += 1 @screenshot.user.rejected_screenshots += 1
@screenshot.user.save! @screenshot.user.save!
end end
flash['notice'] = "Screenshot deleted." flash['notice'] = 'Screenshot deleted.'
redirect_back(fallback_location: package_path(name: @screenshot.package.name)) redirect_back(fallback_location: package_path(name: @screenshot.package.name))
else else
head :forbidden head :forbidden
@ -240,14 +233,14 @@ class PackagesController < ApplicationController
if can? :approve, @screenshot if can? :approve, @screenshot
@screenshot.approve! @screenshot.approve!
auditlog "Screenshot approved", auditlog 'Screenshot approved',
package: @screenshot.package, screenshot: @screenshot package: @screenshot.package, screenshot: @screenshot
# Increase the approval counter for the user (social scoring) # Increase the approval counter for the user (social scoring)
@screenshot.user.approved_screenshots += 1 @screenshot.user.approved_screenshots += 1
@screenshot.user.save! @screenshot.user.save!
flash['notice'] = "Screenshot approved." flash['notice'] = 'Screenshot approved.'
redirect_back(fallback_location: package_path(name: @screenshot.package.name)) redirect_back(fallback_location: package_path(name: @screenshot.package.name))
else else
head :forbidden head :forbidden
@ -261,20 +254,22 @@ class PackagesController < ApplicationController
def thumbnail def thumbnail
@package = Package.find_by(name: params[:name]) @package = Package.find_by(name: params[:name])
unless @package unless @package
logger.debug "Cannot render thumbnail for packages #{params[:name]} – no such package"
thumbnail404 thumbnail404
return return
end end
# Called as /thumbnail-with-version/:name/:version # Called as /thumbnail-with-version/:name/:version
if params[:version] @screenshot = if params[:version]
@screenshot = @package.best_screenshot_for_version(params[:version]) @package.best_screenshot_for_version(params[:version])
# Called as /thumbnail/:name # Called as /thumbnail/:name
else else
@screenshot = @package.screenshots.approved.first @package.screenshots.approved.first
end end
# Return a 404 if the package has no screenshots or the image was not found # Return a 404 if the package has no screenshots or the image was not found
unless @screenshot unless @screenshot
logger.debug "Cannot render thumbnail for packages #{params[:name]} – no screenshot found"
thumbnail404 thumbnail404
return return
end end
@ -294,12 +289,12 @@ class PackagesController < ApplicationController
end end
# Called as /screenshot-with-version/:name/:version # Called as /screenshot-with-version/:name/:version
if params[:version] @screenshot = if params[:version]
@screenshot = @package.best_screenshot_for_version(params[:version]) @package.best_screenshot_for_version(params[:version])
# Called as /screenshot/:name # Called as /screenshot/:name
else else
@screenshot = @package.screenshots.approved.first @package.screenshots.approved.first
end end
# Return a 404 if the package has no screenshots or the image was not found # Return a 404 if the package has no screenshots or the image was not found
unless @screenshot unless @screenshot
@ -318,7 +313,7 @@ class PackagesController < ApplicationController
# @screenshot.description = params[:description] # @screenshot.description = params[:description]
@screenshot.update params_screenshot_description @screenshot.update params_screenshot_description
@screenshot.save! @screenshot.save!
flash['notice'] = "Description updated." flash['notice'] = 'Description updated.'
redirect_back(fallback_location: package_path(name: @screenshot.package.name)) redirect_back(fallback_location: package_path(name: @screenshot.package.name))
end end
@ -334,12 +329,14 @@ class PackagesController < ApplicationController
# Send a dummy thumbnail reading "No screenshot available. Sorry." # Send a dummy thumbnail reading "No screenshot available. Sorry."
def thumbnail404 def thumbnail404
send_file Rails.root.join('public/images/dummy/thumbnail404.png'), type: 'image/png', disposition: 'inline', status: 404 send_file Rails.root.join('public/images/dummy/thumbnail404.png'), type: 'image/png',
disposition: 'inline', status: 404
end end
# Send a dummy screenshot reading "No screenshot available. Sorry." # Send a dummy screenshot reading "No screenshot available. Sorry."
def screenshot404 def screenshot404
send_file Rails.root.join('public/images/dummy/screenshot404.png'), type: 'image/png', disposition: 'inline', status: 404 send_file Rails.root.join('public/images/dummy/screenshot404.png'), type: 'image/png',
disposition: 'inline', status: 404
end end
# Return packages matching the criteria given by parameters # Return packages matching the criteria given by parameters
@ -362,7 +359,7 @@ class PackagesController < ApplicationController
logger.debug 'Limiting packages to those without screenshots' logger.debug 'Limiting packages to those without screenshots'
end end
return packages packages
end end
# Store a random identifier and the client's IP address in the session # Store a random identifier and the client's IP address in the session
@ -383,10 +380,9 @@ class PackagesController < ApplicationController
json = JSON.parse(body) json = JSON.parse(body)
# Only show english reviews # Only show english reviews
# TODO: Support further languages # TODO: Support further languages
json = json.select {|x| x['language']=='en'} json = json.select { |x| x['language'] == 'en' }
# Sort by 'usefulness_total' (how many people found this review useful) # Sort by 'usefulness_total' (how many people found this review useful)
json = json.sort { |x,y| y['usefulness_total'].to_i <=> x['usefulness_total'].to_i} json.sort { |x, y| y['usefulness_total'].to_i <=> x['usefulness_total'].to_i }
return json
end end
def params_screenshot_description def params_screenshot_description

5
app/controllers/welcome_controller.rb
View file

@ -1,10 +1,12 @@
# This controller creates the main page and the about page.
class WelcomeController < ApplicationController class WelcomeController < ApplicationController
# Render the main page.
def home def home
@newest_upload = Screenshot.where(approved: true).first @newest_upload = Screenshot.where(approved: true).first
@most_popular_package = Package.with_screenshots.order(visits: :desc).first @most_popular_package = Package.with_screenshots.order(visits: :desc).first
@package_count = Package.count @package_count = Package.count
# Get up 100 screenshots where the packages have the most visits # Get up 100 screenshots where the packages have the most visits
query = Package.without_screenshots.order(visits: :desc) query = Package.without_screenshots.order(visits: :desc)
@ -13,6 +15,7 @@ class WelcomeController < ApplicationController
@most_wanted_package = query.offset(random_offset).first @most_wanted_package = query.offset(random_offset).first
end end
# Render the about page.
def about def about
@package_sources = Rails.configuration.package_sources @package_sources = Rails.configuration.package_sources
@package_count = Package.count @package_count = Package.count