cutcut 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75111491536a777f1518aa51a025c2bb87356ef9
-  data.tar.gz: 70b2fc148ed07dd389e27c39e68f0d8d1e0fedab
+  metadata.gz: 9b5396d2a88c481c1c92a4034cd29f4a8cb041b0
+  data.tar.gz: 0257647416668aac8c4f0e947f96b904a295ebd9
 SHA512:
-  metadata.gz: 4ac1b04f0962ae62ddca62be5cce326a5c8de92500cc842244ae7c760ade07494aae97dcb582202ec76eb5422b72a834dd68b91cbe43d2449e5fcc29162dc037
-  data.tar.gz: 539a48f89ff804c4372005a62e41b9e2e2a5eb5d6752f508415d51cf8bd66a1887005eb0736f272a8f578b8aade8cf97f4b8dd950bbabbbd537297b460531307
+  metadata.gz: b23972d77396536dd13fc70a04becfd0b71fc903891713b1d4e39658774f1fbc30d50c47ee75a4ea655c55aac76843cb9a273b0d5aac422f32f6621484764cad
+  data.tar.gz: 2380715822adf6dcf5fa0fc67c52433b9a133425842eb8b6614a50d5d1a99c909b3e0b180ff70101d2f92dcf19f2dec2df4e993f785ee7ef5657aabb6ee421ea

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 Changelog
 =========
 
+Version 1.2.2 (April 20, 2016)
+-----------------------------
+
+* Remove invalid progressbar increment
+* Escape folders containing spaces
+
+Version 1.2.1 (April 10, 2016)
+-----------------------------
+
+* Fix --scale option
+* Fix timelapse conversion when folder include space
+
+Version 1.2.0 (April 8, 2016)
+-----------------------------
+
+* Add --remove-audio option
+* Fix progressbar increment
+
 Version 1.1.0 (March 17, 2016)
 -----------------------------
 

data/README.md

@@ -1,19 +1,22 @@
 # cutcut
 
