alacit 0.1.1 → 1.0.0

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+# AlacIt Changelog
+
+## 1.0.0
+
+* Cue-Sheet Splitting (Extraction) - If a matching-named `.cue` sheet is found in the same directory as the audio file, then multiple M4A's are generated based on the Cue Sheet data.
+
+## 0.1.1
+
+* Fix RubyGems summary and description.
+
+## 0.1.0
+
+* APE support
+
+## 0.0.3
+
+* Accepts any assortment of files and directories, and it will process them all in batch.
+* Non-destructive by default. Added `--force` option.
+* Alacit is now a Gem.
+* Suppress FFmpeg's loud output.
+* More UNIX-standard exit codes.
+* Added Unit tests.
+* Code is more Object-oriented.
+* Remove unnecessary install instructions now that it's a Gem.
+* Fix error in help text.
+
+## 0.0.2
+
+* WAV support
+
+## 0.0.1
+
+* Convert FLAC files to ALAC M4A's.

data/{README.markdown → README.md}

@@ -6,6 +6,7 @@ Apple Lossless conversion utility.  Converts APE, FLAC, and WAV audio files to A
 * No quality loss
 * Basic metadata survives: Song, Artist, etc.
 * Converts entire directories, single files, or any combination thereof.
+* Cue-Sheet splitting / extraction
 * Puts converted files in same dir as source.
 
 ### Install
@@ -51,6 +52,10 @@ AlacIt won't overwrite existing files by default. If you need to, just force ove
     alacit --force song.flac
     alacit -f song.flac
 
+#### Cue-Sheet Splitting
+
+Have you ever downloaded an album and it's a single, large audio file along with a `.cue` file?  AlacIt will split that into individual files for you.  If a matching-named `.cue` sheet is found in the same directory as the audio file, then multiple M4A's are generated based on the Cue Sheet data.
+
 ### Dependencies
 
 * **Ruby 1.9.2+**

data/alacit.gemspec

@@ -9,8 +9,8 @@ spec = Gem::Specification.new do |s|
   s.email = 'me@russbrooks.com'
   s.homepage = 'http://russbrooks.com'
   s.platform = Gem::Platform::RUBY
-  s.summary = 'APE, FLAC, and WAV to Apple Lossless (ALAC) batch conversion utility.'
-  s.description = 'Quickly convert entire directories of APE, FLAC, and WAV files to Apple Lossless (ALAC) for importation into iTunes, iPhones, iPads, and iPods.'
+  s.summary = 'APE, FLAC, and WAV to Apple Lossless (ALAC) batch conversion utility and cue-sheet splitter.'
+  s.description = 'Quickly convert entire directories of APE, FLAC, and WAV files to Apple Lossless (ALAC) for importation into iTunes, iPhones, iPads, and iPods. It does Cue-Sheet splitting too.'
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/alacit.rb

@@ -12,9 +12,11 @@
 #   On Linux: `sudo apt-get install flac ffmpeg`
 #   Windows : [untested]
 
+require 'application'
+require 'cuesheet'
+require 'index'
 require 'open3'
 require 'version'
-require 'application'
 
 module AlacIt
   class Converter < Application
@@ -44,22 +46,28 @@ module AlacIt
 
       unless Dir.glob(source_glob).empty?
         Dir.glob(source_glob) do |file|
-          m4a_file = file.chomp(File.extname(file)) + '.m4a'
+          cue_file = file.chomp(File.extname(file)) + '.cue'
+
+          if File.exists? cue_file
+            extract_songs file, cue_file
+          else
+            m4a_file = file.chomp(File.extname(file)) + '.m4a'
 
-          if !File.exists?(m4a_file) || @options[:force]
-            command = 'ffmpeg -y -i "' + file + '" -c:a alac "' + m4a_file + '"'
-            stdout_str, stderr_str, status = Open3.capture3(command)
+            if !File.exists?(m4a_file) || @options[:force]
+              command = 'ffmpeg -y -i "' + file + '" -c:a alac "' + m4a_file + '"'
+              stdout_str, stderr_str, status = Open3.capture3(command)
 
