From 1fa8a082870e7e833f3e9fb3b9398149699e3267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Fri, 5 Nov 2021 12:28:13 +0100
Subject: [PATCH] blob path + sync dev
---
app/models/communication/website/imported/page.rb | 4 ++--
app/models/communication/website/imported/post.rb | 4 ++--
app/models/communication/website/with_media.rb | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/models/communication/website/imported/page.rb b/app/models/communication/website/imported/page.rb
index 5f7849a46..d4fb0eee7 100644
--- a/app/models/communication/website/imported/page.rb
+++ b/app/models/communication/website/imported/page.rb
@@ -84,7 +84,7 @@ class Communication::Website::Imported::Page < ApplicationRecord
# Continue only if there are remote changes
# Don't touch if there are local changes (page.updated_at > updated_at)
# Don't touch if there are no remote changes (page.updated_at == updated_at)
- return unless updated_at > page.updated_at
+ return unless ENV['APPLICATION_ENV'] == 'development' || updated_at > page.updated_at
end
puts "Update page #{page.id}"
sanitized_title = Wordpress.clean_string self.title.to_s
@@ -97,7 +97,7 @@ class Communication::Website::Imported::Page < ApplicationRecord
end
def sync_attachments
- return unless updated_at > page.updated_at
+ return unless ENV['APPLICATION_ENV'] == 'development' || updated_at > page.updated_at
if featured_medium.present?
unless featured_medium.file.attached?
featured_medium.load_remote_file!
diff --git a/app/models/communication/website/imported/post.rb b/app/models/communication/website/imported/post.rb
index 8a0a966dc..0112fdc2a 100644
--- a/app/models/communication/website/imported/post.rb
+++ b/app/models/communication/website/imported/post.rb
@@ -87,7 +87,7 @@ class Communication::Website::Imported::Post < ApplicationRecord
# updated_at reflects last update on wordpress, based on the last import
# Don't touch if there are local changes (post.updated_at > updated_at)
# Don't touch if there are no remote changes (post.updated_at == updated_at)
- return unless updated_at > post.updated_at
+ return unless ENV['APPLICATION_ENV'] == 'development' || updated_at > post.updated_at
end
puts "Update post #{post.id}"
sanitized_title = Wordpress.clean_string self.title.to_s
@@ -110,7 +110,7 @@ class Communication::Website::Imported::Post < ApplicationRecord
end
def sync_attachments
- return unless updated_at > post.updated_at
+ return unless ENV['APPLICATION_ENV'] == 'development' || updated_at > post.updated_at
if featured_medium.present?
unless featured_medium.file.attached?
featured_medium.load_remote_file!
diff --git a/app/models/communication/website/with_media.rb b/app/models/communication/website/with_media.rb
index 769127920..8aaacbda5 100644
--- a/app/models/communication/website/with_media.rb
+++ b/app/models/communication/website/with_media.rb
@@ -7,7 +7,7 @@ module Communication::Website::WithMedia
end
def blob_github_path_generated(blob)
- "_media/#{blob.id}.md"
+ "_media/#{blob.id[0..1]}/#{blob.id}.md"
end
def blob_to_jekyll(blob)
@@ -25,7 +25,7 @@ module Communication::Website::WithMedia
active_storage_blobs.each do |blob|
blob.analyze unless blob.analyzed?
github.publish(path: "_media/#{blob.id}.md",
- commit: "[Medium] Save ##{ blob.id }",
+ commit: "[Medium] Save ##{blob.id}",
data: blob_to_jekyll(blob))
end
end
--
GitLab