media_trim 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ab2c24be1441d81a352ca71f72e7476e5bc748cde55da317fac140063c5a6d
-  data.tar.gz: bb39ea9a3dd5b8e91da60dd6b6e64d1e03b31330647cfb5ec7666041d470ee89
+  metadata.gz: 37f7ed510ad90d35e85ef47e33fabf9d1994779512a6c6b4342c570e3a957048
+  data.tar.gz: b0f0aed439b2fe793be04f38ea30937a767f53c997bb1723c38d9b2357b23e63
 SHA512:
-  metadata.gz: b5fa5f3e4634c0f04197744edf1c809a9ff139931af5ba6911b8098c5de37abe26f14b3353de3ae7468868f1435256549b025634e723d4973d8333abcd4ce0c9
-  data.tar.gz: 21fa1ee01fa7b71392e2acd7f40a4b1e63ee69f6fcbc8300939b542974b39b4a76ec232ce02d4b8aca6d0e63000f6edc47a31e673af908721e3ab2b22163175f
+  metadata.gz: de4ee11b00dfc2067a94f1da192d76940ca09d1baacd8ce3ddb215444a0dd45c1a4aac93c46399432e5818aa76efba4bc2ccadaeb8f51bb317f707b40c8f456f
+  data.tar.gz: 1bdea1d74ba69994bfaf7452c1fe1fe6cd9b9c9ecb76530c45bfb640c5624ae55456ab3012cb39157778cb5fc4d0532003285285218b3a64702b0035926fbd71

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.2.1
+
+* Added `spec.platform` to `media_trim.gemspec` because `RubyGems.org` now requires it
+* Various Ruby syntax issues corrected
+
 
 ## 0.2.0
 

data/README.md

@@ -69,7 +69,7 @@ When run as a command, output files are named by adding a `trim.` prefix to the
 e.g. `dir/trim.file.ext`.
 By default, the `trim` command does not overwrite pre-existing output files.
 When trimming is complete, the `trim` command displays the trimmed file,
-unless the `-q` option is specified.
+unless the `-V` option is specified.
 
 `OPTIONS` are:
 

data/lib/media_trim/version.rb

@@ -1,3 +1,3 @@
 module MediaTrimVersion
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/trim_class.rb

@@ -13,13 +13,26 @@ class MediaTrim
   end
 
   def self.time_format(elapsed_seconds)
-    elapsed_time = elapsed_seconds.to_i
+    elapsed_time = elapsed_seconds.to_f
     hours = (elapsed_time / (60 * 60)).to_i
-    minutes = ((elapsed_time - (hours * 60)) / 60).to_i
-    seconds = elapsed_time - (hours * 60 * 60) - (minutes * 60)
+    remaining_after_hours = elapsed_time - (hours * 60 * 60)
+    minutes = (remaining_after_hours / 60).to_i
+    seconds = remaining_after_hours - (minutes * 60)
 
-    result = "#{minutes.to_s.rjust 2, '0'}:#{seconds.to_s.delete_suffix('.0').rjust 2, '0'}"
-    result = "#{hours}:#{result}}" unless hours.zero?
+    # Format seconds with proper padding
+    if seconds == seconds.to_i
+      # No decimal part
+      seconds_str = seconds.to_i.to_s.rjust(2, '0')
+    else
+      # Has decimal part
+      whole_seconds = seconds.to_i
+      decimal_part = seconds - whole_seconds
+      decimal_str = format('%.2f', decimal_part)[1..]  # Remove leading "0" from "0.XX"
+      seconds_str = "#{whole_seconds.to_s.rjust(2, '0')}#{decimal_str}"
+    end
+
+    result = "#{minutes.to_s.rjust(2, '0')}:#{seconds_str}"
+    result = "#{hours}:#{result}" unless hours.zero?
     result
   end
 
@@ -52,9 +65,9 @@ class MediaTrim
   end
 
   def self.to_seconds(str)
-    array = str.split(':').map(&:to_i).reverse
+    array = str.split(':').map(&:to_f).reverse
     case array.length
-    when 1 then str.to_i
+    when 1 then str.to_f
     when 2 then array[0] + (array[1] * 60)
     when 3 then array[0] + (array[1] * 60) + (array[2] * 60 * 60)
     else raise TrimError, "Error: #{str} is not a valid time"

data/lib/trim_help.rb

@@ -10,7 +10,7 @@ class MediaTrim
       - Can be used as a Ruby gem.
       - Installs the 'trim' command.
 
-      When run as a command, output files are named by adding a 'trim.' prefix to the media file name, e.g. 'dir/trim.file.ext'.
+      When run as a command, output files are named by adding a 'trim.' prefix to the media file name, e.g., 'dir/trim.file.ext'.
       By default, the trim command does not overwrite pre-existing output files.
       When trimming is complete, the trim command displays the trimmed file, unless the -q option is specified
 