-Trim/Cut/Screenshot videos
+* Trim/Cut/Scale videos
+* Change video playback speed
+* Extract video screenshots based on an interval
+* Create timelapses based on sequential images
 
 # Usage
 
 ```
-  gem install cutcut git: git@github.com:stjhimy/cutcut.git
+  gem install cutcut
 ```
 
 ```ruby
   media = CutCut::Media.new(input: 'path_to_file.mp4')
   media.convert(scale: '1280:720')
   media.convert(scale: '1280:720', copy_metadata: true)
+  media.convert(speed: 2)
   media.extract_screenshots
-  media.cut(start: '00:00', time: 10)
 
   timelapse = CutCut::Timelapse.new(input: 'path_to_folder')
   media.convert(scale: '1280:720')

data/bin/cutcut

@@ -8,13 +8,16 @@ options = {}
 OptionParser.new do |opt|
   opt.on('--convert', 'Convert all videos in a folder') { options[:convert] = true }
   opt.on('--copy-metadata', 'Copy original video metadata') { options[:copy_metadata] = true }
-  opt.on('--scale', 'SCALE_RESOLUTION') { |e| options[:scale] = e }
-  opt.on('--timelapse-fps FPS', 'Timelapse FPS') { |e| options[:timelapse_fps] = e }
   opt.on('--extract-screenshots NUMBER', 'Screenshots per second') { |e| options[:extract_screenshots] = e }
+  opt.on('--input INPUT', 'Input') { |e| options[:input] = e }
+  opt.on('--remove-audio', 'Video speed') { options[:remove_audio] = true }
+  opt.on('--scale SCALE_RESOLUTION', 'Resolution to scale eg: 1280:720') { |e| options[:scale] = e }
+  opt.on('--speed NUMBER', 'Video speed') { |e| options[:speed] = e }
+  opt.on('--timelapse-fps FPS', 'Timelapse FPS') { |e| options[:timelapse_fps] = e }
 end.parse!
 
 pwd = ENV['PWD']
-options[:input_dir] ||= pwd
+options[:input_dir] ||= options[:input] || pwd
 options[:copy_metadata] ||= false
 
 files = Dir[File.join(options[:input_dir], '/*.mp4')]
@@ -26,13 +29,15 @@ puts "#{files.count + folders.count} files found"
 files.each do |file|
   media = CutCut::Media.new(input: file)
   scale = options[:scale] || '1920:1080'
-  media.convert(copy_metadata: options[:copy_metadata], scale: scale)
+  speed = options[:speed]
+  remove_audio = options[:remove_audio]
+  media.convert(copy_metadata: options[:copy_metadata], scale: scale, speed: speed, remove_audio: remove_audio)
   media.extract_screenshots(fps: options[:extract_screenshots], copy_metadata: true) if options[:extract_screenshots]
   progressbar.increment
 end
 
 folders.each do |folder|
-  timelapse = CutCut::Timelapse.new(input: folder, output: File.join(options[:input_dir], File.basename(folder) + '.mp4'))
+  timelapse = CutCut::Timelapse.new(input: Regexp.escape(folder), output: Regexp.escape(File.join(options[:input_dir], File.basename(folder).gsub(/\s+/, '_') + '.mp4')))
   scale = options[:scale] || '1920:1080'
   timelapse.convert(fps: options[:timelapse_fps] || 30, scale: scale)
   progressbar.increment

data/cutcut.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.summary     = 'Trim/Cut/Screenshot videos'
   s.description = 'CLI for working with videos'
-  s.version     = '1.1.0'
+  s.version     = '1.2.2'
 
   s.executables   = ['cutcut']
   s.files         = `git ls-files`.split("\n")

data/lib/cutcut/helpers.rb

@@ -13,7 +13,7 @@ module CutCut
     end
 
     def self.copy_metadata(origin, target)
-      exif = MiniExiftool.new(target)
+      exif = MiniExiftool.new(target.delete('\\'))
       exif.copy_tags_from(origin, '*')
     end
   end

data/lib/cutcut/media.rb

@@ -10,18 +10,22 @@ module CutCut
     end
 
     def convert(options = {})
-      scale = options[:scale]
-      speed = "-filter:v \"setpts=#{options[:speed]}*PTS\"" if options[:speed]
       copy_metadata = options[:copy_metadata] || false
-
       output = options[:output] || @output || File.join(@output_path, '__' + File.basename(@input))
-      raw_options = "-movflags +faststart -vf scale=#{scale} -c:v libx264 -crf 20 -preset ultrafast  #{speed}"
-      execute_ffmpeg_command(input: @input, output: output, raw_options: { output: raw_options })
+
+      execute_ffmpeg_command(input: @input, output: output, raw_options: { output: extract_output_raw_options(options) })
 
       Helpers.copy_metadata(@input, output) if copy_metadata
       output
     end
 
+    def extract_output_raw_options(options = {})
+      scale = options[:scale]
+      speed = "-filter:v \"setpts=#{options[:speed]}*PTS\"" if options[:speed]
+      remove_audio = options[:remove_audio] == true ? '-an' : nil
+      "-movflags +faststart -vf scale=#{scale} -c:v libx264 -crf 20 -preset ultrafast  #{speed} #{remove_audio}"
+    end
+
     def extract_screenshots(options = {})
       fps = options[:fps] || 1
       basename = options[:basename] || File.basename(@input, '.MP4') + '_screenshot'

data/lib/cutcut.rb

@@ -1,6 +1,6 @@
 require 'active_support/all'
 require 'cutcut/base'
 require 'cutcut/helpers'
-require 'cutcut/timelapse'
 require 'cutcut/media'
+require 'cutcut/timelapse'
 require 'mini_exiftool'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cutcut
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Jhimy Fernandes Villar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport