ehbrs-tools 0.16.0 → 0.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c933ef15a718774ec5c1a1f2d4915da05a21d76df979e12a901ed036b9794877
-  data.tar.gz: 4b942fb2711d4a9dfc3ff5f89b1ed73167124b0f3974ab1f023ddd3e68724538
+  metadata.gz: 6dc9f681502aa982f3b5f9858770ca29aaf4d993495bf29fdc59e6393a517a47
+  data.tar.gz: 99b2ab99b50446770660561475f1f164e52bd6728b0532423db5062a1ef622ab
 SHA512:
-  metadata.gz: 5a07de2b1b7ec7208b46b14b19e84a69e43a2c3c1d9b29b2e8cebbb253324efbff9390464a26c2d6289542bf5cc41aac08ca5cf64a26a103f5d1ae8b7c2f6d82
-  data.tar.gz: e456a371d70caa2e7bf9a8c34adc950f413e4673dce6f0666b7eed406cf184ae9a042d9cb7e3e7a7fd306f7eaf7ccbd6304c7e778ae925f1999e2f09e3e995e6
+  metadata.gz: e55b14db254112bc093cb6d1b16c590cd21fcfa626d8969eb7d9c672d6652c4c08be83c4e7152bd715ed4b9105b9164d7529471b87ceeb48ca88880237bd5849
+  data.tar.gz: a5c2dc9b6fc43cb397ed01aa7ddbba7d3d466507a1974b4c24d9b68b71285e2e666be34c92935f1a467b20a6f963afde0136fe5968989c719468bb8d7ee42bb8

data/lib/ehbrs/runner/videos/probe.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'ehbrs_ruby_utils/videos/container/file'
+require 'ehbrs_ruby_utils/videos/container'
 require 'eac_ruby_utils/yaml'
 
 module Ehbrs
@@ -18,13 +18,13 @@ module Ehbrs
         end
 
         def output_content
-          ::EacRubyUtils::Yaml.dump(container_file.info.to_h)
+          ::EacRubyUtils::Yaml.dump(container_file.probe_data)
         end
 
         private
 
         def container_file_uncached
-          ::EhbrsRubyUtils::Videos::Container::File.new(parsed.file_path)
+          ::EhbrsRubyUtils::Videos::Container.new(parsed.file_path)
         end
       end
     end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.16.0'
+    VERSION = '0.16.5'
   end
 end

data/lib/ehbrs/vg/wii/wit/parsers/dump.rb

@@ -11,7 +11,11 @@ module Ehbrs
             enable_simple_cache
             common_constructor :output
 
-            FILE_DISC_TYPE_PATTERN = %r{\A(\S+)/(\S+)\s+&\s+(\S+)\z}.freeze
+            # WIA/WII (v1.00,LZMA2.7@100)  &  Wii
+            # ISO/WII  &  Wii
+            # WBFS/WII  &  Wii
+            # ISO/GC  &  GameCube
+            FILE_DISC_TYPE_PATTERN = %r{\A(\S+)/(\S+)\s+(?:\(([^\)]+)\)\s+)?&\s+(\S+)\z}.freeze
 
             private
 
@@ -42,10 +46,11 @@ module Ehbrs
             end
 
             def parse_file_disc_type(value)
-              FILE_DISC_TYPE_PATTERN
-                .match(value)
-                .if_present { |m| { type: m[1], platform_acronym: m[2], platform_name: m[3] } }
-                .if_blank { raise "\"#{FILE_DISC_TYPE_PATTERN}\" does not match \"#{value}\"" }
+              r = FILE_DISC_TYPE_PATTERN.match(value).if_present do |m|
+                { type: m[1], platform_acronym: m[2], type_extra: m[3],
+                  platform_name: m[4] }
+              end
+              r.if_blank { raise "\"#{FILE_DISC_TYPE_PATTERN}\" does not match \"#{value}\"" }
             end
 
             def parse_disc_part_ids(value)

data/lib/ehbrs/videos/file.rb

@@ -3,10 +3,11 @@
 require 'eac_ruby_utils/core_ext'
 require 'ehbrs/videos/track'
 require 'ehbrs_ruby_utils/executables'