-            if status.success?
-              puts "#{file} converted."
+              if status.success?
+                puts "#{file} converted."
+              else
+                $stderr.puts "Error: #{file}: File could not be converted."
+                $stderr.puts stderr_str.split("\n").last
+                next
+              end
             else
-              $stderr.puts "Error: #{file}: File could not be converted."
-              $stderr.puts stderr_str.split("\n").last
+              $stderr.puts "Error: \"#{m4a_file}\" exists. Use --force option to overwrite."
               next
             end
-          else
-            $stderr.puts "Error: #{m4a_file} exists. Use --force option to overwrite."
-            next
           end
         end
       else
@@ -71,22 +79,30 @@ module AlacIt
     def convert_file(file)
       if File.extname(file) =~ /(\.ape|\.flac|\.wav)/i
         if File.exists? file
-          m4a_file = file.chomp(File.extname(file)) + '.m4a'
+          cue_file = file.chomp(File.extname(file)) + '.cue'
 
-          if !File.exists?(m4a_file) || @options[:force]
-            command = 'ffmpeg -y -i "' + file + '" -acodec alac "' + m4a_file + '"'
-            stdout_str, stderr_str, status = Open3.capture3(command)
+          if File.exists? cue_file
+            extract_songs file, cue_file
+          else
+            # File has no Cuesheet. Convert the entire file.
+            m4a_file = file.chomp(File.extname(file)) + '.m4a'
+
+            if !File.exists?(m4a_file) || @options[:force]
+              command = 'ffmpeg -y -i "' + file + '" -c:a alac "' + m4a_file + '"'
+
+              stdout_str, stderr_str, status = Open3.capture3(command)
 
-            if status.success?
-              puts "#{file} converted."
+              if status.success?
+                puts "#{file} converted."
+              else
+                $stderr.puts "Error: #{file}: File could not be converted."
+                $stderr.puts stderr_str.split("\n").last
+                return
+              end
             else
-              $stderr.puts "Error: #{file}: File could not be converted."
-              $stderr.puts stderr_str.split("\n").last
+              $stderr.puts "Error: \"#{m4a_file}\" exists. Use --force option to overwrite."
               return
             end
-          else
-            $stderr.puts "Error: #{m4a_file} exists."
-            return
           end
         else
           $stderr.puts "Error: #{file}: No such file."
@@ -97,6 +113,37 @@ module AlacIt
         return
       end
     end
+
+    def extract_songs(file, cue_file)
+      cuesheet = AlacIt::Cuesheet.new(File.read(cue_file))
+      cuesheet.parse!
+
+      cuesheet.songs.each do |song|
+        m4a_filename = song[:track].to_s.rjust(2, '0') + ' - ' + song[:title] + '.m4a'
+        m4a_file = File.join(File.dirname(file), m4a_filename)
+
+        if !File.exists?(m4a_file) || @options[:force]
+          command = 'ffmpeg -y'
+          command << ' -i "' + file + '" -c:a alac'
+          command << ' -ss ' + song[:index].to_human_ms
+          command << (song[:duration].nil? ? '' : ' -t ' + song[:duration].to_human_ms)
+          command << ' "' + m4a_file + '"'
+
+          stdout_str, stderr_str, status = Open3.capture3(command)
+
+          if status.success?
+            puts "\"#{m4a_filename}\" extracted based on cue sheet."
+          else
+            $stderr.puts "Error: \"#{m4a_filename}\": File could not be extracted."
+            $stderr.puts stderr_str.split("\n").last
+            next
+          end
+        else
+          $stderr.puts "Error: \"#{m4a_filename}\" exists. Use --force option to overwrite."
+          next
+        end
+      end
+    end
   end
 end
 

data/lib/cuesheet.rb

