autogg 0.2.4 → 0.2.5

data/README.textile

@@ -4,10 +4,29 @@ h2. Summary
 
 Encodes all flac files in a given directory to ogg in another given directory while preserving the directory structure.
 
+h2. Installation
+
+bc. $ gem install autogg
+
+h2. Usage
+
+bc. man autogg
+
+h2. Logfile utilization
+
+The top of each autogg.log (in oggpath) should read:
+"This is the log of excluded files for the most recently run autogg".
+
+Each line follows the pattern:
+@"#{parent(path)} -- #{File.basename(path)}"@
+
+For optimal viewing pleasure, I recommend doing:
+@$ cat autogg.log | sort | less@
+
 h2. Adding as a cronjob
 
 *Example:*
 
 bc. $ echo '@hourly ID=autogg autogg /media/tb/rt/wt/ /media/tb/ogg/ -o -q8' | crontab -
 
-_keep in mind this replaces the current crontab_
+_keep in mind this replaces your current crontab_

data/autogg.gemspec

@@ -2,7 +2,7 @@ spec = Gem::Specification.new do |s|
   s.name     = 'autogg'
   s.summary  = 'converts a folder of flacs to ogg, preserving directory structure'
   s.requirements << 'oggenc must be installed on the base system'
-  s.version  = "0.2.4"
+  s.version  = "0.2.5"
   s.author   = 'Evan Simmons'
   s.email    = 'esims89@gmail.com'
   s.homepage = 'https://github.com/estk/autogg'

data/lib/autogg/encoder.rb

@@ -7,13 +7,13 @@ module OggEncode
 
       def oggencdir
         @pbar = ProgressBar.new( "Progress", ( count_flacs - count_oggs ) )
-        Find.find( @paths.flac ) do |path|
+        Find.find( @options.paths.flac ) do |path|
           if FileTest.directory?( path )
             Find.prune if File.basename( path )[0] == ?.
           elsif Flac.exists?( path ) and not Ogg.exists?( getoutpath(path) )
             encfile( path )
           else
-            @log << [ File.basename(path), path ]
+            @log << path
           end
         end
         Process.waitall ; @ps_hash = {} ; @pbar.finish
@@ -22,25 +22,25 @@ module OggEncode
       def encfile( inpath )
         outpath = getoutpath( inpath )
         @ps_hash.store( nil, outpath ) do
