Skip to content

Commit

Permalink
[webui] Refactor package_controller#package_files
Browse files Browse the repository at this point in the history
This method is only called from this class, so it should be private.

Also, `match?` (introduced in Ruby 2.4.0) is equivalent to `match` when
`MatchData` is not used and it is faster.
  • Loading branch information
Ana06 committed May 11, 2017
1 parent 1553abd commit 9bca096
Showing 1 changed file with 21 additions and 20 deletions.
41 changes: 21 additions & 20 deletions src/api/app/controllers/webui/package_controller.rb
Expand Up @@ -350,26 +350,6 @@ def set_linkinfo
@linkinfo[:diff] = true if lt.backend_package.verifymd5 != @package.backend_package.verifymd5
end

def package_files( rev = nil, expand = nil )
files = []
p = {}
p[:project] = @package.project.name
p[:package] = @package.name
p[:expand] = expand if expand
p[:rev] = rev if rev
dir = Directory.find(p)
return files unless dir
@serviceinfo = dir.find_first(:serviceinfo)
dir.each(:entry) do |entry|
file = Hash[*[:name, :size, :mtime, :md5].map {|x| [x, entry.value(x.to_s)]}.flatten]
file[:viewable] = !Package.is_binary_file?(file[:name]) && file[:size].to_i < 2**20 # max. 1 MB
file[:editable] = file[:viewable] && !file[:name].match(/^_service[_:]/)
file[:srcmd5] = dir.value(:srcmd5)
files << file
end
files
end

def set_file_details
@forced_unexpand ||= ''

Expand Down Expand Up @@ -1035,6 +1015,27 @@ def edit

private

def package_files(rev = nil, expand = nil)
p = {}
p[:project] = @package.project.name
p[:package] = @package.name
p[:expand] = expand if expand
p[:rev] = rev if rev
dir = Directory.find(p)
return [] unless dir

@serviceinfo = dir.find_first(:serviceinfo)
files = []
dir.each(:entry) do |entry|
file = Hash[*[:name, :size, :mtime, :md5].map {|x| [x, entry.value(x.to_s)]}.flatten]
file[:viewable] = !Package.is_binary_file?(file[:name]) && file[:size].to_i < 2**20 # max. 1 MB
file[:editable] = file[:viewable] && !file[:name].match?(/^_service[_:]/)
file[:srcmd5] = dir.value(:srcmd5)
files << file
end
files
end

def file_available?(url, max_redirects = 5)
begin
logger.debug "Checking url: #{url}"
Expand Down

0 comments on commit 9bca096

Please sign in to comment.