mm_tool 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d40d705d74b1b4494e01bce8000538ca884cb904dcea23073e089ea65ee6384
-  data.tar.gz: c367c05a2fa7fb7f92407668a05270043f79ed207c85aedcaf09215247d3616b
+  metadata.gz: 7fd0db5d0f777335f0b0d8ff8f8951f15c637b5369b6aed458a76374c88c25e9
+  data.tar.gz: 4485a6a345ec99299446c1ce1e9bb2669e2fd100855eb008072aeffab17fdd7a
 SHA512:
-  metadata.gz: 4f1df36ee811600d3ea2370920bf804e5fa7b83b91af047716312909bc163fa1a634e0f468c5ac194ac4f30d2447194a08b86a37433f35f66fba53885843015a
-  data.tar.gz: 92b9fdf1983c761424d8cf66414fa7d2eb9df1e9c4c8e75947462fd07387925615ec857ad6d9690320f9aa5fb0138c463d2ac7557490ab05ca9d5c8642ff205e
+  metadata.gz: 278d8e4b122dfd7249886f2e4645b924b6eb0b527ef56345ec9722637cf848b8d02045e19ebba4816851bf67c9896a0f0c34862fa74b18ca0a895a0031f1f30e
+  data.tar.gz: '00287eb07f06d7d25ac429e35486119253fa95bca403c12d369222da7b8d08d99e284df2bab6148d4af507eacf9f7e46b6e6118caec2fe59ff2f65be0a03edd0'

data/lib/mm_tool/application_main.rb

@@ -72,7 +72,7 @@ module MmTool
       info_table_src << ["Disposition Columns:", MmMovie.dispositions.join(', ')]
       info_table_src << ["Transcode File Location:", self.tempfile ? tempfile&.path : 'n/a']
 
-      info_table = C.bold("Looking for file(s) and processing them with the following options:\n")
+      info_table = C.bold("Looking for file(s) and processing them with the following options:\n").dup
       info_table << info_table_src.render(:basic) do |renderer|
         a = @defaults.label_value_pairs.map {|p| p[0].length }.max + 1
         b = OutputHelper.console_width - a - 2
@@ -111,9 +111,12 @@ module MmTool
           output(file_name)
           output(movie.format_table)
           output(movie.stream_table)
-          output("#{movie.command_rename} ; \\", true)
-          output("#{movie.command_transcode} ; \\", true)
-          output(movie.command_review_post, true)
+          if @defaults[:shell_commands]
+            output("echo '#{File.basename(file_name)}' ; \\", true)
+            output("#{movie.command_rename} ; \\", true)
+            output("#{movie.command_transcode} ; \\", true)
+            output(movie.command_review_post, true)
+          end
           output("\n\n", true)
         end
       end # if

data/lib/mm_tool/mm_movie.rb

@@ -127,6 +127,9 @@ module MmTool
     #------------------------------------------------------------
     def command_transcode
       command = ["ffmpeg \\"]
+      command << "   -hide_banner \\"
+      command << "   -loglevel error \\"
+      command << "   -stats \\"
       @streams.each {|stream| command |= ["   #{stream.instruction_input}"] if stream.instruction_input }
       @streams.each {|stream| command << "   #{stream.instruction_map}" if stream.instruction_map }
       @streams.each {|stream| command << "   #{stream.instruction_action}" if stream.instruction_action }
@@ -145,7 +148,7 @@ module MmTool
     # running the transcode command
     #------------------------------------------------------------
     def command_review_post
-      "\"#{$0}\" --no-use-external-subs \"#{output_path}\""
+      "\"#{$0}\" -is --no-use-external-subs \"#{output_path}\""
     end
 
 

data/lib/mm_tool/mm_movie_stream.rb

@@ -465,9 +465,9 @@ module MmTool
     def encoder_string(for_codec:)
       case for_codec.downcase
       when 'hevc'
-        "libx265 -crf 28 -preset slow"
+        "libx265 -crf 28 -x265-params log-level=error"
       when 'h264'
-        "libx264 -crf 23 -preset slow"
+        "libx264 -crf 23"
       when 'aac'
         "libfdk_aac"
       else

data/lib/mm_tool/mm_tool_cli.rb

@@ -106,23 +106,27 @@ module MmTool
             case char
 
             when 'h'
-              args.insert(1, "--help")
+              args.insert(1, '--help')
             when 'i'