+require 'ehbrs_ruby_utils/videos/container'
 
 module Ehbrs
   module Videos
-    class File
+    class File < ::EhbrsRubyUtils::Videos::Container
       enable_simple_cache
 
       TIME_PATTERN = /(\d+):(\d{2}):(\d{2})(?:\.(\d+))/.freeze
@@ -39,17 +40,12 @@ module Ehbrs
         end
       end
 
-      common_constructor :path
-
       private
 
       def tracks_uncached
-        r = []
-        content.each_line do |line|
-          t = ::Ehbrs::Videos::Track.create_from_string(line)
-          r << t if t && t.type != 'Data'
+        streams.map { |stream| ::Ehbrs::Videos::Track.new(stream) }.reject do |t|
+          t.codec_type == ::EhbrsRubyUtils::Videos::Stream::CODEC_TYPE_DATA
         end
-        r
       end
 
       def content_uncached

data/lib/ehbrs/videos/track.rb

@@ -1,25 +1,17 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/videos/stream'
 
 module Ehbrs
   module Videos
-    class Track
-      FFPROBE_PATTERN = /\A\s*Stream\s\#(\d+:\d+)(?:\(([^\)]+)\))?:\s*([^:]+):\s*([a-z0-9]+)(.*)/
-                        .freeze
-      class << self
-        def create_from_string(string)
-          m = FFPROBE_PATTERN.match(string)
-          return nil unless m
-
-          new(m[1].to_i, m[3], m[2], m[4], m[5].strip)
-        end
+    class Track < ::SimpleDelegator
+      def extra
+        ffprobe_data.fetch(:codec_tag_string).to_s
       end
 
-      common_constructor :number, :type, :language, :codec, :extra
-
       def to_s
-        "[#{type}(#{number}): #{codec}/#{language || '-'}" +
+        "[#{codec_type}(#{index}): #{codec_name}/#{language || '-'}" +
           extra.if_present('') { |v| " | #{v}" } + ']'
       end
     end

data/lib/ehbrs/videos/unsupported/checks/codec_extra_unlisted.rb

@@ -5,10 +5,12 @@ module Ehbrs
     module Unsupported
       module Checks
         class CodecExtraUnlisted
+          TYPE = :stream
+
           common_constructor :codec, :listed_extras
 
           def check(track)
-            return nil unless track.codec == codec
+            return nil unless track.codec_name == codec
             return nil if listed_extras.any? do |extra|
               track.extra.downcase.include?(extra.downcase)
             end

data/lib/ehbrs/videos/unsupported/checks/codec_extra_unsupported.rb

@@ -7,10 +7,12 @@ module Ehbrs
     module Unsupported
       module Checks
         class CodecExtraUnsupported
+          TYPE = :stream
+
           common_constructor :codec, :extra
 
           def check(track)
-            return nil unless track.codec == codec
+            return nil unless track.codec_name == codec
             return nil unless track.extra.downcase.include?(extra.downcase)
 
             "Unsupported extra \"#{extra}\" for codec \"#{codec}\" and track #{track}"

data/lib/ehbrs/videos/unsupported/checks/codec_unlisted.rb

@@ -5,12 +5,14 @@ module Ehbrs
     module Unsupported
       module Checks
         class CodecUnlisted
+          TYPE = :stream
+
           common_constructor :listed_codecs
 
           def check(track)
-            return nil if listed_codecs.include?(track.codec)
+            return nil if listed_codecs.include?(track.codec_name)
 
-            "Not listed codec \"#{track.codec}\" (Track: #{track}, listed: #{listed_codecs})"
+            "Not listed codec \"#{track.codec_name}\" (Track: #{track}, listed: #{listed_codecs})"
           end
 
           def fix

data/lib/ehbrs/videos/unsupported/checks/codec_unsupported.rb

@@ -7,10 +7,12 @@ module Ehbrs
     module Unsupported
       module Checks
         class CodecUnsupported
+          TYPE = :stream
+
           common_constructor :codec
 
           def check(track)
-            return nil unless track.codec == codec
+            return nil unless track.codec_name == codec
 
             "Unsupported codec \"#{codec}\" for track #{track}"
           end