@@ -0,0 +1,92 @@
+module AlacIt
+  class Cuesheet
+    attr_reader :cuesheet, :songs, :track_duration
+
+    def initialize(cuesheet, track_duration = nil)
+      @cuesheet = cuesheet      
+      @reg = {
+        :track => %r(TRACK (\d{1,3}) AUDIO), 
+        :performer => %r(PERFORMER "(.*)"), 
+        :title => %r(TITLE "(.*)"), 
+        :index => %r(INDEX \d{1,3} (\d{1,3}):(\d{1,2}):(\d{1,2}))
+      }
+      @track_duration = AlacIt::Index.new(track_duration) if track_duration
+    end
+
+    def parse!
+      @songs = parse_titles.map{ |title| {:title => title} }
+      @songs.each_with_index do |song, i|
+        song[:performer] = parse_performers[i]
+        song[:track] = parse_tracks[i]
+        song[:index] = parse_indices[i]
+      end
+      raise AlacIt::InvalidCuesheet.new('Cuesheet is malformed!') unless valid?
+      calculate_song_durations!
+      true
+    end
+
+    def position(value)
+      index = Index.new(value)
+      return @songs.first if index < @songs.first[:index]
+      @songs.each_with_index do |song, i|
+        return song if song == @songs.last
+        return song if between(song[:index], @songs[i + 1][:index], index)
+      end
+    end
+
+    def valid?
+      @songs.all? do |song|
+        [:performer, :track, :index, :title].all? do |key|
+          song[key] != nil
+        end
+      end
+    end
+
+    private
+
+    def calculate_song_durations!
+      @songs.each_with_index do |song, i|
+        if song == @songs.last
+          song[:duration] = (@track_duration - song[:index]) if @track_duration
+          return
+        end
+        song[:duration] = @songs[i + 1][:index] - song[:index]
+      end
+    end
+
+    def between(a, b, position_index)
+      (position_index > a) && (position_index < b)
+    end
+
+    def parse_titles
+      unless @titles
+        @titles = cuesheet_scan(:title).map{ |title| title.first }
+        @titles.delete_at(0)
+      end
+      @titles
+    end
+
+    def parse_performers
+      unless @performers
+        @performers = cuesheet_scan(:performer).map{ |performer| performer.first }
+        @performers.delete_at(0)
+      end
+      @performers
+    end
+
+    def parse_tracks
+      @tracks ||= cuesheet_scan(:track).map{ |track| track.first.to_i }
+    end
+
+    def parse_indices
+      @indices ||= cuesheet_scan(:index).map{ |index| AlacIt::Index.new([index[0].to_i, index[1].to_i, index[2].to_i]) }
+    end
+
+    def cuesheet_scan(field)
+      scan = @cuesheet.scan(@reg[field])
+      raise InvalidCuesheet.new("No fields were found for #{field.to_s}") if scan.empty?
+      scan
+    end
+
+  end
+end

data/lib/index.rb

