ehbrs-tools 0.16.1 → 0.17.0

data/lib/ehbrs/runner/cooking_book/build.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'ehbrs/cooking_book/build'
+
+module Ehbrs
+  class Runner
+    class CookingBook
+      class Build
+        runner_with :help, :subcommands do
+          desc 'Operações para livros de receitas.'
+          arg_opt '-d', '--target-dir', 'Caminho para o diretório destino da construção.'
+        end
+
+        def run
+          infov 'Project', build.project
+          infov 'Target directory', build.target_dir
+          build.run
+          success 'Done'
+        end
+
+        private
+
+        def build_uncached
+          ::Ehbrs::CookingBook::Build.new(
+            runner_context.call(:project), target_dir: parsed.target_dir
+          )
+        end
+      end
+    end
+  end
+end

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/application.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/application'
+
+module Ehbrs
+  module Tools
+    class << self
+      def application
+        @application ||= ::EacRubyBase0::Application.new(::File.expand_path('../../..', __dir__))
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.16.1'
+    VERSION = '0.17.0'
   end
 end

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/template/ehbrs/cooking_book/build/base_page/layout.html.erb

@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+  <head>
+    <title><%= title %></title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css"
+          rel="stylesheet"
+          integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1"
+          crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js"
+            integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW"
+            crossorigin="anonymous"
+    ></script>
+  </head>
+  <body>
+    <h1><%= title %></h1>
+    <%= inner_content %>
+  </body>
+</html>

data/template/ehbrs/cooking_book/build/index_page/inner.html.erb

@@ -0,0 +1,6 @@
+<h2>Receitas</h2>
+<ul>
+  <% parent.recipes_pages.each do |rp| %>
+    <li><a href="<%= rp.href %>" ><%= rp.title %></a></li>
+  <% end %>
+</ul>

data/template/ehbrs/cooking_book/build/recipe_page/inner.html.erb

@@ -0,0 +1,6 @@
+<% if notes.present? %>
+  <p><%= notes %></p>
+<% end %>
+<% parts.each do |part| %>
+  <%= part.content  %>
+<% end %>

data/template/ehbrs/cooking_book/build/recipe_page/part.html.erb

@@ -0,0 +1,27 @@
+<h2><%= title %></h2>
+<h3>Ingredientes</h3>
+<% if notes.present? %>
+  <%= notes %>
+<% end %>
+<table class="table">
+  <thead>
+    <tr>
+      <th scope="col">Ingrediente</th>
+      <th scope="col">Medida</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% ingredients.each do |ingredient| %>
+      <tr>
+        <th scope="row"><%= ingredient.name %></th>
+        <td><%= ingredient.measure %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<h3>Preparo</h3>
+<ol>
+  <% steps.each do |step| %>
+    <li><%= step %></li>
+  <% end %>
+</ol>

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

@@ -20,8 +20,8 @@ RSpec.shared_examples 'source_target_fixtures' do |spec_file| # rubocop:disable
         source_target_fixtures.source_files.each do |source_file|
           sd = sort_results(source_data(source_file))
           basename = ::Aranha::Parsers::SourceTargetFixtures.source_target_basename(source_file)
-          target_file = File.expand_path("../#{basename}.target.yaml", source_file)
-          File.write(target_file, sd.to_yaml)
+          target_file = File.expand_path("../#{basename}.target#{target_file_extname}", source_file)
+          File.write(target_file, target_content(sd))
         end
       end
     else
@@ -67,4 +67,12 @@ RSpec.shared_examples 'source_target_fixtures' do |spec_file| # rubocop:disable
   def target_data(target_file)
     ::YAML.load_file(target_file)
   end
+
+  def target_content(data)
+    data.to_yaml
+  end
+
+  def target_file_extname
+    '.yaml'
+  end
 end

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

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.6.1'
+    VERSION = '0.7.0'
   end
 end

data/vendor/eac_cli/eac_cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.50'
+  s.add_dependency 'eac_ruby_utils', '~> 0.55'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
 end