From ea1ac09f9698be5cc615a4471a3d77b1bdbe9ca2 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 18 Mar 2023 13:54:19 -0300
Subject: [PATCH] =?UTF-8?q?fix:=20mejorar=20gesti=C3=B3n=20de=20zip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/deploy_zip.rb | 53 +++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/app/models/deploy_zip.rb b/app/models/deploy_zip.rb
index bba13686..5f72a728 100644
--- a/app/models/deploy_zip.rb
+++ b/app/models/deploy_zip.rb
@@ -14,24 +14,43 @@ class DeployZip < Deploy
   # y generar un zip accesible públicamente.
   #
   # rubocop:disable Metrics/MethodLength
-  def deploy(**)
+  def deploy(output: false)
     FileUtils.rm_f path
-
     time_start
-    Dir.chdir(destination) do
-      Zip::File.open(path, Zip::File::CREATE) do |z|
-        Dir.glob('./**/**').each do |f|
-          File.directory?(f) ? z.mkdir(f) : z.add(f, f)
+    Zip::File.open(path, Zip::File::CREATE) do |zip|
+      Dir.glob(File.join(destination, '**', '**')).each do |file|
+        entry = Pathname.new(file).relative_path_from(destination).to_s
+
+        if File.directory? file
+          log "Creando directorio #{entry}", output
+
+          zip.mkdir(entry)
+        else
+          log "Comprimiendo #{entry}", output
+          zip.add(entry, file)
         end
       end
     end
+
     time_stop
 
-    build_stats.create action: 'zip',
-                       seconds: time_spent_in_seconds,
-                       bytes: size
+    File.exist?(path).tap do |status|
+      build_stats.create action: 'zip',
+                        seconds: time_spent_in_seconds,
+                        bytes: size,
+                        log: @log.join("\n"),
+                        status: status
+    end
+  rescue Zip::Error => e
+    ExceptionNotifier.notify_exception(e, data: { site: site.name })
 
-    File.exist? path
+    build_stats.create action: 'zip',
+                       seconds: 0,
+                       bytes: 0,
+                       log: @log.join("\n"),
+                       status: false
+
+    false
   end
   # rubocop:enable Metrics/MethodLength
 
@@ -43,8 +62,9 @@ class DeployZip < Deploy
     File.size path
   end
 
+  # @return [String]
   def destination
-    File.join(Rails.root, '_deploy', site.hostname)
+    Rails.root.join('_deploy', site.hostname).realpath.to_s
   end
 
   def file
@@ -58,4 +78,15 @@ class DeployZip < Deploy
   def path
     File.join(destination, file)
   end
+
+  private
+
+  # @param :line [String]
+  # @param :output [Boolean]
+  def log(line, output)
+    @log ||= []
+    @log  << line
+
+    puts line if output
+  end
 end