redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new_storage_filename is using p_<project_base> path when checking if filename already exists.

Browse Source
This commit is contained in:
COLA@Redmine.local 2017-02-03 22:40:58 +01:00
parent d6d294171e
commit 58ae5aa706
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/models/dmsf_file_revision.rb
View File

@ -130,16 +130,21 @@ class DmsfFileRevision < ActiveRecord::Base
def version
"#{self.major_version}.#{self.minor_version}"
end
def storage_base_path(project = nil)
project = self.dmsf_file.project unless project
path = DmsfFile.storage_path.dup
if self.dmsf_file && project
project_base = project.identifier.gsub(/[^\w\.\-]/,'_')
path << "/p_#{project_base}"
end
end
def disk_file(project = nil)
project = self.dmsf_file.project unless project
storage_base = DmsfFile.storage_path.dup
if self.dmsf_file && project
project_base = project.identifier.gsub(/[^\w\.\-]/,'_')
storage_base << "/p_#{project_base}"
end
FileUtils.mkdir_p(storage_base) unless File.exist?(storage_base)
"#{storage_base}/#{self.disk_filename}"
path = storage_base_path(project)
FileUtils.mkdir_p(path) unless File.exist?(path)
"#{path}/#{self.disk_filename}"
end
def detect_content_type
@ -226,7 +231,7 @@ class DmsfFileRevision < ActiveRecord::Base
raise DmsfAccessError, 'File id is not set' unless self.dmsf_file.id
filename = DmsfHelper.sanitize_filename(self.name)
timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
while File.exist?(File.join(DmsfFile.storage_path, "#{timestamp}_#{self.dmsf_file.id}_#{filename}"))
while File.exist?(File.join(storage_base_path, "#{timestamp}_#{self.dmsf_file.id}_#{filename}"))
timestamp.succ!
end
"#{timestamp}_#{self.dmsf_file.id}_#{filename}"