ehbrs-tools 0.14.1 → 0.16.3

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

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'ehbrs_ruby_utils/videos/container/file'
+require 'ehbrs_ruby_utils/videos/container'
 require 'eac_ruby_utils/yaml'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Videos < ::EacRubyUtils::Console::DocoptRunner
+  class Runner
+    class Videos
       class Probe
-        runner_with :output_file
-
-        runner_definition do
+        runner_with :help, :output_file do
           desc 'FFProbe em um arquivo de vídeo.'
           pos_arg :file_path
         end
@@ -21,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/runner/videos/series.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/core_ext'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Videos < ::EacRubyUtils::Console::DocoptRunner
-      class Series < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
+  class Runner
+    class Videos
+      class Series
         require_sub __FILE__
 
-        runner_definition do
+        runner_with :help, :subcommands do
           desc 'Ferramentas para seriados.'
           subcommands
         end

data/lib/ehbrs/runner/videos/series/rename.rb

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/core_ext'
 require 'ehbrs/videos/series/rename/file'
 require 'ehbrs/videos/series/rename/file/options'
 require 'ehbrs/videos/series/rename/results_builder'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Videos < ::EacRubyUtils::Console::DocoptRunner
-      class Series < ::EacRubyUtils::Console::DocoptRunner
-        class Rename < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
+  class Runner
+    class Videos
+      class Series
+        class Rename
           include ::EacRubyUtils::Fs::Traversable
 
-          runner_definition do
+          runner_with :help do
             desc 'Renomeia arquivos de séries.'
             bool_opt '-r', '--recursive', 'Recursivo.'
             bool_opt '-c', '--confirm', 'Confirmação a renomeação.'
@@ -43,11 +40,11 @@ module Ehbrs
           end
 
           def paths
-            options.fetch('<paths>').if_present(['.'])
+            parsed.paths.if_present(['.'])
           end
 
           def traverser_recursive
-            options.fetch('--recursive')
+            parsed.recursive
           end
 
           def traverser_check_file(path)
@@ -55,7 +52,7 @@ module Ehbrs
           end
 
           def series_file_options_uncached
-            ::Ehbrs::Videos::Series::Rename::File::Options.new(options)
+            ::Ehbrs::Videos::Series::Rename::File::Options.new(parsed)
           end
 
           def show_results

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

@@ -1,21 +1,17 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/core_ext'
 require 'ehbrs/videos/unsupported/check_set'
 require 'ehbrs/videos/unsupported/search'
 require 'ehbrs/videos/unsupported/profiles'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Videos < ::EacRubyUtils::Console::DocoptRunner
-      class Unsupported < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
-
+  class Runner
+    class Videos
+      class Unsupported
         PROFILES = %w[philco samsung].freeze
 
-        runner_definition do
+        runner_with :help do
           desc 'Procura e converte vídeos não suportados pelas TVs de EHB/RS.'
           bool_opt '-f', '--fix', 'Converte vídeos para o formato apropriado.'
           arg_opt '-p', '--profiles', "Seleciona os perfis (#{PROFILES.join(', ')})."
@@ -41,17 +37,17 @@ module Ehbrs
         end
 
         def paths
-          options.fetch('<paths>')
+          parsed.paths
         end
 
         def file_options
           { file_check_set: file_check_set, track_check_set: track_check_set,
-            fix: options.fetch('--fix') }
+            fix: parsed.fix? }
         end
 
         def profiles_uncached
-          options.fetch('--profiles').if_present(PROFILES) { |v| v.split(',').map(&:strip) }
-                 .map { |name| profile_class(name).instance }
+          parsed.profiles.if_present(PROFILES) { |v| v.split(',').map(&:strip) }
+                .map { |name| profile_class(name).instance }
         end
 
         def profile_class(profile_name)

