getpics 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2489dc81725d6f88708240c5b40ad06984a1979d774a2dd37234c92b51b8eee
-  data.tar.gz: a2c877a19df8c5c191b8c73ede24e0e5ee20d0a16cbdb0ef659a71cca52a7f65
+  metadata.gz: a4a68484d33a3cad5595e6036baf7d2a493b061222eb48937c6f91de4913c9db
+  data.tar.gz: c3951e050dc5248330154a5416935de5b2d258c3a283bd5e06a6499379a1d13d
 SHA512:
-  metadata.gz: 0c3e8e5af759309849a530a5d955b4684ba23d2df0fd5b3fdd75ab645f076fb4dd8697775edbf99fe70930bd0ad5f047947166f4f5c435f8f4f96f2c0cfa1b41
-  data.tar.gz: 7f140ef760fd6de21435abf871b7bf116993905635a3e2a598d6c397983977357839bdede11ce7fa0696c19fec6be0fd3ad83a9ed3b7c0044083d7cf651450fa
+  metadata.gz: 65e2bb98dfa3477a873b3de80a4bba4365ecbbc5c9cfc988dc3e931c8953e7096be92f1d7e77cf0c8c8508a693c78733b5be5169ec7e58bc89a4a7adcdecd64e
+  data.tar.gz: e033f49cc1382322be4835ee1249f1a838ef88fa2315ad636e8887afa7c13b76a149c2a6107362f2ea1202c7c3495cd7743ea33c19961f781781a88e8af7fb58

data/bin/getpics

@@ -40,7 +40,15 @@ end.parse!
 dl = Getpics::Downloader.new(options[:verbose], options[:src], options[:photo_dest], options[:movie_dest])
 dl.load_media
 dl.copy_media
-dl.convert_media if options[:convert]
+if dl.has_movies? and ! options[:convert]
+    puts "Do you want to convert movies to mp4? [Y/n]".yellow
+    convert = gets.strip
+    if convert != 'n'
+        dl.convert_media
+    end
+elsif dl.has_movies? and options[:convert]
+    dl.convert_media
+end
 
 puts "Do you want to delete the media from #{options[:src]}? [y/N]".yellow
 delete = gets.strip

data/lib/getpics/downloader.rb

@@ -35,7 +35,7 @@ module Getpics
 
         def copy_media
             puts "Copying media..."
-            pb = ProgressBar.create(:title => "Media Copied", :total => @media_list.size)
+            pb = ProgressBar.create(:title => "Media Copied", :total => @media_list.size, :format => '%t: |%b%i| %c/%C %e')
             @media_list.all_known_media.each do |media|
                 if ! File.exists?("#{media.target_path}")
                     pb.log ("Copying #{media.path} to #{media.target_path}").light_black if @verbose
@@ -66,9 +66,10 @@ module Getpics
                 end
                 return if movies_to_process.size == 0
                 puts "Converting movies to MP4..."
-                pb = ProgressBar.create(:title => "Movies Converted", :total => movies_to_process.size)
+                pb = ProgressBar.create(:title => "Movies Converted", :total => movies_to_process.size, :format => '%t: |%b%i| %c/%C %e')
                 movies_to_process.each do |movie|
-                    system("#{ffmpeg_path} -i #{movie.target_path} -vcodec copy -acodec copy #{dest_path}")
+                    #system("#{ffmpeg_path} -i #{movie.target_path} -vcodec copy -acodec copy #{dest_path}")
+                    system("#{ffmpeg_path} -i #{movie.target_path} -c:v libx264 -b:v 5200K -maxrate 5200K -bufsize 5200K -c:a aac -b:a 128K -ar 44100 #{dest_path}")
                     pb.increment
                 end
             end
@@ -83,6 +84,11 @@ module Getpics
             end
         end
 
+        def has_movies?
+            return true if @media_list.movies.size > 0
+            return false
+        end
+
         def delete_media
             @media_list.all_known_media.each do |media|
                 puts "Deleting #{media.orig_path}".red if @verbose

data/lib/getpics/media.rb

@@ -89,7 +89,7 @@ module Getpics
         end
 
         def is_known?
-            return true if @type.name != :unknown
+            return true if ! is_unknown?
             return false
         end
 

data/lib/getpics/version.rb

@@ -1,3 +1,3 @@
 module Getpics
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: getpics
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Doug P.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler