DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5393 from betagouv/zip-with-identical-files

Browse source 
Zip with identical files
This commit is contained in:
Keirua 2020-07-20 15:35:35 +02:00 • committed by GitHub
commit fd8507b531
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/lib/active_storage/downloadable_file.rb
View file

@ -15,14 +15,22 @@ class ActiveStorage::DownloadableFile
pjs = PiecesJustificativesService.liste_pieces_justificatives(dossier) pjs = PiecesJustificativesService.liste_pieces_justificatives(dossier)
pjs.map do |piece_justificative| pjs.map do |piece_justificative|
[ [
ActiveStorage::DownloadableFile.new(piece_justificative), piece_justificative,
piece_justificative.filename.to_s self.timestamped_filename(piece_justificative)
] ]
end end
end end
private private
def self.timestamped_filename(piece_justificative)
extension = File.extname(piece_justificative.filename.to_s)
basename = File.basename(piece_justificative.filename.to_s, extension)
timestamp = piece_justificative.created_at.strftime("%d-%m-%Y-%H-%S")
"#{basename}-#{timestamp}#{extension}"
end
def using_local_backend? def using_local_backend?
[:local, :local_test, :test].include?(Rails.application.config.active_storage.service) [:local, :local_test, :test].include?(Rails.application.config.active_storage.service)
end end