data/lib/ehbrs/videos/unsupported/checks/invalid_extension.rb

@@ -7,6 +7,8 @@ module Ehbrs
     module Unsupported
       module Checks
         class InvalidExtension
+          TYPE = :container
+
           common_constructor :extension
 
           def check(video)

data/lib/ehbrs/videos/unsupported/fix_profile.rb

@@ -35,19 +35,6 @@ module Ehbrs
             video.tracks.flat_map(&:ffmpeg_fix_args)
         end
 
-        def track_fix_args(track)
-          ["#{track_codec_option_by_type(track.type)}:#{track.number}",
-           track.passed? ? 'copy' : track_codec_fix_by_type(track.type)]
-        end
-
-        def track_codec_option_by_type(track_type)
-          TRACK_TYPE_OPTIONS.fetch(track_type)
-        end
-
-        def track_codec_fix_by_type(track_type)
-          TRACK_TYPE_FIX_CODECS.fetch(track_type)
-        end
-
         def container_fix_args
           ['-f', ::Ehbrs::Videos::Unsupported::Fixes::SupportedContainer::FIX_FORMAT]
         end

data/lib/ehbrs/videos/unsupported/fixes/supported_codec.rb

@@ -6,28 +6,28 @@ module Ehbrs
       module Fixes
         class SupportedCodec
           TRACK_TYPE_OPTIONS = {
-            'Audio' => '-acodec',
-            'Video' => '-vcodec',
-            'Subtitle' => '-scodec'
+            audio: '-acodec',
+            video: '-vcodec',
+            subtitle: '-scodec'
           }.freeze
 
           TRACK_TYPE_FIX_CODECS = {
-            'Audio' => 'aac',
-            'Video' => 'libx264',
-            'Subtitle' => 'ass'
+            audio: 'libvorbis',
+            video: 'libx264',
+            subtitle: 'ass'
           }.freeze
 
           def ffmpeg_args(track)
-            ["#{track_codec_option_by_type(track.type)}:#{track.number}",
-             track_codec_fix_by_type(track.type)]
+            ["#{track_codec_option_by_type(track.codec_type)}:#{track.index}",
+             track_codec_fix_by_type(track.codec_type)]
           end
 
           def track_codec_option_by_type(track_type)
-            TRACK_TYPE_OPTIONS.fetch(track_type)
+            TRACK_TYPE_OPTIONS.fetch(track_type.to_s.underscore.to_sym)
           end
 
           def track_codec_fix_by_type(track_type)
-            TRACK_TYPE_FIX_CODECS.fetch(track_type)
+            TRACK_TYPE_FIX_CODECS.fetch(track_type.to_s.underscore.to_sym)
           end
         end
       end

data/lib/ehbrs/videos/unsupported/profiles/base.rb

@@ -19,13 +19,21 @@ module Ehbrs
             added_checks << check_path.camelize.constantize.new(*args)
           end
 
+          def base_checks
+            [unlisted_codec_check] + unsupported_codec_checks +
+              supported_codecs.flat_map { |codec| codec_extra_checks(codec) }
+          end
+
+          def checks
+            base_checks + added_checks
+          end
+
           def file_checks
-            added_checks
+            checks.select { |c| check_type(c) == :container }
           end
 
           def track_checks
-            [unlisted_codec_check] + unsupported_codec_checks +
-              supported_codecs.flat_map { |codec| codec_extra_checks(codec) }
+            checks.select { |c| check_type(c) == :stream }
           end
 
           def codec_extra_checks(codec)
@@ -95,6 +103,12 @@ module Ehbrs
           def codec_supported_extras(codec)
             codec_extras(codec, 'supported')
           end
+
+          private
+
+          def check_type(check)
+            check.class.const_get(:TYPE)
+          end
         end
       end
     end

data/lib/ehbrs/videos/unsupported/profiles/philco.rb

@@ -7,19 +7,20 @@ module Ehbrs
     module Unsupported
       module Profiles
         class Philco < ::Ehbrs::Videos::Unsupported::Profiles::Base
