From 87cdba9bec0a45ab48802c409830478ca045ff6e Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 6 Apr 2022 20:07:14 -0300
Subject: [PATCH] =?UTF-8?q?enviar=20m=C3=A1s=20informaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/jobs/deploy_job.rb                     | 14 ++++++++++++--
 app/models/deploy.rb                       |  4 ++++
 app/models/deploy_alternative_domain.rb    |  6 +++++-
 app/models/deploy_hidden_service.rb        |  2 +-
 app/models/deploy_local.rb                 |  4 ++++
 app/models/deploy_private.rb               |  4 ++++
 app/models/deploy_www.rb                   |  4 ++++
 app/models/deploy_zip.rb                   |  4 ++++
 app/views/deploy_mailer/deployed.html.haml |  9 +++++++--
 app/views/deploy_mailer/deployed.text.haml |  7 +++----
 config/locales/en.yml                      |  2 ++
 config/locales/es.yml                      |  2 ++
 12 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/app/jobs/deploy_job.rb b/app/jobs/deploy_job.rb
index 70997ce1..db91672b 100644
--- a/app/jobs/deploy_job.rb
+++ b/app/jobs/deploy_job.rb
@@ -27,7 +27,13 @@ class DeployJob < ApplicationJob
 
       @site.update status: 'building'
       # Asegurarse que DeployLocal sea el primero!
-      @deployed = { deploy_local: deploy_locally }
+      @deployed = {
+        deploy_local: {
+          status: deploy_locally,
+          seconds: deploy_local.build_stats.last.seconds,
+          url: site.url
+        }
+      }
 
       # No es opcional
       unless @deployed[:deploy_local]
@@ -60,7 +66,11 @@ class DeployJob < ApplicationJob
 
   def deploy_others
     @site.deploys.where.not(type: 'DeployLocal').find_each do |d|
-      @deployed[d.type.underscore.to_sym] = d.deploy
+      @deployed[d.type.underscore.to_sym] = {
+        status: d.deploy,
+        seconds: d.build_stats.last.seconds,
+        url: d.url
+      }
     end
   end
 
diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index 3f034ad5..1aefe126 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -15,6 +15,10 @@ class Deploy < ApplicationRecord
     raise NotImplementedError
   end
 
+  def url
+    raise NotImplementedError
+  end
+
   def limit
     raise NotImplementedError
   end
diff --git a/app/models/deploy_alternative_domain.rb b/app/models/deploy_alternative_domain.rb
index e4960e65..d245ac21 100644
--- a/app/models/deploy_alternative_domain.rb
+++ b/app/models/deploy_alternative_domain.rb
@@ -18,6 +18,10 @@ class DeployAlternativeDomain < Deploy
   end
 
   def destination
-    File.join(Rails.root, '_deploy', hostname.gsub(/\.\z/, ''))
+    @destination ||= File.join(Rails.root, '_deploy', hostname.gsub(/\.\z/, ''))
+  end
+
+  def url
+    "https://#{File.basename destination}"
   end
 end
diff --git a/app/models/deploy_hidden_service.rb b/app/models/deploy_hidden_service.rb
index d4d2b822..8df46c2e 100644
--- a/app/models/deploy_hidden_service.rb
+++ b/app/models/deploy_hidden_service.rb
@@ -13,6 +13,6 @@ class DeployHiddenService < DeployWww
   end
 
   def url
-    'http://' + fqdn
+    "http://#{fqdn}"
   end
 end
diff --git a/app/models/deploy_local.rb b/app/models/deploy_local.rb
index 4fa588f5..b6fa407f 100644
--- a/app/models/deploy_local.rb
+++ b/app/models/deploy_local.rb
@@ -25,6 +25,10 @@ class DeployLocal < Deploy
     1
   end
 
+  def url
+    site.url
+  end
+
   # Obtener el tamaño de todos los archivos y directorios (los
   # directorios son archivos :)
   def size
