active_encode 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e6ade3d61ad1841bcc39b5fbb7b2574a193c420cd2de46ccd8870673e2a97b
-  data.tar.gz: daa888be0970d54530da2d1dcbc3fcb0eb4e254ba52e219e6e83c8a054c6e445
+  metadata.gz: aa6172de1470349b8dd8c2422c51049402168ca45eba77aa62ab6b7d9637f4ae
+  data.tar.gz: 999ec2e97a500f3bb258db4d4fbfa6e5fa4132dfefb4a82da1667eefa6875cff
 SHA512:
-  metadata.gz: ea736ead421bf6640916c675ba1b6f2529206ababccf9dd25776ba049a9eedd390171d0e2dd87c61c3fc68acdd80731cd86b8f35798435153fe6289f7c8fa8d0
-  data.tar.gz: 753701c6f655a8ae671d1dd4c2538a5ae2ef47abe797297e9ffdd3c810f7c995ce2949a047b721405f34b4c83c132c29981bdb7e2416ac49813e18257e20bd40
+  metadata.gz: a78df8af781cf5f4f198a9b4d9e994108294fd0248725d9b6553a96fb829de41afc7a7ccc69cadacafe8d6cb4ac809cb4331c2331c968b7429b7306e19cf3f51
+  data.tar.gz: 358557321351790685a68c4604d6ca43592c928523085e96f5353603ffe8ad0bfc70b6bcde119b2275cb3d3bbec7b6be78c74b84c3f65900dcd2f0e8f3c38421

data/.circleci/config.yml

@@ -25,6 +25,7 @@ jobs:
     steps:
       - run: 
           command: |
+            sudo rm /etc/apt/sources.list.d/google-chrome.list # We don't need chrome and it is causing problems so just remove it
             sudo apt-get update
             sudo apt-get install libmms0
             sudo wget -P /tmp/ https://mediaarea.net/download/binary/libzen0/0.4.39/libzen0v5_0.4.39-1_amd64.Debian_11.deb

data/lib/active_encode/engine_adapters/ffmpeg_adapter.rb

@@ -28,6 +28,8 @@ module ActiveEncode
 
           s3_object = FileLocator::S3File.new(input_url).object
           input_url = URI.parse(s3_object.presigned_url(:get))
+        when /^https?\:\/\//
+          input_url = URI.parse(input_url)
         end
 
         new_encode = ActiveEncode::Base.new(input_url, options)
@@ -232,7 +234,7 @@ module ActiveEncode
         Dir["#{File.absolute_path(working_path('outputs', id))}/*"].each do |file_path|
           output = ActiveEncode::Output.new
           output.url = "file://#{file_path}"
-          sanitized_filename = ActiveEncode.sanitize_base encode.input.url
+          sanitized_filename = encode.input.url.match?(/^https?\:\/\//) ? ActiveEncode.sanitize_base(URI.parse(encode.input.url)) : ActiveEncode.sanitize_base(encode.input.url)
           output.label = file_path[/#{Regexp.quote(sanitized_filename)}.*\-(.*?)#{Regexp.quote(File.extname(file_path))}$/, 1]
           output.id = "#{encode.input.id}-#{output.label}"
           output.created_at = encode.created_at

data/lib/active_encode/engine_adapters/pass_through_adapter.rb

@@ -17,10 +17,8 @@ module ActiveEncode
       MEDIAINFO_PATH = ENV["MEDIAINFO_PATH"] || "mediainfo"
       FFMPEG_PATH = ENV["FFMPEG_PATH"] || "ffmpeg"
 
-      def create(input_url, options = {})
-        # Decode file uris for ffmpeg (mediainfo works either way)
-        input_url = Addressable::URI.unencode(input_url) if input_url.starts_with? "file:///"
-        input_url = ActiveEncode.sanitize_input(input_url)
+      def create(original_input_url, options = {})
+        input_url = sanitize_input_url(original_input_url)
 
         new_encode = ActiveEncode::Base.new(input_url, options)
         new_encode.id = SecureRandom.uuid
@@ -76,9 +74,7 @@ module ActiveEncode
 
         # Copy derivatives to work directory
         options[:outputs].each do |opt|
-          url = opt[:url]
-          output_path = working_path("outputs/#{ActiveEncode.sanitize_base opt[:url]}#{File.extname opt[:url]}", new_encode.id)
-          FileUtils.cp FileLocator.new(url).location, output_path
+          output_path = copy_derivative_to_working_path(opt[:url], new_encode.id)
           filename_label_hash[output_path] = opt[:label]
         end
 
@@ -271,6 +267,31 @@ module ActiveEncode
         write_errors new_encode
         new_encode
       end
+
+      def sanitize_input_url(url)
+        input_url = if url.starts_with?("file://")
+                      # Decode file uris for ffmpeg (mediainfo works either way)
+                      Addressable::URI.unencode(url)
+                    elsif url.starts_with?("s3://")
+                      # Change s3 uris into presigned http urls
+                      FileLocator.new(url).location
+                    else
+                      url
+                    end
+        ActiveEncode.sanitize_input(input_url)
+      end
+
+      def copy_derivative_to_working_path(url, id)
+        output_path = working_path("outputs/#{ActiveEncode.sanitize_base url}#{File.extname url}", id)
+        if url.start_with? "s3://"
+          # Use aws-sdk-s3 download_file method
+          # Single request mode needed for compatibility with minio
+          FileLocator::S3File.new(url).object.download_file(output_path, mode: 'single_request')
+        else
+          FileUtils.cp FileLocator.new(url).location, output_path
+        end
+        output_path
+      end
     end
   end
 end

data/lib/active_encode/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveEncode
-  VERSION = '1.2.1'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_encode
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Michael Klein, Chris Colvard, Phuong Dinh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -303,7 +303,7 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -318,8 +318,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Declare encode job classes that can be run by a variety of encoding services
 test_files: []