-          AUDIO_SUPPORTED_CODECS = %w[aac ac3 eac3 mp3].freeze
-          AUDIO_UNSUPPORTED_CODECS = %w[dts].freeze
+          AUDIO_SUPPORTED_CODECS = %w[aac ac3 eac3 mp3 vorbis wmav2].freeze
+          AUDIO_UNSUPPORTED_CODECS = %w[dts opus].freeze
 
           VIDEO_SUPPORTED_CODECS = %w[h264 mpeg4].freeze
           VIDEO_UNSUPPORTED_CODECS = %w[hevc msmpeg4v3].freeze
 
-          SUBTITLE_SUPPORTED_CODECS = %w[ass dvd subrip].freeze
+          SUBTITLE_SUPPORTED_CODECS = %w[ass dvd dvd_subtitle hdmv_pgs_subtitle mov_text
+                                         subrip].freeze
           SUBTITLE_UNSUPPORTED_CODECS = %w[mov].freeze
 
           OTHER_SUPPORTED_CODECS = %w[png ttf].freeze
 
           MPEG4_EXTRA_SUPPORTED = %w[xvid].freeze
-          MPEG4_EXTRA_UNSUPPORTED = %w[dx50].freeze
+          MPEG4_EXTRA_UNSUPPORTED = %w[divx dx50].freeze
         end
       end
     end

data/vendor/aranha-parsers/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/vendor/aranha-parsers/aranha-parsers.gemspec

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'aranha/parsers/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'aranha-parsers'
+  s.version     = ::Aranha::Parsers::VERSION
+  s.authors     = ['Esquilo Azul Company']
+  s.summary     = 'Parsers\' utilities for Ruby.'
+
+  s.files = Dir['{lib}/**/*', 'Gemfile']
+
+  s.add_dependency 'activesupport', '>= 4.0.0'
+  s.add_dependency 'addressable', '~> 2.7'
+  s.add_dependency 'curb', '~> 0.9.10'
+  s.add_dependency 'eac_ruby_utils', '~> 0.33', '>= 0.33.1'
+  s.add_dependency 'httpclient', '~> 2.8', '>= 2.8.3'
+  s.add_dependency 'ofx-parser', '~> 1.1.0'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1'
+end

data/vendor/aranha-parsers/lib/aranha/parsers.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module Aranha
+  module Parsers
+    ::EacRubyUtils.require_sub __FILE__
+  end
+end

data/vendor/aranha-parsers/lib/aranha/parsers/base.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'open-uri'
+require 'fileutils'
+require 'aranha/parsers/source_address'
+require 'eac_ruby_utils/fs/temp'
+
+module Aranha
+  module Parsers
+    class Base
+      class << self
+        def from_content(content)
+          ::EacRubyUtils::Fs::Temp.on_file do |path|
+            path.write(content)
+            r = new(path.to_path)
+            r.content
+            r
+          end
+        end
+
+        def parse_content(content)
+          from_content(content).data
+        end
+      end
+
+      LOG_DIR_ENVVAR = 'ARANHA_PARSERS_LOG_DIR'
+
+      attr_reader :source_address
+
+      def initialize(url)
+        @source_address = ::Aranha::Parsers::SourceAddress.new(url)
+        log_content(source_address.serialize, '-source-address')
+      end
+
+      delegate :url, to: :source_address
+
+      def content
+        @content ||= begin
+          s = source_address.content
+          log_content(s)
+          s
+        end
+      end
+
+      private
+
+      def log_content(content, suffix = '')
+        path = log_file(suffix)
+
+        return unless path
+
+        File.open(path, 'wb') { |file| file.write(content) }
+      end
+
+      def log_file(suffix)
+        dir = log_parsers_dir
+        return nil unless dir
+
+        f = ::File.join(dir, "#{self.class.name.parameterize}#{suffix}.log")
+        FileUtils.mkdir_p(File.dirname(f))
+        f
+      end
+
+      def log_parsers_dir
+        return ENV[LOG_DIR_ENVVAR] if ENV[LOG_DIR_ENVVAR]
+        return ::Rails.root.join('log', 'parsers') if rails_root_exist?
+
+        nil
+      end
+
+      def rails_root_exist?
+        ::Rails.root
+        true
+      rescue NameError
+        false
+      end
+    end
+  end
+end