From 860a6b4f6ec692ec523a8cc90591ef89d6585cdb Mon Sep 17 00:00:00 2001
From: "Max F. Albrecht" <1@178.is>
Date: Thu, 19 Feb 2015 10:45:36 +0100
Subject: [PATCH] Revert "Fix preview bug"

This reverts commit 9213e16050b39a04f4a9337f94131e9a9dc80474.
---
 app/models/media_file_modules/previews.rb           |  2 +-
 ...1205_recreate_previews_fix_jg_size_constraint.rb | 13 -------------
 db/structure.sql                                    |  2 --
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 db/migrate/20150217141205_recreate_previews_fix_jg_size_constraint.rb

diff --git a/app/models/media_file_modules/previews.rb b/app/models/media_file_modules/previews.rb
index 134780bbd9..c0c2a59d30 100644
--- a/app/models/media_file_modules/previews.rb
+++ b/app/models/media_file_modules/previews.rb
@@ -43,7 +43,7 @@ def create_jpeg_previews_for_file file
         cmd= %Q<convert "#{file}"[0] -auto-orient -thumbnail "#{value}" -flatten -unsharp 0x.5 "#{outfile}">
         Rails.logger.info "CREATING THUMBNAIL `#{cmd}`"
         `#{cmd}`
-        if File.exists?(outfile) 
+        if File.exists?(outfile) && (File.size(file) > File.size(outfile))
           x,y = `identify -format "%wx%h" "#{outfile}"`.split('x')
           if x and y
             previews.create(:content_type => 'image/jpeg', :filename => outfile.split('/').last, :height => y, :width => x, :thumbnail => thumb_size.to_s )
diff --git a/db/migrate/20150217141205_recreate_previews_fix_jg_size_constraint.rb b/db/migrate/20150217141205_recreate_previews_fix_jg_size_constraint.rb
deleted file mode 100644
index d83922dd2c..0000000000
--- a/db/migrate/20150217141205_recreate_previews_fix_jg_size_constraint.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class RecreatePreviewsFixJgSizeConstraint < ActiveRecord::Migration
-  def change
-    MediaFile.where("created_at > '2014-10-01'::date").find_each do |mf|
-      if mf.previews_creatable?
-        begin
-          mf.recreate_image_previews!
-        rescue Exception => e
-          Rails.logger.warn Formatter.exception_to_log_s(e)
-        end
-      end
-    end
-  end
-end
diff --git a/db/structure.sql b/db/structure.sql
index 216fdc6616..d56d52420e 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2231,8 +2231,6 @@ INSERT INTO schema_migrations (version) VALUES ('20141014090348');
 
 INSERT INTO schema_migrations (version) VALUES ('20150127134935');
 
-INSERT INTO schema_migrations (version) VALUES ('20150217141205');
-
 INSERT INTO schema_migrations (version) VALUES ('21');
 
 INSERT INTO schema_migrations (version) VALUES ('22');