active_encode 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f90e9c3cedb039d22d5576047ff97f27007e1ab0a4a42be49a8af6332152237
-  data.tar.gz: cd525b293617c059017568d2bd9d70817213f4b81e9331cf08b330412c8f35c7
+  metadata.gz: 8e79b7e04c4ce64bd75701672631d45b7c7c7a340361295bfc007be2f28aa293
+  data.tar.gz: e5cd432ef6102257eff4d257906961ed1513e81f58520bdc6c6d4f07293d5a5a
 SHA512:
-  metadata.gz: 7cdfba6f2f6f5712ecb9c54f8f7fd61c679559ca07930c43430cc26a85d96e7469d6b1d33061922dc05abf2a287b92676a7c4cf9bc66f4216607cafdc7fa86b3
-  data.tar.gz: 9c7ce5b39d81c746eda7bf54e023c6893300aa6a5bd4743f5afefe430189e62cd7419ff065d86bd3be4368b44bf4005ba18241472d1374f74744700905272ed5
+  metadata.gz: 7126ae7b947b53233cd05f2202fb155a327144e8f611c81640b90611c0c600358e66374908820e7f6df35cb4d0837f8e2487d883b6151b9c3009526e330c7cc5
+  data.tar.gz: 73369f2a8423a4bcc5d346af76f7da2d8c3ca290da5f229218c137fdeb6e6155e1a4db4ade5e947bf78e3a3ef8cc8b35e2941b53767a52d3ecaac8e35211619d

data/.circleci/config.yml

@@ -17,6 +17,7 @@ jobs:
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
+    resource_class: large
     environment:
       ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-coffee --skip-puma --skip-test
       RAILS_VERSION: << parameters.rails_version >>
@@ -37,12 +38,13 @@ jobs:
           keys:
             - v1-ffmpeg-<< parameters.ffmpeg_version >>
 
-      - run: curl https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-<< parameters.ffmpeg_version >>-amd64-static.tar.xz | tar xJ -C /tmp/ --strip-components=1
+      - run: if [ ! -f /tmp/ffmpeg ]; then curl https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-<< parameters.ffmpeg_version >>-amd64-static.tar.xz | tar xJ -C /tmp/ --strip-components=1; fi
 
       - save_cache:
           key: v1-ffmpeg-<< parameters.ffmpeg_version >>`
           paths:
             - /tmp/ffmpeg
+            - /tmp/ffprobe
 
       - samvera/cached_checkout
 
@@ -74,39 +76,27 @@ jobs:
 workflows:
   ci:
     jobs:
+      - bundle_and_test:
+          name: "ruby4-0_rails8-1"
+          ruby_version: "4.0.2"
+          rails_version: "8.1.3"
+      - bundle_and_test:
+          name: "ruby4-0_rails8-0"
+          ruby_version: "4.0.2"
+          rails_version: "8.0.5"
       - bundle_and_test:
           name: "ruby3-4_rails8-0"
-          ruby_version: "3.4.1"
-          rails_version: "8.0.1"
+          ruby_version: "3.4.9"
+          rails_version: "8.0.5"
       - bundle_and_test:
           name: "ruby3-4_rails7-2"
-          ruby_version: "3.4.1"
-          rails_version: "7.2.2.1"
-      - bundle_and_test:
-          name: "ruby3-4_rails7-1"
-          ruby_version: "3.4.1"
-          rails_version: "7.1.5.1"
+          ruby_version: "3.4.9"
+          rails_version: "7.2.3.1"
       - bundle_and_test:
           name: "ruby3-3_rails8-0"
-          ruby_version: "3.3.7"
-          rails_version: "8.0.1"
+          ruby_version: "3.3.11"
+          rails_version: "8.0.5"
       - bundle_and_test:
           name: "ruby3-3_rails7-2"
-          ruby_version: "3.3.7"
-          rails_version: "7.2.2.1"
-      - bundle_and_test:
-          name: "ruby3-3_rails7-1"
-          ruby_version: "3.3.7"
-          rails_version: "7.1.5.1"
-      - bundle_and_test:
-          name: "ruby3-2_rails8-0"
-          ruby_version: "3.2.7"
-          rails_version: "8.0.1"
-      - bundle_and_test:
-          name: "ruby3-2_rails7-2"
-          ruby_version: "3.2.7"
-          rails_version: "7.2.2.1"
-      - bundle_and_test:
-          name: "ruby3-2_rails7-1"
-          ruby_version: "3.2.7"
-          rails_version: "7.1.5.1"
+          ruby_version: "3.3.11"
+          rails_version: "7.2.3.1"

data/active_encode.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "aws-sdk-elastictranscoder"
   spec.add_development_dependency "aws-sdk-mediaconvert", ">= 1.157.0"
   spec.add_development_dependency "aws-sdk-s3"
+  spec.add_development_dependency "benchmark" # Needed for bixby/rubocop with ruby 4+
   spec.add_development_dependency "bixby", '~> 5.0', '>= 5.0.2'
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"

data/lib/active_encode/engine_adapters/ffmpeg_adapter.rb

@@ -201,7 +201,7 @@ module ActiveEncode
       end
 
       def write_errors(encode)
-        File.write(working_path("error.log", encode.id), encode.errors.join("\n"))
+        File.write(working_path("error.log", encode.id), encode.errors.join("\n"), mode: 'a')
         File.write(working_path("exit_status.code", encode.id), "1") unless File.exist?(working_path("exit_status.code", encode.id))
       end
 
@@ -290,7 +290,7 @@ module ActiveEncode
           "#{k}: #{v}\r\n"
         end.join
         header_opt = "-headers '#{header_opt}'" if header_opt.present?
-        "#{FFMPEG_PATH} #{header_opt} -y -loglevel level+fatal -progress #{working_path('progress', id)} -i \"#{input_url}\" #{supplemental_file_opt} #{output_opt}"
+        "#{FFMPEG_PATH} #{header_opt} -y -loglevel level+error -progress #{working_path('progress', id)} -i \"#{input_url}\" -max_muxing_queue_size 1024 #{supplemental_file_opt} #{output_opt}"
       end
 
       def caption_extraction_options(filename, count, id)

data/lib/active_encode/engine_adapters/media_convert_adapter.rb

@@ -519,6 +519,8 @@ module ActiveEncode
         # NOTE: certain audio files don't return any track information
         @probe_cache ||= {}
         @probe_cache[url] ||= mediaconvert.probe({ input_files: [{ file_url: url }] })&.probe_results&.first
+      rescue Aws::MediaConvert::Errors::ServiceError
+        nil
       end
 
       def output_id_format

data/lib/active_encode/engine_adapters/pass_through_adapter.rb

@@ -74,7 +74,7 @@ module ActiveEncode
 
         # Copy derivatives to work directory
         options[:outputs].each do |opt|
-          output_path = copy_derivative_to_working_path(opt[:url], new_encode.id)
+          output_path = copy_derivative_to_working_path(opt[:url], opt[:label], new_encode.id)
           filename_label_hash[output_path] = opt[:label]
         end
 
@@ -286,8 +286,9 @@ module ActiveEncode
         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)
+      def copy_derivative_to_working_path(url, label, id)
+        label_url = add_label_to_url(ActiveEncode.sanitize_base(url), label)
+        output_path = working_path("outputs/#{label_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
@@ -297,6 +298,12 @@ module ActiveEncode
         end
         output_path
       end
+
+      def add_label_to_url(url, label)
+        return url if url.match?(/\-#{label}$/)
+
+        url.gsub(/#{label}$/, '') + "-#{label}"
+      end
     end
   end
 end

data/lib/active_encode/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_encode
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Michael Klein, Chris Colvard, Phuong Dinh
@@ -135,6 +135,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bixby
   requirement: !ruby/object:Gem::Requirement