From b852ef2660dac36e348865b455fab7fbcc0d2a7f Mon Sep 17 00:00:00 2001
From: George Claghorn <george.claghorn@gmail.com>
Date: Fri, 1 Dec 2017 11:07:30 -0500
Subject: Make ASt previewer/analyzer binary paths configurable

---
 .../lib/active_storage/analyzer/video_analyzer.rb     |  4 +++-
 activestorage/lib/active_storage/engine.rb            | 19 ++++++++++++++++++-
 .../lib/active_storage/previewer/pdf_previewer.rb     |  9 ++++++++-
 .../lib/active_storage/previewer/video_previewer.rb   |  4 +++-
 4 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'activestorage')

diff --git a/activestorage/lib/active_storage/analyzer/video_analyzer.rb b/activestorage/lib/active_storage/analyzer/video_analyzer.rb
index 408b5e58e9..b6fc54d917 100644
--- a/activestorage/lib/active_storage/analyzer/video_analyzer.rb
+++ b/activestorage/lib/active_storage/analyzer/video_analyzer.rb
@@ -19,6 +19,8 @@ module ActiveStorage
   # This analyzer requires the {ffmpeg}[https://www.ffmpeg.org] system library, which is not provided by Rails. You must
   # install ffmpeg yourself to use this analyzer.
   class Analyzer::VideoAnalyzer < Analyzer
+    class_attribute :ffprobe_path, default: "ffprobe"
+
     def self.accept?(blob)
       blob.video?
     end
@@ -68,7 +70,7 @@ module ActiveStorage
       end
 
       def probe_from(file)
-        IO.popen([ "ffprobe", "-print_format", "json", "-show_streams", "-v", "error", file.path ]) do |output|
+        IO.popen([ ffprobe_path, "-print_format", "json", "-show_streams", "-v", "error", file.path ]) do |output|
           JSON.parse(output.read)
         end
       rescue Errno::ENOENT
diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb
index 6cf6635c4f..b870e6d4d6 100644
--- a/activestorage/lib/active_storage/engine.rb
+++ b/activestorage/lib/active_storage/engine.rb
@@ -15,7 +15,8 @@ module ActiveStorage
 
     config.active_storage = ActiveSupport::OrderedOptions.new
     config.active_storage.previewers = [ ActiveStorage::Previewer::PDFPreviewer, ActiveStorage::Previewer::VideoPreviewer ]
-    config.active_storage.analyzers  = [ ActiveStorage::Analyzer::ImageAnalyzer, ActiveStorage::Analyzer::VideoAnalyzer ]
+    config.active_storage.analyzers = [ ActiveStorage::Analyzer::ImageAnalyzer, ActiveStorage::Analyzer::VideoAnalyzer ]
+    config.active_storage.paths = ActiveSupport::OrderedOptions.new
 
     config.eager_load_namespaces << ActiveStorage
 
@@ -68,5 +69,21 @@ module ActiveStorage
         end
       end
     end
+
+    initializer "active_storage.paths" do
+      config.after_initialize do |app|
+        if ffprobe_path = app.config.active_storage.paths.ffprobe
+          ActiveStorage::Analyzer::VideoAnalyzer.ffprobe_path = ffprobe_path
+        end
+
+        if ffmpeg_path = app.config.active_storage.paths.ffmpeg
+          ActiveStorage::Previewer::VideoPreviewer.ffmpeg_path = ffmpeg_path
+        end
+
+        if mutool_path = app.config.active_storage.paths.mutool
+          ActiveStorage::Previewer::PDFPreviewer.mutool_path = mutool_path
+        end
+      end
+    end
   end
 end
diff --git a/activestorage/lib/active_storage/previewer/pdf_previewer.rb b/activestorage/lib/active_storage/previewer/pdf_previewer.rb
index a2f05c74a6..b84aefcc9c 100644
--- a/activestorage/lib/active_storage/previewer/pdf_previewer.rb
+++ b/activestorage/lib/active_storage/previewer/pdf_previewer.rb
@@ -2,16 +2,23 @@
 
 module ActiveStorage
   class Previewer::PDFPreviewer < Previewer
+    class_attribute :mutool_path, default: "mutool"
+
     def self.accept?(blob)
       blob.content_type == "application/pdf"
     end
 
     def preview
       download_blob_to_tempfile do |input|
-        draw "mutool", "draw", "-F", "png", "-o", "-", input.path, "1" do |output|
+        draw_first_page_from input do |output|
           yield io: output, filename: "#{blob.filename.base}.png", content_type: "image/png"
         end
       end
     end
+
+    private
+      def draw_first_page_from(file, &block)
+        draw mutool_path, "draw", "-F", "png", "-o", "-", file.path, "1", &block
+      end
   end
 end
diff --git a/activestorage/lib/active_storage/previewer/video_previewer.rb b/activestorage/lib/active_storage/previewer/video_previewer.rb
index 49f128d142..5d06e33f44 100644
--- a/activestorage/lib/active_storage/previewer/video_previewer.rb
+++ b/activestorage/lib/active_storage/previewer/video_previewer.rb
@@ -2,6 +2,8 @@
 
 module ActiveStorage
   class Previewer::VideoPreviewer < Previewer
+    class_attribute :ffmpeg_path, default: "ffmpeg"
+
     def self.accept?(blob)
       blob.video?
     end
@@ -16,7 +18,7 @@ module ActiveStorage
 
     private
       def draw_relevant_frame_from(file, &block)
-        draw "ffmpeg", "-i", file.path, "-y", "-vcodec", "png",
+        draw ffmpeg_path, "-i", file.path, "-y", "-vcodec", "png",
           "-vf", "thumbnail", "-vframes", "1", "-f", "image2", "-", &block
       end
   end
-- 
cgit v1.2.3