mm_tool 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 236711e162216210ed419200d7fb23c13dce2d7917a250e98dbc3593c7c6f378
-  data.tar.gz: af02dd4afc8018751ab769db40c0671a00b774454ed28ae98a782c3084066789
+  metadata.gz: 0d69efe53e6d0c00bc51cf406efdede9770fcb34c7b0aefb576cb9065d26a94d
+  data.tar.gz: dd6b5aa461fe6c5327ebef47a9448b2eefadb1ae76c5bb39f21af4e633df2d2d
 SHA512:
-  metadata.gz: affc8eb70beb7b0d3b5cf564825c434e7cea2c15e2a3ef888b72e238f508f83e41a61a5ff1ef2a3a365d0e49b651e29cf45a9a177f3a8dba7202cb5deb1bbc99
-  data.tar.gz: ee58ae8dfda2803d320c98432526db9edd30b0e02f5b3a8bcf780880847e2d8571e4dcc0b9b2f2d3362539e06b9901cdcaa900291977fbfd89ab67ff7aa4486c
+  metadata.gz: b1eaa1923e61797b431fa7c508d7c68d09301134fec695c59e19bb3093e44b8a0f972c0856d17b7f1c5a4a311d1c41512394d4951c668b2155a5f3b04c9ce191
+  data.tar.gz: f41098c3dbbd7525829ab2bce37991d3fb461c0d2b22c0980b73e5741481daa06194d04c229b0c744705cd7488a722bf8e47bfc6289d74b3ee23681b460173a9

data/LICENSE.md

@@ -1,7 +1,7 @@
 The MIT License
 ===============
 
-Copyright (c) 2020 Jim Derry
+Copyright (c) 2020-2024 Jim Derry
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -42,3 +42,54 @@ remuxing, and re-encoding media libraries.
 - 0.1.4
 
   - Hot fix.
+
+- 0.1.5
+
+  - Updated for Ruby 2.7 compatibility.
+
+- 0.1.6
+
+  - Make ffmpeg output less verbose.
+  - Don't do "slow" video conversions.
+
+- 0.1.7
+
+  - Added `shell_commands` user default, so that we can suppress the printing of
+    the shell commands, such as when summarizing the work already performed.
+
+- 0.1.8
+
+  - Fix single quoting.
+
+- 0.1.9
+
+  - Add different encoder support.
+
+- 0.1.10
+
+  - Fix underscore issue.
+
+
+- 0.1.11
+
+  - Add force (re-encode) option.
+
+- 0.1.12
+
+  - Fix preference, shorten string.
+
+- 0.1.13
+
+  - Put the name of the temporary file at the end of output, so we don't have to scroll all the way to the top
+    to find out what it is.
+
+  - Plant a flag when we've touched a file.
+
+    - For whole file:
+      - MM_TOOL_ENCODED=true|false       Set to true if any part of the file was transcoded.
+      - MM_TOOL_WRITTEN=true|false       Set to true if the file was written by mm_tool, for example, possibly
+                                         nothing was transcoded, but streams were dropped or added. If EVERY stream
+                                         is copy ONLY, then we don't apply this.
+
+    - For streams:
+    - MM_TOOL_ENCODED_STREAM=true|false  Set to true if the stream is transcoded.

data/lib/mm_tool/application_main.rb

@@ -180,7 +180,10 @@ module MmTool
         exit 1
       end
 
-      output("#{File.basename($0)} processed #{@file_count[:processed]} files and displayed data for #{@file_count[:displayed]} of them.")
+      unless @defaults[:shell_commands]
+        output("Transcode File Location: #{tempfile&.path}") if @tempfile
+        output("#{File.basename($0)} processed #{@file_count[:processed]} files and displayed data for #{@file_count[:displayed]} of them.")
+      end
 
     ensure
       if @tempfile

data/lib/mm_tool/mm_movie.rb

@@ -69,6 +69,20 @@ module MmTool
       @format_metadata&.dig(:tags, :title)
     end
 
+    #------------------------------------------------------------
+    # Get the file-level 'MM_TOOL_ENCODED' metadata.
+    #------------------------------------------------------------
+    def format_mm_tool_encoded
+      @format_metadata&.dig(:tags, :MM_TOOL_ENCODED)&.downcase == 'true'
+    end
+
+    #------------------------------------------------------------
+    # Get the file-level 'MM_TOOL_WRITTEN' metadata.
+    #------------------------------------------------------------
+    def format_mm_tool_written
+      @format_metadata&.dig(:tags, :MM_TOOL_WRITTEN)&.downcase == 'true'
+    end
+
     #------------------------------------------------------------
     # Indicates whether any of the streams are of a lower
     # quality than desired by the user.
@@ -93,16 +107,28 @@ module MmTool
       @streams.count {|stream| stream.interesting?} > 0 || format_title
     end
 
+    #------------------------------------------------------------
+    # Indicates whether any of the streams are to be modified
+    # in any form.
+    #------------------------------------------------------------
+    def modify_streams?
+      number_of_copy_only = @streams.count {|stream| stream.copy_only?}
+      number_of_streams = @streams.count
+      number_of_streams > number_of_copy_only
+      # result = @streams.count {|stream| stream.copy_only?} < @streams.count
+      # result
+    end
+
     #------------------------------------------------------------
     # Get the rendered text of the format_table.
     #------------------------------------------------------------
     def format_table
       unless @format_table
         @format_table = format_table_datasource.render(:basic) do |renderer|