-          ps = IO.popen %Q{oggenc #{@oggargs.join(' ')} "#{inpath}" -o "#{outpath}"}
+          ps = IO.popen %Q{oggenc #{@options.oggargs.join(' ')} "#{inpath}" -o "#{outpath}"}
         end
         @pbar.inc
       end
 
       def getoutpath( inpath )
-        outpath = inpath.gsub( @paths.flac, @paths.ogg )
+        outpath = inpath.gsub( @options.paths.flac, @options.paths.ogg )
         outpath.gsub!( /\.flac/, '.ogg' )
       end
 
       def count_flacs
         c = 0
-        Find.find( @paths.flac ) {|p| c += 1 if Flac.exists?( p ) }
+        Find.find( @options.paths.flac ) {|p| c += 1 if Flac.exists?( p ) }
         c
       end
 
       def count_oggs
         c = 0
-        Find.find( @paths.ogg ) {|p| c += 1 if Ogg.exists?( p ) }
+        Find.find( @options.paths.ogg ) {|p| c += 1 if Ogg.exists?( p ) }
         c
       end
 
@@ -54,10 +54,8 @@ module OggEncode
 
       def encode( options )
         @options = options
-        @paths = options.paths
-        @oggargs = options.oggargs
         @ps_hash = SizedPsHash.new( options.max_procs )
-        @log = Logger.new(@paths.ogg)
+        @log = Logger.new(@options.paths.ogg)
         oggencdir
       ensure
         @log.close

data/lib/autogg/parser.rb

@@ -3,46 +3,53 @@ require 'ostruct'
 
 module OggEncode
   class Parser
-    def self.parse(args)
+    class << self
 
-      script_name = File.basename( $0 )
-      options = OpenStruct.new
-      options.max_procs = 4
-      options.oggargs = ['-Q']
-
-      op = OptionParser.new do |opts|
-        opts.banner = "Usage: autogg.rb [options] flacpath oggpath [ -o oggenc args ... ]\n" +
-                      "Example: #{script_name} ~/music/flac/ ~/music/ogg/ --oggenc-args -q8\n" +
-                      "    Ex2: #{script_name} ~/music/flac/ ~/music/ogg/ -o -q8,-Q,--utf8"
-
-        opts.on( '-m', '--max-processes n', "Maximum number of encoding processes running at once" ) do |n|
-          options.max_procs = n.to_i
-        end
+      def make_path(folder)
+        folder =~ /\/$/ ? folder : folder + '/'
+      end
 
-        opts.on( '-o', '--oggenc-args arglist', Array,
-                 "Specify arguments to me be passed through to oggenc" ) do |ary|
-          options.oggargs << ary
-          options.oggargs.flatten!
+      def parse(args)
+
+        script_name = File.basename( $0 )
+        options = OpenStruct.new
+        options.max_procs = 4
+        options.oggargs = ['-Q']
+
+        op = OptionParser.new do |opts|
+          opts.banner = "Usage: autogg.rb [options] flacpath oggpath [ -o oggenc args ... ]\n" +
+                        "Example: #{script_name} ~/music/flac/ ~/music/ogg/ --oggenc-args -q8\n" +
+                        "    Ex2: #{script_name} ~/music/flac/ ~/music/ogg/ -o -q8,-Q,--utf8"
+
+          opts.on( '-m', '--max-processes n', "Maximum number of encoding processes running at once" ) do |n|
+            options.max_procs = n.to_i
+          end
+
+          opts.on( '-o', '--oggenc-args arglist', Array,
+                   "Specify arguments to me be passed through to oggenc" ) do |ary|
+            options.oggargs << ary
+            options.oggargs.flatten!
+          end
+
+          opts.on( '-h', '--help', 'Display this screen' ) do
+            puts opts
+            puts dirinfo
+            exit
+          end
         end
-
-        opts.on( '-h', '--help', 'Display this screen' ) do
-          puts opts
-          puts dirinfo
+        op.parse!
+
+        if ( ARGV.length == 2 ) and ARGV.all? { |a| File.directory?( a )}
+          paths = OpenStruct.new
+          paths.flac = make_path(ARGV[0]) ; paths.ogg = make_path(ARGV[1])
+          options.paths = paths
+        else
+          puts op
           exit
         end
-      end
-      op.parse!
-
-      if ( ARGV.length == 2 ) and ARGV.all? { |a| File.directory?( a )}
-        paths = OpenStruct.new
-        paths.flac = ARGV[0] ; paths.ogg = ARGV[1]
-        options.paths = paths
-      else
-        puts op
-        exit
-      end
 
-      options
+        options
+      end
     end
   end
 end

data/lib/autogg/utils.rb

@@ -1,4 +1,6 @@
+require 'fileutils'
 module OggEncode
+  
   class Flac < File
     def self.exists?( path )
       file?( path ) and basename( path ) =~ /\.flac$/
@@ -30,12 +32,27 @@ module OggEncode
 
   class Logger
 
+    def parent(path)
+      n = 0
+      result = ""
+      path.reverse.each_char do |c|
+        n += 1 if c == '/'
+        if n == 1
+          result << c
+        elsif n >= 2
+          break
+        end
+      end
+      return result.reverse
+    end
+
     def initialize(location)
-      @log = File.new("#{location}log.txt", "w+")
+      @log = File.new("#{location}autogg.log", "w+")
+      @log.puts "This is the log of excluded files for the most recently run autogg \n\n"
     end
 
-    def <<(pushed)
-      @log.puts "#{pushed[0]} -- #{pushed[1]}"
+    def <<(path)
+      @log.puts "#{parent(path)} -- #{File.basename(path)}"
     end
 
     def close

metadata

@@ -2,7 +2,7 @@
 name: autogg
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Evan Simmons
@@ -24,6 +24,7 @@ extra_rdoc_files: []
 files: 
 - README.textile
 - autogg.gemspec
+- autogg-0.2.4.gem
 - LICENCE
 - autogg-0.2.3.gem
 - bin/autogg