Merge branch 'rails' of 0xacab.org:sutty/sutty into rails

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 .apk-add: &apk-add
-- "apk add go-task diffutils"
+- "apk add go-task diffutils gitlab_ci_log_section"
 .disable-hainish: &disable-hainish
 - "rm -f .env.development"
 .cache-ruby: &cache-ruby
@@ -30,13 +30,18 @@ assets:
   - *cache-node
   - *cache-task
   before_script:
+  - "gitlab_ci_log_section --name git --header=\"Configuring git\""
   - "git config --global user.email \"${GIT_USER_EMAIL:-$GITLAB_USER_EMAIL}\""
   - "git config --global user.name \"${GIT_USER_NAME:-$GITLAB_USER_NAME}\""
   - "git remote set-url --push origin \"https://${GITLAB_USERNAME}:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\""
+  - "gitlab_ci_log_section --name git --end"
+  - "gitlab_ci_log_section --name apk --header=\"Installing dependencies\""
   - "apk add brotli"
   - *apk-add
   - *disable-hainish
+  - "gitlab_ci_log_section --name apk --end"
   script:
+  - "gitlab_ci_log_section --name assets --header=\"Building\""
   - "go-task assets"
   after_script:
   - "git add public && git commit -m \"ci: assets [skip ci]\""

app/controllers/active_storage/direct_uploads_controller_decorator.rb

@@ -18,8 +18,9 @@ module ActiveStorage
       # para que puedan propagarse correctamente a través de todo el
       # stack.
       def blob_args
-        params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, metadata: {}).to_h.symbolize_keys.tap do |ba|
-          ba[:filename] = ba[:filename].unicode_normalize
+        params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type,
+                                     metadata: {}).to_h.symbolize_keys.tap do |ba|
+          ba[:filename] = ba[:filename].unicode_normalize.sub(/\A_+/, '')
         end
       end
     end

app/lib/action_dispatch/http/uploaded_file_decorator.rb

@@ -11,7 +11,7 @@ module ActionDispatch
         # Devolver el nombre de archivo con caracteres unicode
         # normalizados
         def original_filename
-          @original_filename.unicode_normalize
+          @original_filename.unicode_normalize.sub(/\A_+/, '')
         end
       end
     end

app/models/metadata_path.rb

@@ -6,7 +6,7 @@ class MetadataPath < MetadataTemplate
   #
   # @return [String]
   def default_value
-    File.join(site.path, "_#{lang}", "#{date}-#{slug}#{ext}")
+    File.join(site.path, "_#{lang}", "#{limited_name}#{ext}")
   end
 
   # La ruta del archivo según Jekyll
@@ -46,4 +46,12 @@ class MetadataPath < MetadataTemplate
   def date
     post.date.value.strftime('%F')
   end
+
+  # Limita el nombre de archivo a 255 bytes, de forma que siempre
+  # podemos guardarlo
+  #
+  # @return [String]
+  def limited_name
+    "#{date}-#{slug}".mb_chars.limit(255 - ext.length)
+  end
 end

app/models/site/repository.rb

@@ -235,5 +235,10 @@ class Site
 
       r&.success?
     end
+
+    def lfs_cleanup
+      git_sh("git", "lfs", "prune")
+      git_sh("git", "lfs", "dedup")
+    end
   end
 end

app/services/cleanup_service.rb

@@ -31,7 +31,7 @@ class CleanupService
       site.deploys.find_each(&:cleanup!)
 
       site.repository.gc
-      lfs_cleanup
+      site.repository.lfs_cleanup
       site.touch
     end
   end
@@ -46,14 +46,8 @@ class CleanupService
       Rails.logger.info "Limpiando repositorio git de #{site.name}"
 
       site.repository.gc
-      lfs_cleanup
+      site.repository.lfs_cleanup
       site.touch
     end
   end
-
-  private 
-  def lfs_cleanup
-    site.repository.git_sh("git", "lfs", "prune")
-    site.repository.git_sh("git", "lfs", "dedup")
-  end
 end