teslacam-merge 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c454a054f75c62785f06dad71f23a2f26ceacd75f261c8ffdbefc96f64942cd5
-  data.tar.gz: e7b7256e16be5868d489db58c6ae5c682075a5790b941bd5414fd8742fa62857
+  metadata.gz: 64008345c39af5336762d10962b743355cce74bc376656242b5265d38eb73568
+  data.tar.gz: f3a150683e4ae613037c43bfce3f7fbdac981e833058206df33f33ca58bc4967
 SHA512:
-  metadata.gz: 1a03cc0ccf4929faa055bbd3ae6d4a2d1475ca25f789b9a52f86b72c2c44de4136413f312cf0520e032761142a8dbde5cc8c79f6efc4a77d41a173e7dc0a1c9c
-  data.tar.gz: 21fd8321e18f5dd150e10a5b24e80eb4c8bfeabac6ca19e8f3bec9d2e474d38e479385c074a255a8e0ba6bbdff6a7bf27068febbac11f9c3befedafa71af28ae
+  metadata.gz: 5e908cf4113a1fb9563248de1e16ff62b42bb5e1a6a1f7b63e4c83436abd0c36a84457da02b8b2d1c30de11cf9b7854e9c300703564393d811dc33d7c9196716
+  data.tar.gz: 3e984790348d66549dc672ca685a8ead81885210f0bea6d5cd8699943a89b1b503c31fd11b73d3f94713f67a226d23ef89c692dba320cb057d80cee71d23e59c

data/README.md

@@ -3,8 +3,15 @@
 Combine TeslaCam videos into a single output video.  Allows you to set
 the output video size, and add a title to the output video.
 
-Example:
+![teslacam-merge example](example.jpg)
+
+Features:
+* Uses [ffmpeg][] to combine output videos.
+* Scale results.
+* Automatically sorts input videos, and handles missing videos.
+* Extracts timestamp from video file names.
 
+Example:
 ```
 # combine given videos, set the title to "sample video", and write the
 # result to the file "sentry-example.mp4"
@@ -20,4 +27,14 @@ Install `teslacam-merge` via [RubyGems][]:
 gem install teslacam-merge
 ```
 
+## Presets
+Valid values for the `--preset` option:
+
+* `full`: output size: 2560x1920, font size: 32
+* `large`: output size: 1920x1440, font size: 32
+* `medium`: output size: 1440x1080, font size: 24
+* `half`: output size: 1280x960, font size: 18
+* `small`: output size: 640x480, font size: 16
+
   [rubygems]: https://rubygems.org/
+  [ffmpeg]: https://ffmpeg.org/

data/lib/teslacam.rb

@@ -1,5 +1,5 @@
 module TeslaCam
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 
   LIB_DIR = File.join(__dir__, 'teslacam').freeze
 

data/lib/teslacam/cli.rb

@@ -7,6 +7,7 @@ require 'logger'
 module TeslaCam::CLI
   LIB_DIR = File.join(__dir__, 'cli').freeze
   autoload :Config, File.join(LIB_DIR, 'config.rb')
+  autoload :Presets, File.join(LIB_DIR, 'presets.rb')
 
   #
   # Run from command-line.
@@ -21,7 +22,6 @@ module TeslaCam::CLI
     # create model from config and log
     model = ::TeslaCam::Model.new(config, log)
 
-
     # exec command
     log.debug { 'exec: %p' % [model.command] }
     ::Kernel.exec(*model.command)

data/lib/teslacam/cli/config.rb

@@ -8,35 +8,68 @@ class TeslaCam::CLI::Config < ::TeslaCam::Config
     # initialize defaults
     super()
 
+    defaults = ::TeslaCam::Config::DEFAULTS
     @inputs = OptionParser.new do |o|
-      o.banner = "Usage: #{app} [options] <videos>"
+      o.banner = "Usage: #{app} [options] <input_videos>"
       o.separator ''
 
       o.separator 'Options:'
-      o.on('-o', '--output [FILE]', String, 'Output file.') do |val|
+      o.on(
+        '-o', '--output [FILE]', String,
+        'Output file (required).'
+      ) do |val|
         @output = val
       end
 