-              args.insert(1, "--no-info-header")
+              args.insert(1, '--no-info-header')
             when 'I'
               args.insert(1, '--info-header')
+            when 's'
+              args.insert(1, '--no-shell-commands')
+            when 'S'
+              args.insert(1, '--shell-commands')
             when 't'
-              args.insert(1, "--transcode")
+              args.insert(1, '--transcode')
             when 'T'
-              args.insert(1, "--no-transcode")
+              args.insert(1, '-no-transcode')
             when 'u'
-              args.insert(1, "--no-fix-undefined-language")
+              args.insert(1, '--no-fix-undefined-language')
             when 'U'
-              args.insert(1, "--fix-undefined-language")
+              args.insert(1, '--fix-undefined-language')
             when 'p'
-              args.insert(1, "--dump")
+              args.insert(1, '--dump')
             when 'P'
-              args.insert(1, "--no-dump")
+              args.insert(1, '--no-dump')
             else
               OutputHelper.print_error_and_exit("Error: option #{C.bold(args[0])} was specified, but I don't know what that means.")
             end
@@ -171,6 +175,12 @@ module MmTool
         when '--info-header'
           @defaults[:info_header] = true
 
+        when '--no-shell-commands'
+          @defaults[:shell_commands] = false
+
+        when '--shell-commands'
+          @defaults[:shell_commands] = true
+
         when '--version'
           puts "#{File.basename $0}, version #{MmTool::VERSION}"
           exit 0

data/lib/mm_tool/user_defaults.rb

@@ -88,6 +88,19 @@ module MmTool
           HEREDOC
       },
 