-          renderer.column_widths = [10,10,10,160]
+          renderer.column_widths = [10,10,10,12,10,123]
           renderer.multiline     = true
           renderer.padding       = [0,1]
-          renderer.width         = 1000
+          renderer.width         = 192
         end
       end
       @format_table
@@ -115,11 +141,11 @@ module MmTool
     def stream_table
       unless @stream_table
         @stream_table = stream_table_datasource.render(:unicode) do |renderer|
-          renderer.alignments    = [:center, :left, :left, :right, :right, :left, :left, :left, :left]
-          renderer.column_widths = [5,10,10,5,10,5,23,50,35]
+          renderer.alignments    = [:center, :left, :left, :right, :right, :left, :left, :left, :left, :left]
+          renderer.column_widths = [5,10,10,5,10,5,23,50,8,35]
           renderer.multiline     = true
           renderer.padding       = [0,1]
-          renderer.width         = 1000
+          renderer.width         = 192
         end # do
       end
       @stream_table
@@ -153,6 +179,11 @@ module MmTool
         stream.instruction_metadata.each { |instruction| command << "   #{instruction}" }
       end
 
+      if @defaults[:containers_preferred][0].downcase == 'mkv'
+        command << "   -metadata MM_TOOL_ENCODED=\"true\" \\" if @streams.count {|stream| stream.transcode?} > 0
+        command << "   -metadata MM_TOOL_WRITTEN=\"true\" \\" if modify_streams?
+      end
+
       command << "   -metadata title=\"#{format_title}\" \\" if format_title
       command << "   \"#{output_path}\""
       command.join("\n")
@@ -207,8 +238,8 @@ module MmTool
     #------------------------------------------------------------
     def format_table_datasource
       unless @format_table
-        @format_table = TTY::Table.new(header: %w(Duration: Size: Bitrate: Title:))
-        @format_table << [format_duration, format_size, format_bitrate, format_title]
+        @format_table = TTY::Table.new(header: ['Duration:', 'Size:', 'Bitrate:', 'mm_encoded:', 'mm_wrote:', 'Title:'])
+        @format_table << [format_duration, format_size, format_bitrate, format_mm_tool_encoded, format_mm_tool_written, format_title]
       end
       @format_table
     end
@@ -220,8 +251,8 @@ module MmTool
     def stream_table_datasource
       unless @table
         # Ensure that when we add the headers, they specifically are left-aligned.
-        headers = %w(index codec type w/# h/layout lang disposition title action(s))
-                      .map { |header| {:value => header, :alignment => :left} }
+        headers = ['index', 'codec', 'type', 'w/#', 'h/layout', 'lang', 'disposition', 'title', 'touched?', 'action(s)']
+          .map { |header| {:value => header, :alignment => :left} }
 
         @table = TTY::Table.new(header: headers)
 
@@ -235,6 +266,7 @@ module MmTool
           row << stream.language
           row << stream.dispositions
           row << stream.title
+          row << stream.mm_tool_encoded_stream
           row << stream.action_label
           @table << row
         end

data/lib/mm_tool/mm_movie_stream.rb

@@ -119,6 +119,14 @@ module MmTool
       lang
     end
 
+    #------------------------------------------------------------
+    # Property - returns the metadata indicating whether or not
+    #   mm_tool has previously encoded this stream.
+    #------------------------------------------------------------
+    def mm_tool_encoded_stream
+      @data&.dig(:tags, :MM_TOOL_ENCODED_STREAM)&.downcase == 'true'
+    end
+
     #------------------------------------------------------------
     # Property - returns the title of the stream, or nil.
     #------------------------------------------------------------
@@ -213,6 +221,13 @@ module MmTool
       actions.include?(:copy)
     end
 
+    #------------------------------------------------------------
+    # Property - Is the stream copy only? No other modifications?
+    #------------------------------------------------------------
+    def copy_only?
+      (actions - [:copy, :interesting]).empty?
+    end
+
     #------------------------------------------------------------
     # Property - stream action includes :transcode?
     #------------------------------------------------------------
@@ -324,6 +339,11 @@ module MmTool
       result = []
       result << "-metadata:s:#{output_specifier} language=#{lang} \\" if set_language?
       result << "-metadata:s:#{output_specifier} title=\"#{title}\" \\" if title  && ! @defaults[:ignore_titles]
+
+      if @defaults[:containers_preferred][0].downcase == 'mkv'
+        result << "-metadata:s:#{output_specifier} MM_TOOL_ENCODED_STREAM=\"true\" \\" if @actions.include?(:transcode)
+      end
+
       result
     end
 

data/lib/mm_tool/mm_tool_cli.rb

@@ -204,7 +204,7 @@ module MmTool
 
         when '--no-transcode'
           @defaults[:transcode] = false
-          @defaults.tempfile = nil
+          @application.tempfile = nil
 
         when '--ignore-files'
           @defaults[:ignore_files] = true
@@ -306,7 +306,7 @@ module MmTool
             OutputHelper.print_error_and_exit("Error: option #{C.bold(args[0])} was specified, but I don't know what that means.")
           end
 
-          # Otherwise, check for existence of the path, and warn or proceed.
+          # Otherwise, check for existence of the path, and proceed or warn.
           path = File.expand_path(args[0])
           if File.exist?(path)
             @application.run(path)

data/lib/mm_tool/version.rb

@@ -1,3 +1,3 @@
 module MmTool
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mm_tool
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Jim Derry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-21 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-table
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Curate your movie files.