diff --git a/app/models/deploy_private.rb b/app/models/deploy_private.rb
index 3a6595f9..0d79811d 100644
--- a/app/models/deploy_private.rb
+++ b/app/models/deploy_private.rb
@@ -16,6 +16,10 @@ class DeployPrivate < DeployLocal
     File.join(Rails.root, '_private', site.name)
   end
 
+  def url
+    "#{ENV['PANEL_URL']}/sites/private/#{site.name}"
+  end
+
   # No usar recursos en compresión y habilitar los datos privados
   def env
     @env ||= super.merge({
diff --git a/app/models/deploy_www.rb b/app/models/deploy_www.rb
index 5602b0fc..3c9feb3b 100644
--- a/app/models/deploy_www.rb
+++ b/app/models/deploy_www.rb
@@ -27,6 +27,10 @@ class DeployWww < Deploy
     "www.#{site.hostname}"
   end
 
+  def url
+    "https://www.#{site.hostname}/"
+  end
+
   private
 
   def remove_destination!
diff --git a/app/models/deploy_zip.rb b/app/models/deploy_zip.rb
index ec8973d1..0a66b602 100644
--- a/app/models/deploy_zip.rb
+++ b/app/models/deploy_zip.rb
@@ -49,6 +49,10 @@ class DeployZip < Deploy
     "#{site.hostname}.zip"
   end
 
+  def url
+    "#{site.url}#{file}"
+  end
+
   def path
     File.join(destination, file)
   end
diff --git a/app/views/deploy_mailer/deployed.html.haml b/app/views/deploy_mailer/deployed.html.haml
index e8b2e7af..23e99469 100644
--- a/app/views/deploy_mailer/deployed.html.haml
+++ b/app/views/deploy_mailer/deployed.html.haml
@@ -8,10 +8,15 @@
     %tr
       %th= t('.th.type')
       %th= t('.th.status')
+      %th= t('.th.url')
+      %th= t('.th.seconds')
   %tbody
-    - @deploys.each do |deploy, value|
+    - @deploys.each_pair do |deploy, value|
       %tr
         %td= t(".#{deploy}.title")
-        %td= value ? t(".#{deploy}.success") : t(".#{deploy}.error")
+        %td= value[:status] ? t(".#{deploy}.success") : t(".#{deploy}.error")
+        %td= link_to value[:url], value[:url]
+        %td
+          %time{ datetime: "PT#{value[:seconds]}S" }= distance_of_time_in_words value[:seconds].seconds
 
 = sanitize_markdown t('.help'), tags: %w[p a strong em]
diff --git a/app/views/deploy_mailer/deployed.text.haml b/app/views/deploy_mailer/deployed.text.haml
index 53a9b008..a3073a61 100644
--- a/app/views/deploy_mailer/deployed.text.haml
+++ b/app/views/deploy_mailer/deployed.text.haml
@@ -3,10 +3,9 @@
 = t('.explanation', fqdn: @deploy_local.site.hostname)
 \
 = Terminal::Table.new do |table|
-  - table << [t('.th.type'), t('.th.status')]
+  - table << [t('.th.type'), t('.th.status'), t('.th.url'), t('.th.seconds')]
   - table.add_separator
-  - @deploys.each do |deploy, value|
-    - table << [t(".#{deploy}.title"),
-                value ? t(".#{deploy}.success") : t(".#{deploy}.error")]
+  - @deploys.each_pair do |deploy, value|
+    - table << [ t(".#{deploy}.title"), value[:status] ? t(".#{deploy}.success") : t(".#{deploy}.error"), value[:url], distance_of_time_in_words(value[:seconds].seconds) ]
 \
 = t('.help')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b814796d..c8df9150 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -76,6 +76,8 @@ en:
       th:
         type: Type
         status: Status
+        seconds: Duration
+        url: Address
       deploy_local:
         title: Build the site
         success: Success!
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a6fbd407..e94f623a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -76,6 +76,8 @@ es:
       th:
         type: Tipo
         status: Estado
+        seconds: Duración
+        url: Dirección
       deploy_local:
         title: Generar el sitio
         success: ¡Éxito!