File.exists? is obsolete
This commit is contained in:
parent
30ad632cb2
commit
0082367870
@ -415,7 +415,7 @@ class DmsfController < ApplicationController
|
||||
if selected_files && selected_files.is_a?(Array)
|
||||
selected_files.each do |selected_file_id|
|
||||
file = DmsfFile.visible.find_by_id selected_file_id
|
||||
unless file && file.last_revision && File.exists?(file.last_revision.disk_file)
|
||||
unless file && file.last_revision && File.exist?(file.last_revision.disk_file)
|
||||
raise FileNotFound
|
||||
end
|
||||
unless (file.project == @project) || User.current.allowed_to?(:view_dmsf_files, file.project)
|
||||
|
||||
@ -56,7 +56,7 @@ module DmsfHelper
|
||||
def self.filetype_css(filename)
|
||||
extension = File.extname(filename)
|
||||
extension = extension[1, extension.length-1]
|
||||
if File.exists?("#{File.dirname(__FILE__)}/../../assets/images/filetypes/#{extension}.png")
|
||||
if File.exist?("#{File.dirname(__FILE__)}/../../assets/images/filetypes/#{extension}.png")
|
||||
"filetype-#{extension}";
|
||||
else
|
||||
Redmine::MimeType.css_class_of(filename)
|
||||
|
||||
@ -106,7 +106,7 @@ class DmsfFile < ActiveRecord::Base
|
||||
# better interact from test-cases etc
|
||||
def self.storage_path=(path)
|
||||
begin
|
||||
FileUtils.mkdir_p(path) unless File.exists?(path)
|
||||
FileUtils.mkdir_p(path) unless File.exist?(path)
|
||||
rescue Exception => e
|
||||
Rails.logger.error e.message
|
||||
end
|
||||
|
||||
@ -137,7 +137,7 @@ class DmsfFileRevision < ActiveRecord::Base
|
||||
project_base = project.identifier.gsub(/[^\w\.\-]/,'_')
|
||||
storage_base << "/p_#{project_base}"
|
||||
end
|
||||
FileUtils.mkdir_p(storage_base) unless File.exists?(storage_base)
|
||||
FileUtils.mkdir_p(storage_base) unless File.exist?(storage_base)
|
||||
"#{storage_base}/#{self.disk_filename}"
|
||||
end
|
||||
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
<%= l(:label_default) %>: <%= "#{Rails.root}/files/dmsf" %>
|
||||
</em>
|
||||
</p>
|
||||
<% unless File.exists?(storage_dir) %>
|
||||
<% unless File.exist?(storage_dir) %>
|
||||
<% begin %>
|
||||
<% Dir.mkdir(storage_dir) %>
|
||||
<% rescue %>
|
||||
@ -69,14 +69,14 @@
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% testfilename = "#{storage_dir}/test.test" %>
|
||||
<% if File.exists?(storage_dir) %>
|
||||
<% if File.exist?(storage_dir) %>
|
||||
<% begin %>
|
||||
<% File.open(testfilename, 'wb') do |file| %>
|
||||
<% end %>
|
||||
<% rescue %>
|
||||
<p class="warning"><%= l(:error_file_can_not_be_created) %></p>
|
||||
<% ensure %>
|
||||
<% File.delete(testfilename) if File.exists?(testfilename) %>
|
||||
<% File.delete(testfilename) if File.exist?(testfilename) %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
|
||||
@ -335,7 +335,7 @@ def generate_uri(project, repository, identifier, path)
|
||||
|
||||
def convert_to_text(fpath, type)
|
||||
text = nil
|
||||
return text if !File.exists?(FORMAT_HANDLERS[type].split(' ').first)
|
||||
return text if !File.exist?(FORMAT_HANDLERS[type].split(' ').first)
|
||||
case type
|
||||
when 'pdf'
|
||||
text = "#{FORMAT_HANDLERS[type]} #{fpath} -"
|
||||
@ -377,7 +377,7 @@ def add_or_update_index(databasepath, indexconf, project, repository, identifier
|
||||
File.open( "#{$tempdir}/#{fname}", 'wb+') do | bs |
|
||||
bs.write(bstr)
|
||||
end
|
||||
text = convert_to_text("#{$tempdir}/#{fname}", type) if File.exists?("#{$tempdir}/#{fname}") and !bstr.nil?
|
||||
text = convert_to_text("#{$tempdir}/#{fname}", type) if File.exist?("#{$tempdir}/#{fname}") and !bstr.nil?
|
||||
File.unlink("#{$tempdir}/#{fname}")
|
||||
end
|
||||
log "generated uri: #{uri}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user