@@ -43,11 +43,11 @@ class MediaTrim
         trim demo/demo.mp4 3:25 for 6:10
 
       Need a way to figure out the start and stop times to trim a video?
-      DJV is an excellent video viewer https://darbyjohnston.github.io/DJV/
+      DJV is an excellent video viewer. https://darbyjohnston.github.io/DJV/
       - allows frame-by-frame stepping
-      - displays the current time reliabily
+      - displays the current time reliably
       - F/OSS
-      - Mac, Windows, Linux
+      - Mac, Windows, and Linux
       - High quality
     END_HELP
     exit 1

data/lib/trim_main.rb

@@ -1,37 +1,42 @@
-TrimError = Class.new StandardError # Define a new StandardError subclass
+class TrimError < StandardError
+end # Define a new StandardError subclass
 
 class MediaTrim
-  attr_accessor :copy_filename, :fname, :interval, :msg_end, :overwrite, :quiet, :start, :view
+  attr_accessor :copy_filename, :debug, :fname, :interval, :msg_end, :overwrite, :quiet, :start, :view
 
   # @param to [String] end timecode; duration not supported for API
   def initialize(filename = nil, trimmed_filename = nil, start = '0', to = nil, **options)
     @fname = MediaTrim.expand_env(filename) if filename
     @copy_filename = MediaTrim.expand_env(trimmed_filename) if trimmed_filename
-    @start = MediaTrim.time_format start
-    @interval = ['-ss', MediaTrim.time_format(@start)]
+    @start = MediaTrim.time_format(MediaTrim.to_seconds(start))
+    @interval = ['-ss', @start]
+    @debug = options[:debug] || false
 
     @overwrite = options[:overwrite] ? '-y' : '-n'
     @quiet     = options[:quiet].nil? || options[:quiet] ? ['-hide_banner', '-loglevel', 'error', '-nostats'] : []
-    @view      = options[:view].nil? ? true : options[:view]
+    @view      = options[:view].nil? || options[:view]
 
     prepare(@start, to, mode: :timecode) if to
   end
 
   def options
     OptionParser.new do |opts|
-      opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
+      opts.banner = "Usage: #{$PROGRAM_NAME} [options] file start [[to|for] end]"
 
-      opts.on('-f', '--[no-]@overwrite', 'Overwrite any previous output') do |f|
-        @overwrite = f ? '-y' : '-n'
+      opts.on('-f', '--overwrite', 'Overwrite any previous output') do
+        @overwrite = '-y'
+      end
+      opts.on('-v', '--verbose', 'Run verbosely') do
+        @quiet = []
       end
-      opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
-        @quiet = [] if v
+      opts.on('-h', '--help', 'Display help') do
+        MediaTrim.help
       end
-      opts.on('-h', '', 'Display help') do |_|
-        help
+      opts.on('-V', '--no-view', 'Do not view the trimmed file when complete') do
+        @view = false
       end
-      opts.on('-V', '--[no-]@view', 'View ffmpeg output') do |v|
-        @view = false if v
+      opts.on('-d', '--debug', 'Enable debug output') do
+        @debug = true
       end
     end.parse!
   end
@@ -49,7 +54,7 @@ class MediaTrim
     @copy_filename = "#{File.dirname @fname}/trim.#{original_filename}#{ext}"
 
     MediaTrim.help 'Please specify the time to @start trimming the video file from' unless argv[1]
-    @start = MediaTrim.time_format argv[1]
+    @start = MediaTrim.time_format(MediaTrim.to_seconds(argv[1]))
 
     @interval = ['-ss', @start]
     @msg_end = ''
@@ -72,7 +77,7 @@ class MediaTrim
 
   def prepare(from, duration_or_timecode, mode: :duration)
     if mode == :duration
-      timecode = MediaTrim.time_format duration_or_timecode
+      timecode = MediaTrim.time_format(MediaTrim.to_seconds(duration_or_timecode))
       time_end = MediaTrim.add_times from, timecode
       @interval += ['-t', time_end]
       @msg_end = " for a duration of #{timecode} (until #{time_end})"

data/media_trim.gemspec

@@ -59,6 +59,7 @@ Gem::Specification.new do |spec|
     'source_code_uri'   => host,
   }
   spec.name                 = 'media_trim'
+  spec.platform             = Gem::Platform::RUBY
   spec.post_install_message = <<~END_MESSAGE
 
     Thanks for installing #{spec.name} v#{MediaTrimVersion::VERSION}!

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: media_trim
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mike Slinn
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
@@ -97,7 +96,7 @@ metadata:
   source_code_uri: https://github.com/mslinn/media_trim
 post_install_message: |2+
 
-  Thanks for installing media_trim v0.2.0!
+  Thanks for installing media_trim v0.2.1!
 
 rdoc_options: []
 require_paths:
@@ -113,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Trim an audio or video file using ffmpeg
 test_files: []