sutty-migration 0.4.0rc1 → 0.4.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41536e494891ca8e5b5a6ea4f98dcf2cdd780bb8f1a16cdfc10bcee9f5195eb6
-  data.tar.gz: d73e41285e4bfd4080aad2beb3b9b3a29332ee0f31e64b4438fd0bcc7a479952
+  metadata.gz: 7e6f379b5ad8bdb17dbe4353ac4436f244cbcbee4db468070df6da38befde458
+  data.tar.gz: 26e38ae35fdef4c9d702b959ed24ea51c1cf41d457a89c4914a7757a5a942289
 SHA512:
-  metadata.gz: b7e64d51403a731be28d4eae8385747dee6abc99e3e5c7b8220240a673b1dee555584706ef0d10f203751eacb51b89022c02ec1d9019b3854a547650f9489e1d
-  data.tar.gz: f7ae65bde83caa3404d7de2b825fe751fdc0490fda3c399f4c98f2cf320e037323172b065ec82e9e7af4a5e09ecc5c27e095f3b955c19268e1fe0cc55522a557
+  metadata.gz: 73cf557ebcf3747e6878e56fb045586573d8b6b2883717fc092a4a85572c3e93361234877deaf4f5aa44af4ae47ac3b6b2c007a707b3cbb57db03afa0af5234b
+  data.tar.gz: 8182bf944bee9bdf1afb61517a700aaa87e99b45a2a19f6c405d1840ca1adc5eb866fca462b94cf96af97d7cad227f88e4a259f6c50a7737d6926af437a9fa4a

data/lib/jekyll-wordpress-xml-migration.rb

@@ -37,6 +37,8 @@ Jekyll::Hooks.register :site, :post_read, priority: :high do |site|
     Jekyll::Hooks.trigger :wordpress_attachment, :post_write, attachment
   end
 
+  Jekyll::Hooks.trigger :migration, :pre_render, wordpress
+
   wordpress.posts.each_value do |post|
     Jekyll::Hooks.trigger :wordpress_post, :post_init, post.item
     Jekyll::Hooks.trigger :wordpress_post, :pre_render, post

data/lib/sutty_migration/jekyll/document_creator.rb

@@ -83,4 +83,4 @@ module SuttyMigration
   end
 end
 
-::Jekyll::Document.include SuttyMigration::Jekyll::DocumentCreator
+Jekyll::Document.include SuttyMigration::Jekyll::DocumentCreator

data/lib/sutty_migration/wordpress_xml/attachment.rb

@@ -10,6 +10,16 @@ module SuttyMigration
   class WordpressXml
     # Represents an attachment or uploaded file.
     class Attachment < Post
+      @@connection_failed = false
+
+      def self.connection_failed
+        @@connection_failed
+      end
+
+      def self.connection_failed=(value)
+        @@connection_failed = value
+      end
+
       # File URL
       #
       # @return [String]
@@ -41,6 +51,8 @@ module SuttyMigration
         end
       end
 
+      attr_reader :head
+
       # Download the file if it doesn't exist.  Optionally show a
       # progress bar.
       #
@@ -48,30 +60,40 @@ module SuttyMigration
       # @return [Boolean]
       def download(progress: true)
         return true if File.exist? dest
+        return false if self.class.connection_failed
 
-        FileUtils.mkdir_p File.dirname(dest)
-
-        File.open(dest, 'w') do |f|
-          head = Faraday.head(normalized_url)
-
-          if head.status > 399
-            ::Jekyll.logger.warn 'Error:', "#{head.status} #{normalized_url}"
+        @head =
+          begin
+            Faraday.head(normalized_url)
+          rescue Faraday::ConnectionFailed, Faraday::SSLError, Faraday::ServerError => e
+            ::Jekyll.logger.warn 'Error:', e.message
+            self.class.connection_failed = true
+            return false
+          rescue Faraday::Error => e
+            ::Jekyll.logger.warn 'Error:', e.message
             return false
           end
 
-          content_length = head.headers['content-length'].to_i
+        if head.status > 399
+          ::Jekyll.logger.warn 'Error:', "#{head.status} #{normalized_url}"
+          return false
+        end
 
-          if content_length.zero?
-            ::Jekyll.logger.warn 'Error:', "Content length is zero for #{normalized_url}"
-            return false
-          end
+        content_length = head.headers['content-length'].to_i
 
-          ::Jekyll.logger.info 'Downloading:', dest
+        if content_length.zero?
+          ::Jekyll.logger.warn 'Error:', "Content length is zero for #{normalized_url}"
+          return false
+        end
 
-          progress_bar =
-            (ProgressBar.create(title: File.basename(dest), total: content_length, output: $stderr) if progress)
+        ::Jekyll.logger.info 'Downloading:', dest
 
-          begin
+        progress_bar =
+          (ProgressBar.create(title: File.basename(dest), total: content_length, output: $stderr) if progress)
+
+        begin
+          FileUtils.mkdir_p File.dirname(dest)
+          File.open(dest, 'w') do |f|
             Faraday.get(normalized_url) do |req|
               req.options.on_data = proc do |chunk, downloaded_bytes|
                 if downloaded_bytes > content_length
@@ -83,14 +105,15 @@ module SuttyMigration
                 progress_bar&.progress = downloaded_bytes
               end
             end
-          rescue Faraday::Error => e
-            ::Jekyll.logger.warn 'Error:', e.message
           end
-
-          progress_bar&.stop
+        rescue Faraday::Error => e
+          ::Jekyll.logger.warn 'Error:', e.message
+          FileUtils.rm_f(File.dirname(dest))
         end
 
-        File.exist? dest
+        progress_bar&.stop
+
+        File.exist?(dest)
       end
 
       # Local path following Sutty's conventions.  Instead of producing
@@ -104,32 +127,31 @@ module SuttyMigration
         return unless digest
 
         @public_path ||= File.join('public', digest[..27], dest.split('/').last).tap do
-          next if File.exist? _1
-
-          # If the directory exists and it's not empty, but the file is
-          # not there, we either have the same file with different names
-          # or old thumbnails.
-          dir = File.dirname(_1)
-          if File.directory?(dir) && !Dir.empty?(dir)
-            ::Jekyll.logger.warn 'Migration:',
-                                 "#{dir} is not empty, you probably have the same file with different names"
+          # If there's a file with the same digest, we replace the
+          # public_path so we deduplicate them.
+          if (other = wordpress.attachments[digest]) == self
+            next if File.exist? _1
+
+            FileUtils.mkdir_p(File.dirname(_1))
+            FileUtils.ln(dest, _1)
+          else
+            _1.replace other.public_path
           end
-
-          FileUtils.mkdir_p(File.dirname(_1))
-          FileUtils.ln(dest, _1)
         end
       end
 
-      # Download and produce a digest. Produce an error if the file
-      # can't be downloaded.
+      # Download and produce a digest if the file can be downloaded.
+      # Index by digest too.
       #
       # @return [String]
       def digest
         @digest ||=
-          begin
+          if download
             require 'digest'
 
-            Digest::SHA2.file(dest).hexdigest if download
+            Digest::SHA2.file(dest).hexdigest.tap do |digest|
+              wordpress.attachments[digest] ||= self
+            end
           end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sutty-migration
 version: !ruby/object:Gem::Version
-  version: 0.4.0rc1
+  version: 0.4.0rc2
 platform: ruby
 authors:
 - f