data/lib/ehbrs/runner/web_utils.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'ehbrs_ruby_utils/web_utils/instance'
+
+module Ehbrs
+  class Runner
+    class WebUtils
+      require_sub __FILE__
+
+      runner_with :help, :subcommands do
+        desc 'Ferramentas para EHB/RS Utils.'
+        pos_arg :instance_id
+        subcommands
+      end
+
+      private
+
+      def instance_uncached
+        ::EhbrsRubyUtils::WebUtils::Instance.by_id(parsed.instance_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Ehbrs
+  class Runner
+    class WebUtils
+      class Videos
+        require_sub __FILE__
+
+        runner_with :help, :subcommands do
+          desc 'Ferramentas de vídeos para EHB/RS Utils.'
+          subcommands
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/runner/web_utils/videos/download.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'ehbrs_ruby_utils/web_utils/videos/file'
+
+module Ehbrs
+  class Runner
+    class WebUtils
+      class Videos
+        class Download
+          runner_with :help do
+            desc 'Importa informações de arquivos de vídeo de uma instância EHB/RS Utils.'
+            bool_opt '-c', '--confirm', 'Confirma as mudanças'
+          end
+
+          def run
+            start_banner
+            to_rename.each { |file| process_rename_file(file) }
+            to_delete.each { |file| process_delete_file(file) }
+          end
+
+          private
+
+          def start_banner
+            infov 'Files downloaded', files.count
+            infov 'To rename', to_rename.count
+            infov 'To delete', to_delete.count
+          end
+
+          def process_rename_file(file)
+            infov "  * #{file.new_path}", file.original_path
+            file.rename if parsed.confirm?
+          end
+
+          def process_delete_file(file)
+            infov "  * #{file.new_path}", 'REMOVE'
+            file.remove if parsed.confirm?
+          end
+
+          def files_uncached
+            data.map { |file_data| ::EhbrsRubyUtils::WebUtils::Videos::File.new(file_data) }
+          end
+
+          def to_rename_uncached
+            files.select(&:path_changed?)
+          end
+
+          def to_delete_uncached
+            files.reject { |f| f.type == 'Videos::SeriesDirectory' }.select(&:unwanted)
+          end
+
+          def data_uncached
+            ::JSON.parse(raw_content)
+          end
+
+          def raw_content
+            runner_context.call(:instance).http_request('/videos/files/export').body
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/runner/web_utils/videos/upload.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'ehbrs_ruby_utils/web_utils/videos/files_list'
+require 'json'
+require 'yaml'
+
+module Ehbrs
+  class Runner
+    class WebUtils
+      class Videos
+        class Upload
+          runner_with :help do
+            desc 'Exporta informações de arquivos de vídeo para uma instância EHB/RS Utils.'
+            bool_opt '-P', '--no-ffprobe', 'Não recupera dados com "ffprobe".'
+          end
+
+          def run
+            %w[movies series].each { |type| upload_files_list(type) }
+          end
+
+          def upload_files_list(type)
+            infom "Uploading \"#{type}\" files list..."
+            files_list_path = send("#{type}_files_list")
+            infov 'Path', files_list_path
+            process_response(upload_request(files_list_path))
+          end
+
+          def upload_request(files_list_path)
+            runner_context.call(:instance).http_request(
+              '/videos/files/import',
+              method: :put,
+              body: {
+                'videos_tableless_local_import_list[list_file]' => ::File.new(files_list_path)
+              },
+              header: {
+                'Accept' => 'application/json'
+              }
+            )
+          end
+
+          def process_response(response)
+            infov 'Response status', response.status
+            if response.status == 200
+              pp ::JSON.parse(response.body) # rubocop:disable Rails/Output
+            else
+              error_file = '/tmp/ehbrsutils.html'
+              ::File.write(error_file, response.body)
+              system('firefox', error_file)
+              fatal_error('Retornou com status de erro: ' + error_file)
+            end
+          end
+
+          def series_files_list_uncached
+            write_files_list('Videos::SeriesDirectory', :series_directory)
+          end
+
+          def movies_files_list_uncached
+            write_files_list('Videos::MovieFile', :movies_directory)
+          end
+
+          def write_files_list(file_class, read_entry)
+            files_list = ::EhbrsRubyUtils::WebUtils::Videos::FilesList.new(
+              file_class,
+              runner_context.call(:instance).read_entry(read_entry),
+              ffprobe: !parsed.no_ffprobe?
+            )
+            infov 'Files found', files_list.data.fetch(:files).count
+            files_list.write_to
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.14.1'
+    VERSION = '0.16.3'
   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/series/rename/file/options.rb

@@ -6,21 +6,11 @@ module Ehbrs
       module Rename
         class File
           class Options
-            def initialize(docopt_runner_options)
-              @options = docopt_runner_options
-            end
-
-            %w[kernel confirm recursive extension].each do |method|
-              class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-      def #{method}
-        @options.fetch('--#{method}')
-      end
-              RUBY_EVAL
-            end
+            common_constructor :options
+            delegate :kernel, :confirm, :recursive, :extension, to: :options
 
             def episode_increment
-              r = @options.fetch('--episode-increment')
-              r.present? ? r.to_i : 0
+              options.episode_increment.if_present(0, &:to_i)
             end
           end
         end

data/lib/ehbrs/videos/track.rb

@@ -1,22 +1,32 @@
 # 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
+    class Track < ::SimpleDelegator
+      TYPE_MAPPING = {
+        audio: 'Audio',
+        video: 'Video',
+        subtitle: 'Subtitle'
+      }.freeze
 
-          new(m[1].to_i, m[3], m[2], m[4], m[5].strip)
-        end
+      def codec
+        codec_name
       end
 
-      common_constructor :number, :type, :language, :codec, :extra
+      def type
+        TYPE_MAPPING.fetch(codec_type)
+      end
+
+      def number
+        index
+      end
+
+      def extra
+        ffprobe_data.fetch(:codec_tag_string).to_s
+      end
 
       def to_s
         "[#{type}(#{number}): #{codec}/#{language || '-'}" +