提交: dc02d89282b1beb6ffcea3d8091acf28f42d9d2c - Meghsingh (git)

Never give up

Commit MetaInfo

• 修訂: dc02d89282b1beb6ffcea3d8091acf28f42d9d2c (tree)
• 時間: 2018-01-25 14:13:37
• 作者: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Fix error class on creating voice preview.

Change Summary

• modified: lib/paperclip_processors/voice_preview.rb

差異

--- a/lib/paperclip_processors/voice_preview.rb
+++ b/lib/paperclip_processors/voice_preview.rb
@@ -38,18 +38,18 @@ class VoicePreview < Paperclip::Processor
       end
       if tfiles.size < 3
         Rails.logger.error "Preview target is missing. zip entry count=#{Zip::ZipFile.foreach(src.path).count}"
-        raise I18n.t("voice_preview.err_missing")
+        raise Paperclip::Error, I18n.t("voice_preview.err_missing")
       end
       tfiles.each do |tf|
         `soxi -t "#{tf}"`.chomp.downcase == 'vorbis' &&
           `soxi -e "#{tf}"`.chomp.downcase == 'vorbis' or
-          raise I18n.t("voice_preview.err_not_ogg")
+          raise Paperclip::Error, I18n.t("voice_preview.err_not_ogg")
         `soxi -r "#{tf}"`.to_i == 44100 && `soxi -c "#{tf}"`.to_i == 1 and next
         rtmp = "#{tmpdir}/rate-convert-tmp-#{$$}.ogg"
-        system('sox', tf, '-c', '1', '-r', '44100', rtmp) or raise I18n.t("voice_preview.err_normalize")
+        system('sox', tf, '-c', '1', '-r', '44100', rtmp) or raise Paperclip::Error, I18n.t("voice_preview.err_normalize")
         FileUtils.mv rtmp, tf
       end
-      system(*['sox', tfiles.sort, dst_path].flatten) or raise I18n.t("voice_preview.err_concat")
+      system(*['sox', tfiles.sort, dst_path].flatten) or raise Paperclip::Error, I18n.t("voice_preview.err_concat")
     rescue => e
       Rails.logger.error "Failed to generate preview voice: #{e.backtrace.first}: #{e.message}, last error is #{$?}"
       FileUtils.mkdir_p "#{Rails.root}/tmp/failed"