autogg 0.2.1 → 0.2.2

data/autogg.gemspec

@@ -4,7 +4,7 @@ spec = Gem::Specification.new do |s|
   s.description = File.read(File.join(File.dirname(__FILE__), 'README'))
   s.requirements << 'oggenc must be installed on the base system'
   s.add_dependency 'rb-inotify', '>= 0.8.4'
-  s.version  = "0.2.1"
+  s.version  = "0.2.2"
   s.author   = 'Evan Simmons'
   s.email    = 'esims89@gmail.com'
   s.homepage = 'https://github.com/estk/autogg'

data/lib/autogg/encoder.rb

@@ -1,4 +1,5 @@
 require 'find'
+require 'rb-inotify'
 require_relative 'progressbar'
 
 module OggEncode
@@ -6,24 +7,22 @@ module OggEncode
     class << self
 
       def oggencdir
+        @pbar = ProgressBar.new( "Progress", ( count_flacs - count_oggs ) )
+        @watching = false
         Find.find( @paths.flac ) do |path|
           if FileTest.directory?( path )
-            if File.basename( path )[0] == ?.
-              Find.prune
-            else
-              #@pbar.inc
-            end
+            Find.prune if File.basename( path )[0] == ?.
           elsif Flac.exists?( path ) and not Ogg.exists?( getoutpath(path) )
             encfile( path )
           end
         end
-        Process.waitall ; @ps_hash = {}
+        Process.waitall ; @ps_hash = {} ; @pbar.finish
       end
 
       def encfile( inpath )
         outpath = getoutpath( inpath )
         @ps_hash.store( nil, outpath ) do
-          IO.popen %Q{oggenc #{@oggargs.join(' ')} "#{inpath}" -o "#{outpath}"}
+          ps = IO.popen %Q{oggenc #{@oggargs.join(' ')} "#{inpath}" -o "#{outpath}"}
         end
         @pbar.inc
       end
@@ -46,7 +45,7 @@ module OggEncode
       end
 
       def interupt
-        puts "\n" + "Shutting down and removing partially encoded files"
+        puts "\n" + "Shutting down and removing partially encoded files" unless @watching
         @ps_hash.each do |pid, path|
           File.delete( path )
         end
@@ -54,24 +53,24 @@ module OggEncode
       end
 
       def watcher
-        require 'rb-inotify'
         notifier = INotify::Notifier.new
-        notifier.watch( @paths.flac, :create ) do |e|
+        notifier.watch( @paths.flac, :create, :recursive ) do |e|
           puts %Q{#{Time.now.ctime}:  #{e.name} was modified, rescaning...}
-          oggencdir ; Process.waitall
-          puts "watching #{@paths.flac}"
+          sleep 60
+          oggencdir ; @watching = true ; puts "watching #{@paths.flac}"
         end
+        @watching = true
         puts "watching #{@paths.flac}"
         notifier.run
       end
 
+
       def encode( options )
         @options = options
         @paths = options.paths
         @oggargs = options.oggargs
         @ps_hash = SizedPsHash.new( options.max_procs )
-        @pbar = ProgressBar.new( "Subdirectory progress", ( count_flacs - count_oggs ) )
-        oggencdir ; @pbar.finish
+        oggencdir
         watcher if options.watch
       end
     end

data/lib/autogg/runner.rb

@@ -10,3 +10,7 @@ module OggEncode
     end
   end
 end
+
+if $0 == __FILE__
+  OggEncode::Runner.run(ARGV)
+end

metadata

@@ -2,7 +2,7 @@
 name: autogg
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Evan Simmons
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 Z
+date: 2011-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rb-inotify
@@ -36,6 +36,7 @@ extra_rdoc_files: []
 files: 
 - autogg.gemspec
 - LICENCE
+- autogg-0.2.1.gem
 - autogg-0.2.0.gem
 - bin/autogg
 - README
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - oggenc must be installed on the base system
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: converts a folder of flacs to ogg, preserving directory structure