Commit: 68192ca299ad30c99dbbcef55376f11f521fe0b5 - Meghsingh (git)

Never give up

Commit MetaInfo

• Révision: 68192ca299ad30c99dbbcef55376f11f521fe0b5 (tree)
• l'heure: 2013-11-06 02:02:07
• Auteur: HMML <hmml3939@gmai...>
• Commiter: HMML

Message de Log

Strict check on preview target files, and translate error.

Change Summary

• modified: config/locales/en.yml
• modified: config/locales/ja.yml
• modified: lib/paperclip_processors/voice_preview.rb

Modification

--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -51,6 +51,7 @@ en:
 
   voice_preview:
     err: "Failed to generate preview voice"
+    err_missing: Audio file is missing. Check the file name in zip.
     err_concat: Failed to concat
     err_not_ogg: File is not OGG/Vorbis format
     err_normalize: Failed on rate/channel normalization

--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -71,6 +71,7 @@ ja:
 
   voice_preview:
     err: プレビューの生成に失敗しました
+    err_missing: 音声ファイルが見つかりません。OGGのファイル名を確認してください。
     err_not_ogg: ファイル形式がOGG/Vorbisではありません
     err_concat: 連結に失敗しました
     err_normalize: サンプルレート/チャネル数の変更に失敗しました

--- a/lib/paperclip_processors/voice_preview.rb
+++ b/lib/paperclip_processors/voice_preview.rb
@@ -38,7 +38,10 @@ class VoicePreview < Paperclip::Processor
           end
         end
       end
-      tfiles.empty? and raise "File missing."
+      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")
+      end
       tfiles.each do |tf|
         `soxi -t "#{tf}"`.chomp.downcase == 'vorbis' &&
           `soxi -e "#{tf}"`.chomp.downcase == 'vorbis' or