mm_tool 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb195a344b506ce9706580970d5e8db8843bf53b537161d63577dc84577089dc
-  data.tar.gz: b06f0eff5f6b0aeddd08b5ac1792d9cdf0869df5babab29fb771f9d3fac28e9d
+  metadata.gz: 437af0237de0f684c70ebc8d7f6db4432e0b6196e4c3e787f3e2bf4507cfcd10
+  data.tar.gz: 3a28861a1398fa974570d1909a8d45105e0fc2d8cf7e1251e19feb8a7fbb3494
 SHA512:
-  metadata.gz: a68290286f7db0bbcf5a0440c22ad3a213224439530c73280e70426fc52601a2d52d9c9dac278c7558de9b06317b8e284aae78ca6031b7b74f56f3b699c5823c
-  data.tar.gz: 769b79d23c56d70d9bbf4fa857629bad1376e332e7b6c87280a86d7d21dd0c54fe029c222a000dd7861c7aa764988372f81fc4e2dc754de3110bd79dd8a0bcb6
+  metadata.gz: 8070cef42b5cb9617bc467cce28591e08c52c36bb0c2edcf546a605028fa3b34f1dd0ca3d19fa8fed0f58e1b22ef59d1c21fd5059b1a192a7861b7ec0e1de6f2
+  data.tar.gz: c6920b52041cc3318470595e73beb2ecf54f69d5b639f92c44e736d0b18c801a5e7b8f09dbd45e010dc1142744670341baa054fc7ba25f4db4e1d205f66fcba3

data/README.md

@@ -5,7 +5,12 @@ mm_tool, a multimedia tool
 
 # About
 
-tbd
+Handles lots of media files with ffpmeg as a batch. Useful for cleaning, consolidating,
+remuxing, and re-encoding media libraries.
+
+# Installation
+
+`gem install mm_tool` should do the trick.
 
 
 # Change log
@@ -13,3 +18,11 @@ tbd
 - 0.1.0
 
   - Initial release.
+
+- 0.1.1
+
+  - Fix to gemspec.
+
+- 0.1.2
+
+  - Current WIP.

data/lib/mm_tool/application_main.rb

@@ -53,12 +53,10 @@ module MmTool
       <<~HEREDOC
         #!/bin/sh
 
-        # Check this file, make any changes, and save it. It will be executed as soon
-        # as you close it. By default, this script will exit per the exit command
-        # below. Please further confirm that you wish to proceed with the proposed
-        # actions by commenting or removing the line below.
-        
-        exit 1
+        # Check this file, make any changes, and save it. Execute it directly,
+        # or execute it with the sh command if it's not executable.
+
+        set -e
 
       HEREDOC
     end
@@ -97,15 +95,15 @@ module MmTool
       else
         @file_count[:processed] = @file_count[:processed] + 1
         movie = MmMovie.new(with_file: file_name)
-        a = movie.interesting?
+        a = movie.interesting? # already interesting if low-quality, but separate quality check made for logic, below.
         b = MmMovieIgnoreList.shared_ignore_list.include?(file_name)
-        c = movie.low_quality?
+        c = movie.meets_minimum_quality?
         s = @defaults[:scan_type]&.to_sym
 
-        if (s == :normal && a && !b && !c) ||
+        if (s == :normal && a && !b && c) ||
             (s == :all && !b) ||
             (s == :flagged && b) ||
-            (s == :quality && c ) ||
+            (s == :quality && !c ) ||
             (s == :force)
 
           @file_count[:displayed] = @file_count[:displayed] + 1

data/lib/mm_tool/mm_movie.rb

@@ -58,10 +58,19 @@ module MmTool
     # Indicates whether any of the streams are of a lower
     # quality than desired by the user.
     #------------------------------------------------------------
-    def low_quality?
+    def has_low_quality_streams?
       @streams.count {|stream| stream.low_quality?} > 0
     end
 
+    #------------------------------------------------------------
+    # Indicates whether or not a file has at least one high-
+    # quality video stream and high-quality audio stream.
+    #------------------------------------------------------------
+    def meets_minimum_quality?
+      @streams.count {|stream| stream.codec_type == 'audio' && !stream.low_quality? } > 0 &&
+          @streams.count {|stream| stream.codec_type == 'video' && !stream.low_quality? } > 0
+    end
+
     #------------------------------------------------------------
     # Indicates whether any of the streams are interesting.
     #------------------------------------------------------------
@@ -122,7 +131,10 @@ module MmTool
       @streams.each {|stream| command << "   #{stream.instruction_map}" if stream.instruction_map }
       @streams.each {|stream| command << "   #{stream.instruction_action}" if stream.instruction_action }
       @streams.each {|stream| command << "   #{stream.instruction_disposition}" if stream.instruction_disposition }
