music_meta_fixer 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e00914b7ebaff094156bd180a5da95450c4985e
-  data.tar.gz: d6ea2c04a3ec6dd37f2d654ced6827bac346811c
+  metadata.gz: aad28840dab9e9a13d95d47106b6284380895167
+  data.tar.gz: 6e4c61935fc4699a443e86b31229d9dd827a680e
 SHA512:
-  metadata.gz: 0ddea86194905d8077cdae4c3c8e3a07a220a6d4c5cecbf74545a7e3f6c358ec9d6baff176b8775bee5a41aed914c0dd5d32c727ebbdb543e8a6aeb63bfa1185
-  data.tar.gz: 3a6a037b2a8904631e4808870a47986daa96112215c8bf6bc89262422408c76ec75796369da6ad126e38fd2441f03e9520cb0c178f2794e07d9ed7258cbe386b
+  metadata.gz: 0844041ee93c4a9b592425c2a0c6326a43fd9a6e307ef40a13a5d065977c3cc29d1a3bda81e8134c24b234e923de9419f9ac476e6c586865091278fef94a0f17
+  data.tar.gz: a25dc02fc3af8997e22e81d7b20b80410fbd3250400166b278bfb18703d217239be1128378c8295a4c641de2fa5308ba54ff4ba90ea9241de2bc65867aa14eb9

data/README.md

@@ -5,6 +5,12 @@ in your iTunes Library.
 
 # Install
 
+Install taglib
+
+    $ brew install taglib
+
+Install my gem
+
     $ gem install music_meta_fixer
 
 ## How to Use?

data/Rakefile

@@ -4,6 +4,8 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList['test/*test.rb']
+  # t.verbose = true
+  t.warning = true
 end
 
 desc "Run tests"

data/lib/music_meta_fixer/itunes_api.rb

@@ -1,13 +1,22 @@
 module MusicMetaFixer
-  module ItunesAPI
+  class ItunesAPI
     ITUNES_API_URL = 'https://itunes.apple.com/search?'
-    LIMIT = 1
     MEDIA = 'music'
 
-    def self.get_song_info(term)
-      encoded_term = URI::encode(term)
-      query = "term=#{encoded_term}&media=#{MEDIA}&limit=#{LIMIT}"
-      res = Typhoeus.get(ITUNES_API_URL + query)
+    attr_accessor :term
+
+    def initialize(term, options={})
+      @term = term
+      @limit = options[:limit] || 1
+    end
+
+    def query
+      encoded_term = CGI.escape(@term)
+      ITUNES_API_URL + "term=#{encoded_term}&media=#{MEDIA}&limit=#{@limit}"
+    end
+
+    def get_song_info
+      res = Typhoeus.get(query)
 
       if res.code == 200
         json = JSON.parse res.body
@@ -18,7 +27,7 @@ module MusicMetaFixer
           new_music.artist = song_info["artistName"]
           new_music.genre = song_info["primaryGenreName"]
           new_music.album = song_info["collectionName"]
-          new_music.year = song_info["releaseDate"].split("-").first
+          new_music.year = song_info["releaseDate"].split("-").first.to_i
           return new_music
         end
       end

data/lib/music_meta_fixer/itunes_lib_parser.rb

@@ -13,10 +13,10 @@ module MusicMetaFixer
     SONG_END_PATH =  %w(plist dict dict)
 
 
-    def initialize
+    def initialize(options={})
       @counter = 0
       @path = []
-      # @longest_counter = File.read('counter.txt').to_i
+      @pretty_printer = PrettyPrinter.new
     end
 
     def end_document
@@ -36,7 +36,7 @@ module MusicMetaFixer
         end
       elsif @path == SONG_VALUE_STRING_PATH && @key
         if @key == LOCATION
-          @song_path = URI::decode(chars).gsub(/file:\/\/localhost/, "")
+          @song_path = CGI.unescape(chars).gsub(/file:\/\/localhost/, "")
         end
       end
     end
@@ -47,24 +47,22 @@ module MusicMetaFixer
         @song = TagEditor.get_song_info(@song_path)
 
         if @song
-          @new_song = ItunesAPI.get_song_info("#{@song.artist} #{@song.name}")
+          itunes_api = ItunesAPI.new("#{@song.artist} #{@song.name}" )
+          @pretty_printer.print_itunes_api_query(itunes_api)
+          @new_song = itunes_api.get_song_info
 
-          if @new_song
-            puts "######## OLD #######"
-            current_info = "Change:\n" + @song.pretty_string
-            puts current_info
-            puts "######## NEW ########\n"
-            puts @new_song.pretty_string
+          if @new_song && (diff = @song.compare_to(@new_song)) && !diff.empty?
+            @pretty_printer.print_song_diff(@song, @new_song, diff)
 
-            print "Change? "
+            puts "Change? (y/n)"
+            print "> "
             answer = gets.chomp
             if answer.match(/y/i)
-              puts "Changing #{@song.name} at #{@song_path}"
+              puts "Changing #{@song.name} at #{@song_path}\n\n"
               TagEditor.change_tag_info(@song_path, @new_song)
             else
-              puts "Moving on"
+              puts "Moving on\n\n"
             end
-            puts ""
           end
         end
       end

data/lib/music_meta_fixer/pretty_printer.rb