@@ -0,0 +1,112 @@
+module AlacIt
+  class Index
+    SECONDS_PER_MINUTE = 60
+    FRAMES_PER_SECOND = 75
+    FRAMES_PER_MINUTE = FRAMES_PER_SECOND * 60
+
+    attr_reader :minutes, :seconds, :frames
+
+    def initialize(value=nil)
+      case value
+      when Array
+        set_from_array!(value)
+      when Integer
+        set_from_integer!(value)
+      end
+    end
+
+    def to_f
+      ((@minutes * SECONDS_PER_MINUTE) + (@seconds) + (@frames.to_f / FRAMES_PER_SECOND)).to_f
+    end
+
+    def to_i
+      to_f.floor
+    end
+
+    def to_a
+      [@minutes, @seconds, @frames]
+    end
+
+    def to_s
+      "#{'%02d' % @minutes}:#{'%02d' % @seconds}:#{'%02d' % @frames}"
+    end
+
+    def to_human_ms
+      "00:#{'%02d' % @minutes}:#{'%02d' % @seconds}" + (@frames.to_f / 75).round(3).to_s[1..-1]
+    end
+
+    def +(other)
+      self.class.new(carrying_addition(other))
+    end
+
+    def -(other)
+      self.class.new(carrying_subtraction(other))
+    end
+
+    def >(other)
+      self.to_f > other.to_f
+    end
+
+    def <(other)
+      self.to_f < other.to_f
+    end
+
+    def ==(other)
+      self.to_a == other.to_a
+    end
+
+    def each
+      to_a.each { |value| yield value }
+    end
+
+    private
+
+    def carrying_addition(other)
+      minutes, seconds, frames = *[@minutes + other.minutes, 
+        @seconds + other.seconds, @frames + other.frames]
+
+      seconds, frames = *convert_with_rate(frames, seconds, FRAMES_PER_SECOND)
+      minutes, seconds = *convert_with_rate(seconds, minutes, SECONDS_PER_MINUTE)
+      [minutes, seconds, frames]
+    end
+
+    def carrying_subtraction(other)
+      seconds = minutes = 0
+
+      my_frames = @frames + (@seconds * FRAMES_PER_SECOND) + (@minutes * FRAMES_PER_MINUTE)
+      other_frames = other.frames + (other.seconds * FRAMES_PER_SECOND) + (other.minutes * FRAMES_PER_MINUTE)
+      frames = my_frames - other_frames
+
+      seconds, frames = *convert_with_rate(frames, seconds, FRAMES_PER_SECOND)
+      minutes, seconds = *convert_with_rate(seconds, minutes, SECONDS_PER_MINUTE)
+      [minutes, seconds, frames]
+    end
+
+    def convert_with_rate(from, to, rate, step=1)
+      while from >= rate
+        to += step
+        from -= rate
+      end
+      [to, from]
+    end
+
+    def set_from_array!(array)
+      if array.size != 3 || array.any?{|element| !element.is_a?(Integer)}
+        raise ArgumentError.new("Must be initialized with an array in the format of [minutes, seconds,frames], all integers")
+      end
+      @minutes, @seconds, @frames = *array
+    end
+
+    def set_from_integer!(seconds)
+      @minutes = 0
+      @frames = 0
+      @seconds = seconds
+
+      while @seconds >= SECONDS_PER_MINUTE
+        @minutes += 1
+        @seconds -= SECONDS_PER_MINUTE
+      end
+    end
+
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module AlacIt
-  VERSION = '0.1.1'
+  VERSION = '1.0.0'
 end

data/test/converter_test.rb

@@ -36,12 +36,12 @@ class AlacItTest < MiniTest::Unit::TestCase
   end
 
   def test_single_ape
-    FileUtils.cp 'test/fixtures/test.ape', @temp_dir
+    FileUtils.cp 'test/fixtures/test3.ape', @temp_dir
     ARGV.clear
-    ARGV << File.join(@temp_dir, 'test.ape')
+    ARGV << File.join(@temp_dir, 'test3.ape')
     out, = capture_io { @app.convert }
-    assert_match /test\.ape converted/, out
-    assert_equal File.exists?(File.join(@temp_dir, 'test.m4a')), true
+    assert_match /test3\.ape converted/, out
+    assert_equal File.exists?(File.join(@temp_dir, 'test3.m4a')), true
   end
 
   def test_single_flac
@@ -62,6 +62,22 @@ class AlacItTest < MiniTest::Unit::TestCase
     assert_equal File.exists?(File.join(@temp_dir, 'test2.m4a')), true
   end
 
+  def test_single_ape_with_cue_file
+    FileUtils.cp 'test/fixtures/test3.ape', @temp_dir
+    FileUtils.cp 'test/fixtures/test3.cue', @temp_dir
+    ARGV.clear
+    ARGV << File.join(@temp_dir, 'test3.ape')
+    out, = capture_io { @app.convert }
+    refute_match /test3\.ape converted/, out
+    assert_match /01 - Track1.m4a\" extracted based on cue sheet/, out
+    assert_match /02 - Track2.m4a\" extracted based on cue sheet/, out
+    assert_match /03 - Track3.m4a\" extracted based on cue sheet/, out
+    assert_equal File.exists?(File.join(@temp_dir, 'test3.m4a')), false
+    assert_equal File.exists?(File.join(@temp_dir, '01 - Track1.m4a')), true
+    assert_equal File.exists?(File.join(@temp_dir, '02 - Track2.m4a')), true
+    assert_equal File.exists?(File.join(@temp_dir, '03 - Track3.m4a')), true
+  end
+
   def test_mixed_directory
     FileUtils.cp 'test/fixtures/test.flac', @temp_dir
     FileUtils.cp 'test/fixtures/test2.wav', @temp_dir