-      @streams.each {|stream| command << "   #{stream.instruction_metadata}" if stream.instruction_metadata }
+      @streams.each do |stream|
+        stream.instruction_metadata.each { |instruction| command << "   #{instruction}" }
+      end
+
       command << "   -metadata title=\"#{format_title}\" \\" if format_title
       command << "   \"#{output_path}\""
       command.join("\n")

data/lib/mm_tool/mm_movie_ignore_list.rb

@@ -52,7 +52,7 @@ module MmTool
     def add(path:)
       new_list = @ignore_list |= [path]
       @ignore_list = new_list.sort
-      File.open(file_path, 'w') { |file| file.write(@ignore_list.to_yaml) }
+      File.open(file_path, 'w') { |file| file.write(@ignore_list.to_yaml(options = {:line_width => -1})) }
     end
 
     #------------------------------------------------------------
@@ -60,7 +60,7 @@ module MmTool
     #------------------------------------------------------------
     def remove(path:)
       @ignore_list.delete(path)
-      File.open(file_path, 'w') { |file| file.write(@ignore_list.to_yaml) }
+      File.open(file_path, 'w') { |file| file.write(@ignore_list.to_yaml(options = {:line_width => -1})) }
     end
 
   end # class

data/lib/mm_tool/mm_movie_stream.rb

@@ -309,22 +309,21 @@ module MmTool
     end
 
     #------------------------------------------------------------
-    # Property - returns an instruction for setting the metadata
+    # Property - returns instructions for setting the metadata
     #   of the stream, if necessary.
     #------------------------------------------------------------
     def instruction_metadata
+      return [] if @actions.include?(:drop)
+
       # We only want to set fixed_lang if options allow us to fix the language,
       # and we want to set subtitle language from the filename, if applicable.
       fixed_lang = @defaults[:fix_undefined_language] ? @defaults[:undefined_language] : nil
       lang = subtitle_file_language ? subtitle_file_language : fixed_lang
-      set_language = set_language? ? "language=#{lang} " : nil
-      set_title = title  && ! @defaults[:ignore_titles] ? "title=\"#{title}\" " : nil
 
-      if set_language || set_title
-        "-metadata:s:#{output_specifier} #{set_language}#{set_title}\\"
-      else
-        nil
-      end
+      result = []
+      result << "-metadata:s:#{output_specifier} language=#{lang} \\" if set_language?
+      result << "-metadata:s:#{output_specifier} title=\"#{title}\" \\" if title  && ! @defaults[:ignore_titles]
+      result
     end
 
     #------------------------------------------------------------

data/lib/mm_tool/mm_tool_cli.rb

@@ -173,6 +173,7 @@ module MmTool
 
         when '--version'
           puts "#{File.basename $0}, version #{MmTool::VERSION}"
+          exit 0
 
         when '--'
           break

data/lib/mm_tool/version.rb

@@ -1,3 +1,3 @@
 module MmTool
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/mm_tool.gemspec

@@ -30,21 +30,21 @@ Gem::Specification.new do |spec|
 
 
   # Specify which files should be added to the gem when it is released.
-  spec.files         = `git ls-files`.split("\n")
+  spec.files         = `git ls-files`.split("\n").reject { |f| f == 'bin/setup' || f == 'bin/console'}
   spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   spec.bindir        = 'bin'
-  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.executables   = `git ls-files -- bin/*`.split("\n").reject { |f| f == 'bin/setup' || f == 'bin/console'}.map{ |f| File.basename(f) }
   spec.require_paths = ['lib']
 
 
   # Additional dependencies
-  spec.add_runtime_dependency 'tty'
+  spec.add_runtime_dependency 'tty', "~>0.10"
   spec.add_runtime_dependency 'streamio-ffmpeg'
   spec.add_runtime_dependency 'bytesize'
 
   # Development dependencies
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 1.17.3"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency 'git'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mm_tool
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jim Derry
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -98,9 +98,7 @@ description: A tool for curating your movie files.
 email:
 - balthisar@gmail.com
 executables:
-- console
 - mm_tool
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -112,9 +110,7 @@ files:
 - README.md
 - Rakefile
 - Truth Tables.xlsx
-- bin/console
 - bin/mm_tool
-- bin/setup
 - lib/mm_tool.rb
 - lib/mm_tool/application_main.rb
 - lib/mm_tool/mm_movie.rb
@@ -133,7 +129,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/balthisar/mm_tool
   source_code_uri: https://github.com/balthisar/mm_tool
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Curate your movie files.
 test_files: []

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "mm_tool"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here