+      :shell_commands => {
+          :default    => true,
+          :value      => nil,
+          :arg_short  => '-s',
+          :arg_long   => '--no-shell-commands',
+          :arg_format => nil,
+          :item_label => nil,
+          :help_group => 'Main Options',
+          :help_desc  => <<~HEREDOC
+                Don't show the shell commands that should be executed at the end of the output. Good for showing the table only.
+          HEREDOC
+      },
+
       :version => {
           :default    => false,
           :value      => nil,

data/lib/mm_tool/version.rb

@@ -1,3 +1,3 @@
 module MmTool
-  VERSION = "0.1.4"
+  VERSION = "0.1.7"
 end

data/mm_tool.gemspec

@@ -3,18 +3,28 @@ lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "mm_tool/version"
 
+
+# We should work with any 2.0 version of Ruby, but I'm no longer testing them
+# for regressions. Version 2.6.0 goes back to December 2018, and is a suitable
+# minimum version.
+
+#rb_needed = ['~> 2.0']
+
+
 Gem::Specification.new do |spec|
-  spec.name        = 'mm_tool'
-  spec.version     = MmTool::VERSION
-  spec.authors     = ['Jim Derry']
-  spec.email       = ['balthisar@gmail.com']
 
-  spec.summary     = 'Curate your movie files.'
-  spec.description = 'A tool for curating your movie files.'
-  spec.homepage    = 'https://github.com/balthisar/mm_tool'
-  spec.license     = 'MIT'
+#  spec.required_ruby_version = rb_needed
+  spec.name                  = 'mm_tool'
+  spec.version               = MmTool::VERSION
+  spec.authors               = ['Jim Derry']
+  spec.email                 = ['balthisar@gmail.com']
+
+  spec.summary               = 'Curate your movie files.'
+  spec.description           = 'A tool for curating your movie files.'
+  spec.homepage              = 'https://github.com/balthisar/mm_tool'
+  spec.license               = 'MIT'
 
-  spec.platform    = Gem::Platform::RUBY
+  spec.platform              = Gem::Platform::RUBY
 
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -39,13 +49,17 @@ Gem::Specification.new do |spec|
 
 
   # Additional dependencies
-  spec.add_runtime_dependency 'tty', "~>0.10"
+  spec.add_runtime_dependency 'tty-table', "~>0.10"
+  spec.add_runtime_dependency 'tty-command', "~>0.10"
+  spec.add_runtime_dependency 'tty-which', "~>0.4"
+
   spec.add_runtime_dependency 'streamio-ffmpeg'
   spec.add_runtime_dependency 'bytesize'
   spec.add_runtime_dependency 'natural_sort', "0.3.0"
 
   # Development dependencies
-  spec.add_development_dependency "bundler", "~> 1.17.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'git'
+  
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mm_tool
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Jim Derry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tty
+  name: tty-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: tty-command
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: tty-which
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +98,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +147,6 @@ files:
 - ".gitattributes"
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
@@ -158,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Curate your movie files.

data/Gemfile.lock

@@ -1,132 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mm_tool (0.1.4)
-      bytesize
-      natural_sort (= 0.3.0)
-      streamio-ffmpeg
-      tty (~> 0.10)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    bytesize (0.1.0)
-    diff-lcs (1.4.4)
-    equatable (0.6.1)
-    git (1.7.0)
-      rchardet (~> 1.8)
-    kramdown (1.16.2)
-    multi_json (1.15.0)
-    natural_sort (0.3.0)
-    necromancer (0.5.1)
-    pastel (0.7.4)
-      equatable (~> 0.6)
-      tty-color (~> 0.5)
-    rake (13.0.1)
-    rchardet (1.8.0)
-    rouge (3.25.0)
-    streamio-ffmpeg (3.0.2)
-      multi_json (~> 1.8)
-    strings (0.1.8)
-      strings-ansi (~> 0.1)
-      unicode-display_width (~> 1.5)
-      unicode_utils (~> 1.4)
-    strings-ansi (0.1.0)
-    thor (0.20.3)
-    tty (0.10.0)
-      bundler (~> 1.16, < 2.0)
-      equatable (~> 0.5)
-      pastel (~> 0.7.2)
-      thor (~> 0.20.0)
-      tty-box (~> 0.4.1)
-      tty-color (~> 0.5)
-      tty-command (~> 0.9.0)
-      tty-config (~> 0.3.2)
-      tty-cursor (~> 0.7)
-      tty-editor (~> 0.5)
-      tty-file (~> 0.8.0)
-      tty-font (~> 0.4.0)
-      tty-logger (~> 0.2.0)
-      tty-markdown (~> 0.6.0)
-      tty-pager (~> 0.12)
-      tty-pie (~> 0.3.0)
-      tty-platform (~> 0.2)
-      tty-progressbar (~> 0.17)
-      tty-prompt (~> 0.19)
-      tty-screen (~> 0.7)
-      tty-spinner (~> 0.9)
-      tty-table (~> 0.11.0)
-      tty-tree (~> 0.3)
-      tty-which (~> 0.4)
-    tty-box (0.4.1)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.6)
-      tty-cursor (~> 0.7)
-    tty-color (0.6.0)
-    tty-command (0.9.0)
-      pastel (~> 0.7.0)
-    tty-config (0.3.2)
-    tty-cursor (0.7.1)
-    tty-editor (0.5.1)
-      tty-prompt (~> 0.19)
-      tty-which (~> 0.4)
-    tty-file (0.8.0)
-      diff-lcs (~> 1.3)
-      pastel (~> 0.7.2)
-      tty-prompt (~> 0.18)
-    tty-font (0.4.0)
-    tty-logger (0.2.0)
-      pastel (~> 0.7.0)
-    tty-markdown (0.6.0)
-      kramdown (~> 1.16.2)
-      pastel (~> 0.7.2)
-      rouge (~> 3.3)
-      strings (~> 0.1.4)
-      tty-color (~> 0.4)
-      tty-screen (~> 0.6)
-    tty-pager (0.13.0)
-      strings (~> 0.1.8)
-      tty-screen (~> 0.8)
-    tty-pie (0.3.0)
-      pastel (~> 0.7.3)
-      tty-cursor (~> 0.7)
-    tty-platform (0.3.0)
-    tty-progressbar (0.17.0)
-      strings-ansi (~> 0.1.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      unicode-display_width (~> 1.6)
-    tty-prompt (0.21.0)
-      necromancer (~> 0.5.0)
-      pastel (~> 0.7.0)
-      tty-reader (~> 0.7.0)
-    tty-reader (0.7.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      wisper (~> 2.0.0)
-    tty-screen (0.8.1)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
-    tty-table (0.11.0)
-      equatable (~> 0.6)
-      necromancer (~> 0.5)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.5)
-      tty-screen (~> 0.7)
-    tty-tree (0.4.0)
-    tty-which (0.4.2)
-    unicode-display_width (1.7.0)
-    unicode_utils (1.4.0)
-    wisper (2.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.17.3)
-  git
-  mm_tool!
-  rake
-
-BUNDLED WITH
-   1.17.3