@@ -80,7 +96,7 @@ class AlacItTest < MiniTest::Unit::TestCase
     ARGV.clear
     ARGV << File.join(@temp_dir, 'test.flac')
     out, err = capture_io { @app.convert }
-    assert_match /test\.m4a exists/, err
+    assert_match /test\.m4a\" exists/, err
   end
 
   def test_single_flac_file_exists_force_overwrite
@@ -100,7 +116,7 @@ class AlacItTest < MiniTest::Unit::TestCase
     ARGV.clear
     ARGV << File.join(@temp_dir)
     out, err = capture_io { @app.convert }
-    assert_match /test\.m4a exists/, err
+    assert_match /test\.m4a\" exists/, err
     assert_match /test2\.wav converted/, out
     assert_equal File.exists?(File.join(@temp_dir, 'test2.m4a')), true
   end

data/test/fixtures/test3.cue

@@ -0,0 +1,19 @@
+REM GENRE "Techno"
+REM DATE 2012
+REM DISCID CF0A720E
+REM COMMENT "ExactAudioCopy v0.99pb5"
+PERFORMER "Vader"
+TITLE "Test Title"
+FILE "test3.ape" WAVE
+  TRACK 01 AUDIO
+    TITLE "Track1"
+    PERFORMER "Faithless"
+    INDEX 01 00:00:00
+  TRACK 02 AUDIO
+    TITLE "Track2"
+    PERFORMER "Faithless"
+    INDEX 01 00:30:74
+  TRACK 03 AUDIO
+    TITLE "Track3"
+    PERFORMER "Faithless"
+    INDEX 01 00:60:39

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alacit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,32 +28,38 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Quickly convert entire directories of APE, FLAC, and WAV files to Apple
-  Lossless (ALAC) for importation into iTunes, iPhones, iPads, and iPods.
+  Lossless (ALAC) for importation into iTunes, iPhones, iPads, and iPods. It does
+  Cue-Sheet splitting too.
 email: me@russbrooks.com
 executables:
 - alacit
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.markdown
+- README.md
 - Rakefile
 - alacit.gemspec
 - bin/alacit
 - lib/alacit.rb
 - lib/application.rb
+- lib/cuesheet.rb
+- lib/index.rb
 - lib/version.rb
 - pkg/alacit-0.0.2.gem
 - pkg/alacit-0.0.3.gem
 - pkg/alacit-0.1.0.gem
 - pkg/alacit-0.1.1.gem
+- pkg/alacit-1.0.0.gem
 - test/converter_test.rb
-- test/fixtures/test.ape
 - test/fixtures/test.flac
 - test/fixtures/test.m4a
 - test/fixtures/test2.wav
+- test/fixtures/test3.ape
+- test/fixtures/test3.cue
 homepage: http://russbrooks.com
 licenses: []
 post_install_message: 
@@ -77,10 +83,12 @@ rubyforge_project:
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: APE, FLAC, and WAV to Apple Lossless (ALAC) batch conversion utility.
+summary: APE, FLAC, and WAV to Apple Lossless (ALAC) batch conversion utility and
+  cue-sheet splitter.
 test_files:
 - test/converter_test.rb
-- test/fixtures/test.ape
 - test/fixtures/test.flac
 - test/fixtures/test.m4a
 - test/fixtures/test2.wav
+- test/fixtures/test3.ape
+- test/fixtures/test3.cue