ehbrs_ruby_utils 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a5f85d8072d8f656d982d29d5b4267615628ef993347630ed4a796ea3f8937d
-  data.tar.gz: d3c379fc4d4054cd628ed56a7a1ae8647cccf249de77333762d5f2010405561c
+  metadata.gz: 5190ccf9f17c01b8b59b4dc45cb9e711a8f059a755eb8cdb8e3367a6778fcf53
+  data.tar.gz: d9289e10d539ce6c9a5b714d23df7b70ac9b496327559f6eac767f9e864dead7
 SHA512:
-  metadata.gz: 88c6613b66181f404d6530f2d43161e6a6e10bf70da7a96d43867c487066b7e26c2dd44e710775468b06bc612a5c2357463a0e3529a23bc976cf95f636796262
-  data.tar.gz: f99bfc207698e18dcc708b0522ca249eee46288950fe16fd0e5fd554d3537b2c2a431954cc4f0456d08081f5512469fbe4a460dc18313480ded6fc874cb0350c
+  metadata.gz: c87878872a7ae1a224ac658b01c97085ca2b05f38c77dc28d60ab57b150d427af90f5b71defcba1726ab025dc019e8b0d27802a45120386bc7372888773ccc5b
+  data.tar.gz: 7e2e43b0755743b29c00bd9e5dbb39f7168a91122abfc926fcc4107a68acb329dad5ee9e8711ced986a62c190a3efcb694bdd32ff7f5c9a332b3d47d709bd693

data/lib/ehbrs_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EhbrsRubyUtils
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 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/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
 
       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
@@ -34,7 +40,7 @@ module EhbrsRubyUtils
       end
 
       def tags
-        ffprobe_data.fetch(:tags).symbolize_keys
+        ffprobe_data[:tags].if_present({}, &:symbolize_keys)
       end
 
       def language

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -55,8 +55,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

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