-      o.on('-s', '--size [SIZE]', String, 'Output size (WxH).') do |val|
+      o.on(
+        '-s', '--size [SIZE]', String,
+        'Output size (WxH).',
+        'Defaults to %dx%d if unspecified.' % [
+          defaults[:size].w * 2,
+          defaults[:size].h * 2,
+        ]
+      ) do |val|
         md = val.match(/^(?<w>\d+)x(?<h>\d+)$/)
         raise "invalid size: #{val}" unless md
         @size = ::TeslaCam::Size.new(md[:w].to_i / 2, md[:h].to_i / 2)
       end
 
-      o.on('--font-size [SIZE]', Integer, 'Font size.') do |val|
+      o.on(
+        '--font-size [SIZE]', Integer,
+        'Font size.',
+        'Defaults to %d if unspecified.' % [defaults[:font_size]]
+      ) do |val|
         raise "invalid font size: #{val}" if val < 1
         @font_size = val
       end
 
-      o.on('--bg-color [COLOR]', Integer, 'Background color.') do |val|
-        raise "invalid font size: #{val}" if val < 1
+      o.on(
+        '--bg-color [COLOR]', Integer,
+        'Background color.',
+        'Defaults to %s if unspecified.' % [defaults[:missing_color]]
+      ) do |val|
         @missing_color = val
       end
 
-      o.on('-t', '--title [TITLE]', String, 'Video title.') do |val|
+      o.on(
+        '-t', '--title [TITLE]', String,
+        'Video title.',
+        'Defaults to "" if unspecified.'
+      ) do |val|
         @title = val
       end
 
+      presets = ::TeslaCam::CLI::Presets.list.join(', ')
+      o.on(
+        '-p', '--preset [name]', String,
+        'Use preset.',
+        'One of: %s.' % [::TeslaCam::CLI::Presets.list.join(', ')]
+      ) do |val|
+        p = ::TeslaCam::CLI::Presets.get(val)
+        @size = ::TeslaCam::Size.new(p[:size][0] / 2, p[:size][1] / 2)
+        @font_size = p[:font_size]
+      end
+
       o.on('-q', '--quiet', 'Silence ffmpeg output.') do
         @quiet = true
       end

data/lib/teslacam/cli/presets.rb

@@ -0,0 +1,47 @@
+require 'optparse'
+
+#
+# Parse config from command-line arguments
+#
+module TeslaCam::CLI::Presets
+  PRESETS = {
+    full: {
+      size: [2560, 1920],
+      font_size: 32,
+    },
+
+    # x0.75
+    large: {
+      size: [1920, 1440],
+      font_size: 32,
+    },
+
+    # x0.5625
+    medium: {
+      size: [1440, 1080],
+      font_size: 24,
+    },
+
+    # x0.5
+    half: {
+      size: [1280, 960],
+      font_size: 18,
+    },
+
+    # x0.25
+    small: {
+      size: [640, 480],
+      font_size: 16,
+    },
+  }
+
+  def self.get(s)
+    id = s.intern
+    raise "unknown preset: #{s}" unless PRESETS.key?(id)
+    PRESETS[id]
+  end
+
+  def self.list
+    PRESETS.keys.map { |v| v.to_s }.sort
+  end
+end

data/lib/teslacam/config.rb

@@ -11,6 +11,13 @@ class TeslaCam::Config
        :missing_color,
        :title
 
+  DEFAULTS = {
+    title: '',
+    size: ::TeslaCam::Size.new(320, 240),
+    font_size: 16,
+    missing_color: 'black',
+  }.freeze
+
   #
   # Create a new Config instance and set defaults.
   #
@@ -22,15 +29,15 @@ class TeslaCam::Config
     @quiet = false
 
     # video title
-    @title = ''
+    @title = DEFAULTS[:title]
 
     # output size
-    @size = ::TeslaCam::Size.new(320, 240)
+    @size = DEFAULTS[:size]
 
     # font size
-    @font_size = 16
+    @font_size = DEFAULTS[:font_size]
 
     # background color for missing videos
-    @missing_color = 'black'
+    @missing_color = DEFAULTS[:missing_color]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teslacam-merge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Paul Duncan
@@ -24,6 +24,7 @@ files:
 - lib/teslacam.rb
 - lib/teslacam/cli.rb
 - lib/teslacam/cli/config.rb
+- lib/teslacam/cli/presets.rb
 - lib/teslacam/config.rb
 - lib/teslacam/filter.rb
 - lib/teslacam/model.rb