rjl-itunes 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb59ab8673076305fb0813d5d13f0b075d831c6
-  data.tar.gz: c817756e947c2a24757e8d2a0024d199b188c246
+  metadata.gz: 6b51f6db257d91c3da935e318c1023569e9f6a4c
+  data.tar.gz: d7e51904c214d5d5d48e10e9e8fcc43e79dceb20
 SHA512:
-  metadata.gz: db5ad5e51298f53168feac23361abd9e7e75874626675573e6c472ad9f8e56b6140a382d7c904b886e94b147ee4a060835710911122cdf3cd595e67fd1c5491b
-  data.tar.gz: 7a93638d0ecc070c885d70b7977dff897170757dbe2b64fce0eb0ec352763c5f016530ea73ebcd74811d6175121e7d6b179931eb60febaf2a879325e2914b4a3
+  metadata.gz: 74fb04c7e769fea3550fcecac0285f31acfc9ae0a94dce4aba2ce77ec5e0bd60218c52ef0fd24cd0d6222553579f2ec349c74337ad70c115a44e5c97f6c4de86
+  data.tar.gz: 2e78d219f048f10fae412016e85067348f07f2f442ecff65a95452d49fd162914f5123ce6a5b03d2ef6c2c37a50dc4473d9814a67b29957b2ae2f514c2c57a27

data/.gitignore

@@ -13,5 +13,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-rjl-itunes-0.1.gem
+*.gem
 Gemfile.lock

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+Dir.glob('tasks/**/*.rake').each(&method(:import))
+
 
 task :default => :spec

data/bin/{fix_genres.rb → fix_genres}

@@ -9,11 +9,15 @@
 # (c) Richard Lyon 15 March, 2016
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
-require 'rjl/itunes'
+require 'rjl'
+
+logger = get_logger
+logger.info "fix_genres: " "#{"="*80}"
 
 # require 'metadata'
 require 'ruby-progressbar' # https://github.com/jfelchner/ruby-progressbar/wiki
 
+puts "\n> Updating iTunes library genres from Allmusic.com...\n\n"
 itunes = RJL::Itunes.new
 
 progressbar = ProgressBar.create(
@@ -22,14 +26,22 @@ progressbar = ProgressBar.create(
   :total => itunes.albums.count)
 
 # main loop - fix album genre unless tagged 'proteected'
+count = 0
 itunes.albums.each do |album|
   metadata = RJL::Metadata.new( album: album )
-  progressbar.increment
   unless album.protected?
+    current_genre = album.genre
     new_genre = metadata.genre( album )
-    unless new_genre == ""
+
+    unless new_genre == "" || (current_genre == new_genre )
       album.genre = metadata.genre( album )
       progressbar.log "#{album.album_artist}, '#{album.title}' -> #{new_genre}"
+      logger.info "fix_genres: " "#{album.album_artist}, '#{album.title}' -> #{new_genre}"
+      count += 1
     end
   end
+  progressbar.increment
 end
+
+puts "\n> Attempted to updated genres for #{count} tracks (iCloud tracks not modified)"
+puts "> See '/lib/logs/log.log' for details"

data/lib/rjl/itunes.rb

@@ -4,8 +4,12 @@ include Appscript
 
 module RJL
   # RJL_itunes::Itunes contains the public api for Itunes.
+  # @example
+  #    require 'rjl/itunes'
+  #
+  #    itunes = RJL::Itunes.new
+  #    albums = itunes.albums
   # @api public
-  # @example itunes = Itunes.new
 
   class Itunes
 

data/lib/rjl/metadata.rb

@@ -5,7 +5,7 @@ module RJL
   # Gets metadata for an album from allmusic.com, caching the results. See
   # [rjl-music](https://github.com/richardjlyon/allmusic) for details. Computes
   # a simplified genre by selecting the highest frequency genre and style in the
-  # library and combining them in a string.
+  # library and combining them in a string. Creates a cache file `lib/cache/cache.db`
   class Metadata
 
     attr_reader :genres
@@ -17,7 +17,9 @@ module RJL
     # closes it on exit.
     # @param [Itunes] itunes the itunes client to generate metadata for
     def initialize( itunes )
-      @db = Daybreak::DB.new 'cache.db', :default => {}
+
+      cache_path = File.join((File.dirname __dir__), 'cache/cache.db')
+      @db = Daybreak::DB.new cache_path, :default => {}
       @itunes = itunes
       at_exit { @db.close }
     end

data/lib/rjl/utils.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 # return true if tracks have only one value for 'parameter_name'
 def unique?( tracks, parameter_name )
   values = []
@@ -6,3 +8,12 @@ def unique?( tracks, parameter_name )
   end
   return values.uniq.length == 1
 end
+
+
+# a logger
+def get_logger
+  log_path = File.join((File.dirname __dir__), 'logs/log.log')
+  logger = Logger.new(log_path, 'daily')
+  logger.datetime_format = "%Y-%m-%d"
+  return logger
+end

data/lib/rjl/version.rb

@@ -1,4 +1,4 @@
 module RJL
   # Version string
-  VERSION = '0.1.1'
+  VERSION = '0.2'
 end

data/rjl-itunes.gemspec

@@ -17,10 +17,13 @@ Gem::Specification.new do |spec|
   spec.version        = RJL::VERSION
   spec.license        = 'MIT'
 
-  spec.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_runtime_dependency     'nokogiri', '~> 1.6', '>= 1.6.7.2'
   spec.add_runtime_dependency     'rjl-allmusic', '~> 0.5', '>= 0.5'
   spec.add_runtime_dependency     'rb-scpt', '~> 1.0', '>= 1.0.1'
   spec.add_runtime_dependency     'ruby-progressbar', '~> 1.7', '>= 1.7.5'
   spec.add_runtime_dependency     'daybreak', '~> 0.3', '>= 0.3.0'
+  spec.add_runtime_dependency     'fuzzy-string-match', '~> 0.9', '>= 0.9.7'
 
 end

data/tasks/rspec.rake

@@ -0,0 +1,3 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjl-itunes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Richard Lyon
@@ -14,22 +14,50 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 1.6.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.7.2
 - !ruby/object:Gem::Dependency
   name: rjl-allmusic
   requirement: !ruby/object:Gem::Requirement
@@ -110,11 +138,31 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: fuzzy-string-match
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.7
 description: Manage album track genre in the library  using data from allmusic.com
 email: richard@richardlyon.net
 executables:
 - console
-- fix_genres.rb
+- fix_genres
 - setup
 extensions: []
 extra_rdoc_files: []
@@ -128,7 +176,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/fix_genres.rb
+- bin/fix_genres
 - bin/setup
 - lib/rjl.rb
 - lib/rjl/album.rb
@@ -144,6 +192,7 @@ files:
 - spec/playlist.rb
 - spec/spec_helper.rb
 - spec/track_spec.rb
+- tasks/rspec.rake
 homepage: https://github.com/richardjlyon/rjl-itunes
 licenses:
 - MIT
@@ -174,4 +223,3 @@ test_files:
 - spec/playlist.rb
 - spec/spec_helper.rb
 - spec/track_spec.rb
-has_rdoc: