ehbrs_ruby_utils 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a5f85d8072d8f656d982d29d5b4267615628ef993347630ed4a796ea3f8937d
-  data.tar.gz: d3c379fc4d4054cd628ed56a7a1ae8647cccf249de77333762d5f2010405561c
+  metadata.gz: 86d2b7290ba8a20d4c3f8a87ed7d3fecb6d4fd877d700524ce7c467a40f96cf7
+  data.tar.gz: f3817effe28180094b3d6fd1182d9bea026f7de3c98debdc1b13fd855eb8486a
 SHA512:
-  metadata.gz: 88c6613b66181f404d6530f2d43161e6a6e10bf70da7a96d43867c487066b7e26c2dd44e710775468b06bc612a5c2357463a0e3529a23bc976cf95f636796262
-  data.tar.gz: f99bfc207698e18dcc708b0522ca249eee46288950fe16fd0e5fd554d3537b2c2a431954cc4f0456d08081f5512469fbe4a460dc18313480ded6fc874cb0350c
+  metadata.gz: 3fac516de86eb3e88e7cc30263d5b97a94e8fd542d75fda8b0e3f49604ada03a1897f9bac167da3dff88e7668583e6dca223d65a8bfd2f92b6b6f5aa78ba9c6b
+  data.tar.gz: 07c97a47c7e2b7ece00d7a1f2ed0d4f929b189139ad27c505f7231f4d6891bbfc9976908ff5105b3766b303f19b06215260bc114371de7861c2dbfd63aa3c4e0

data/lib/ehbrs_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EhbrsRubyUtils
-  VERSION = '0.4.0'
+  VERSION = '0.6.1'
 end

data/lib/ehbrs_ruby_utils/videos/container.rb

@@ -1,11 +1,39 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/executables'
+require 'ehbrs_ruby_utils/videos/stream'
+require 'json'
 
 module EhbrsRubyUtils
   module Videos
-    module Container
-      require_sub __FILE__
+    class Container
+      enable_simple_cache
+      common_constructor :path do
+        self.path = path.to_pathname
+      end
+
+      ::EhbrsRubyUtils::Videos::Stream.lists.codec_type.each_value do |stream_type|
+        define_method stream_type.to_s.pluralize do
+          streams.select { |stream| stream.codec_type == stream_type }
+        end
+      end
+
+      private
+
+      def probe_data_uncached
+        ::JSON.parse(
+          ::EhbrsRubyUtils::Executables.ffprobe.command(
+            '-hide_banner', '-print_format', 'json', '-show_format', '-show_streams', path
+          ).execute!
+        ).deep_symbolize_keys.freeze
+      end
+
+      def streams_uncached
+        probe_data.fetch(:streams).map do |stream_ffprobe_data|
+          ::EhbrsRubyUtils::Videos::Stream.new(stream_ffprobe_data)
+        end
+      end
     end
   end
 end

data/lib/ehbrs_ruby_utils/videos/convert_job.rb

@@ -11,7 +11,7 @@ module EhbrsRubyUtils
         'matroska' => '.mkv'
       }.freeze
 
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
       common_constructor :input, :ffmpeg_convert_args do
         self.input = input.to_pathname.expand_path

data/lib/ehbrs_ruby_utils/videos/stream.rb

@@ -8,13 +8,19 @@ module EhbrsRubyUtils
       enable_simple_cache
       enable_listable
 
-      lists.add_symbol :codec_type, :audio, :video, :subtitle, :other
+      lists.add_symbol :codec_type, :audio, :video, :subtitle, :data, :attachment
 
       common_constructor :ffprobe_data do
         self.ffprobe_data = ffprobe_data.symbolize_keys.freeze
         self.class.lists.codec_type.value_validate!(codec_type)
       end
 
+      lists.codec_type.each_value do |v|
+        define_method "#{v}?" do
+          codec_type == v
+        end
+      end
+
       def to_s
         "#{index}|#{codec_type}|#{codec_name}|#{language}"
       end
@@ -23,23 +29,33 @@ module EhbrsRubyUtils
         ffprobe_data
       end
 
-      %i[index codec_name codec_long_name].each do |method_name|
+      %i[index].each do |method_name|
         define_method method_name do
           ffprobe_data.fetch(method_name)
         end
       end
 
+      %i[codec_name codec_long_name].each do |method_name|
+        define_method method_name do
+          ffprobe_data[method_name]
+        end
+      end
+
       def codec_type
         ffprobe_data.fetch(:codec_type).to_sym
       end
 
       def tags
-        ffprobe_data.fetch(:tags).symbolize_keys
+        ffprobe_data[:tags].if_present({}, &:symbolize_keys)
       end
 
       def language
         tags[:language]
       end
+
+      def title
+        tags[:title]
+      end
     end
   end
 end

data/lib/ehbrs_ruby_utils/web_utils/videos/files_list.rb

@@ -8,7 +8,7 @@ module EhbrsRubyUtils
   module WebUtils
     module Videos
       class FilesList
-        enable_console_speaker
+        enable_speaker
         enable_simple_cache
 
         common_constructor :type_class, :root_path, :options do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -16,34 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.70'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.70'
 - !ruby/object:Gem::Dependency
-  name: eac_ruby_gem_support
+  name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_gem_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.3'
 description: 
 email: 
 executables: []
@@ -55,8 +63,6 @@ files:
 - lib/ehbrs_ruby_utils/version.rb
 - lib/ehbrs_ruby_utils/videos.rb
 - lib/ehbrs_ruby_utils/videos/container.rb
-- lib/ehbrs_ruby_utils/videos/container/file.rb
-- lib/ehbrs_ruby_utils/videos/container/info.rb
 - lib/ehbrs_ruby_utils/videos/convert_job.rb
 - lib/ehbrs_ruby_utils/videos/quality.rb
 - lib/ehbrs_ruby_utils/videos/resolution.rb
@@ -84,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Utilities for EHB/RS's Ruby projects.

data/lib/ehbrs_ruby_utils/videos/container/file.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-require 'eac_ruby_utils/core_ext'
-require 'ehbrs_ruby_utils/executables'
-require 'ehbrs_ruby_utils/videos/container/info'
-require 'ehbrs_ruby_utils/videos/stream'
-
-module EhbrsRubyUtils
-  module Videos
-    module Container
-      class File
-        enable_simple_cache
-        common_constructor :path do
-          self.path = path.to_pathname
-        end
-
-        ::EhbrsRubyUtils::Videos::Stream.lists.codec_type.each_value do |stream_type|
-          define_method stream_type.to_s.pluralize do
-            streams.select { |stream| stream.codec_type == stream_type }
-          end
-        end
-
-        private
-
-        def info_uncached
-          ::EhbrsRubyUtils::Videos::Container::Info.new(
-            ::JSON.parse(
-              ::EhbrsRubyUtils::Executables.ffprobe.command(
-                '-hide_banner', '-print_format', 'json', '-show_format', '-show_streams', path
-              ).execute!
-            )
-          )
-        end
-
-        def streams_uncached
-          info.ffprobe_data.fetch(:streams).map do |stream_ffprobe_data|
-            ::EhbrsRubyUtils::Videos::Stream.new(stream_ffprobe_data)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs_ruby_utils/videos/container/info.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'ehbrs_ruby_utils/videos/container/info'
-
-module EhbrsRubyUtils
-  module Videos
-    module Container
-      class Info
-        enable_simple_cache
-        common_constructor :ffprobe_data do
-          self.ffprobe_data = ffprobe_data.with_indifferent_access.freeze
-        end
-
-        def to_h
-          ffprobe_data
-        end
-      end
-    end
-  end
-end