@@ -0,0 +1,31 @@
+module MusicMetaFixer
+  class PrettyPrinter
+    def initialize(options={})
+    end
+
+    def c
+      @c ||= Term::ANSIColor
+    end
+
+    def print_itunes_api_query(itunes_api)
+      puts "[#{c.blue 'INFO' }] Searching iTunes API with term '#{c.green itunes_api.term}' " \
+        "@ '#{c.green itunes_api.query}'"
+    end
+
+    def print_song_diff(song, compared_song, diff)
+      current_info = c.bold("##### OLD #####\n")
+      new_info = c.bold("##### NEW #####\n")
+
+      song.instance_variables.each do |key|
+        key = key.to_s.delete('@')
+        sym_key = key.to_sym
+
+        current_info_line = "#{key}: #{song.send(sym_key)}\n"
+        new_info_line = "#{key}: #{compared_song.send(sym_key)}\n"
+        current_info += diff.include?(sym_key) ? c.red("-  " + current_info_line) : "   " + current_info_line
+        new_info += diff.include?(sym_key) ? c.green("+  " + new_info_line) : "   " + new_info_line
+      end
+      puts current_info + new_info
+    end
+  end
+end

data/lib/music_meta_fixer/song.rb

@@ -1,11 +1,20 @@
 module MusicMetaFixer
   class Song
-    attr_accessor :name, :artist, :location, :genre, :album, :album_artist, :year
+    attr_accessor :name, :artist, :location, :genre, :album, :year
 
     def initialize name
       @name = name
     end
 
+    def compare_to(another_song)
+      diff = []
+      self.instance_variables.each do |key|
+        key = key.to_s.delete("@").to_sym
+        diff += [key] unless another_song.send(key) == self.send(key)
+      end
+      diff
+    end
+
     def pretty_string
       "Artist: #{artist}\n" \
       "Song: #{name}\n" \

data/lib/music_meta_fixer/version.rb

@@ -1,3 +1,3 @@
 module MusicMetaFixer
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/music_meta_fixer.rb

@@ -3,13 +3,14 @@ require 'music_meta_fixer/song'
 require 'music_meta_fixer/itunes_lib_parser'
 require 'music_meta_fixer/itunes_api'
 require 'music_meta_fixer/tag_editor'
+require 'music_meta_fixer/pretty_printer'
 
 require 'taglib'
 require 'nokogiri'
 require 'typhoeus'
-require 'uri'
-require 'open-uri'
 require 'json'
+require 'term/ansicolor'
+require 'cgi'
 
 module MusicMetaFixer
   def self.run

data/music_meta_fixer.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'taglib-ruby', '~> 0.6.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.0'
   spec.add_runtime_dependency 'typhoeus', '~> 0.6.6'
+  spec.add_runtime_dependency 'term-ansicolor', '~> 1.2.2'
 end

data/test/music_meta_fixer_test.rb

@@ -3,18 +3,22 @@ require 'music_meta_fixer'
 
 class MusicMetaFixerTest < Test::Unit::TestCase
   def test_itunes_api
-    song_info = MusicMetaFixer::ItunesAPI.get_song_info("Hardwell Apollo")
+    pretty_printer = MusicMetaFixer::PrettyPrinter.new
+    itunes_api = MusicMetaFixer::ItunesAPI.new("Hardwell Apollo")
+    puts "\n"
+    song_info = itunes_api.get_song_info
 
     assert_equal "Hardwell", song_info.artist
     assert_equal "Apollo (feat. Amba Shepherd)", song_info.name
     assert_equal "Dance" , song_info.genre
     assert_equal "2012", song_info.year
     assert_equal "Apollo (feat. Amba Shepherd) - Single", song_info.album
+    pretty_printer.print_itunes_api_query(itunes_api)
   end
 
   def test_tag_editor_getting_song_info
-    # TODO Fill in below
-    filepath = URI::decode('/path/to/Music/iTunes/iTunes%20Media/Music/Airbase/Pandemonium%20_%20Ocean%20Realm%20-%20Single/02%20Ocean%20Realm.m4p')
+    # TODO Export that bacon pancake
+    filepath = CGI.unescape ENV['bacon_pancakes']
     song_info = MusicMetaFixer::TagEditor.get_song_info(filepath)
 
     assert_equal "Airbase", song_info.artist
@@ -23,4 +27,17 @@ class MusicMetaFixerTest < Test::Unit::TestCase
     assert_equal 2004, song_info.year
     assert_equal "Pandemonium / Ocean Realm - Single", song_info.album
   end
+
+  def test_music_comparer
+    song = MusicMetaFixer::Song.new "Every Teardrop"
+    song.artist =  "Swedish House Mafia"
+    song.genre = "Dance"
+
+    song_copy = song.clone
+    song_copy.artist = "Coldplay"
+    song_copy.genre = "Pop"
+
+    assert_equal [:artist, :genre], song.compare_to(song_copy)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: music_meta_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Villena
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.6
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 description: Somewhat automated iTunes meta data fixer. Built on Ruby 2.0
 email:
 - mavoir6@gmail.com
@@ -97,6 +111,7 @@ files:
 - lib/music_meta_fixer.rb
 - lib/music_meta_fixer/itunes_api.rb
 - lib/music_meta_fixer/itunes_lib_parser.rb
+- lib/music_meta_fixer/pretty_printer.rb
 - lib/music_meta_fixer/song.rb
 - lib/music_meta_fixer/tag_editor.rb
 - lib/music_meta_fixer/version.rb