listlace 0.0.8 → 0.0.9

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    listlace (0.0.7)
+    listlace (0.0.9)
       activerecord
       activesupport
+      bundler
       open4
       plist
       pry
       sqlite3
+      taglib-ruby
 
 GEM
   remote: http://rubygems.org/
@@ -24,9 +26,9 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.3)
     coderay (1.0.7)
-    i18n (0.6.0)
+    i18n (0.6.1)
     method_source (0.8)
     multi_json (1.3.6)
     open4 (1.3.0)
@@ -36,8 +38,9 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.3.1)
     rake (0.9.2.2)
-    slop (3.3.2)
+    slop (3.3.3)
     sqlite3 (1.3.6)
+    taglib-ruby (0.5.1)
     tzinfo (0.3.33)
 
 PLATFORMS

data/lib/listlace/commands/library_commands.rb

@@ -9,6 +9,64 @@ module Listlace
         library.save_playlist(playlist)
       end
 
+      def like
+        if player.current_track.respond_to?(:rating)
+          player.current_track.increment! :rating
+        end
+      end
+
+      def dislike
+        if player.current_track.respond_to?(:rating)
+          player.current_track.decrement! :rating
+        end
+      end
+
+      def add(path, options = {})
+        if File.directory?(path)
+          extensions = {}
+          Array(options.delete(:extensions)).each do |ext|
+            extensions[ext.to_s] = true
+          end
+
+          num_tracks = 0
+          Dir[File.join(path, "**", "*")].each do |file|
+            unless File.directory?(file)
+              ext = File.extname(file).sub(/^\./, "")
+              if extensions[ext].nil?
+                print "Do you want to add files with the '.#{ext}' extension [y/N]? "
+                if gets[0].downcase == "y"
+                  extensions[ext] = true
+                else
+                  extensions[ext] = false
+                end
+              end
+
+              if extensions[ext]
+                if library.add_track(file, options)
+                  num_tracks += 1
+                end
+              end
+            end
+          end
+
+          if num_tracks == 0
+            puts "Can't find any audio files there. Perhaps they are already added?"
+          elsif num_tracks == 1
+            puts "1 track added."
+          else
+            puts "#{num_tracks} tracks added."
+          end
+        else
+          if library.add_track(path, options)
+            puts "1 track added."
+          else
+            puts "Track couldn't be added. Perhaps it's not an audio file?"
+          end
+        end
+      rescue Library::FileNotFoundError => e
+        puts e.message
+      end
+
       # Imports the music library from another program. Currently only iTunes is
       # supported.
       def import(from, path)

data/lib/listlace/library/database.rb

@@ -47,27 +47,23 @@ module Listlace
             t.string :album
             t.string :album_artist
             t.string :genre
-            t.string :kind
-            t.integer :size
             t.integer :total_time
             t.integer :disc_number
             t.integer :disc_count
             t.integer :track_number
             t.integer :track_count
             t.integer :year
-            t.datetime :date_modified
-            t.datetime :date_added
+            t.datetime :date_modified, null: false
+            t.datetime :date_added, null: false
             t.integer :bit_rate
             t.integer :sample_rate
             t.text :comments
-            t.integer :play_count
+            t.integer :play_count, null: false, default: 0
             t.datetime :play_date
-            t.integer :skip_count
+            t.integer :skip_count, null: false, default: 0
             t.datetime :skip_date
-            t.integer :rating
-            t.integer :album_rating
-            t.boolean :album_rating_computed
-            t.string :location
+            t.integer :rating, null: false, default: 0
+            t.string :location, null: false
           end
 
           create_table :playlists do |t|

data/lib/listlace/library/selectors.rb

@@ -20,6 +20,16 @@ module Listlace
         end
       end
 
+      # Selects all the tracks in the library.
+      def all
+        playlist library.tracks
+      end
+
+      # Selects no tracks, returning an empty playlist.
+      def none
+        playlist
+      end
+
       # The length selector is an integer selector for the length of a track. A
       # plain integer given to it represents the number of seconds. It can also take
       # a String in the format "1:23", to represent 83 seconds, for example. These
@@ -149,6 +159,7 @@ module Listlace
       # If given no arguments, it returns a blank playlist.
       #
       def playlist(*args)
+        args << [] if args.empty?
         args.map do |object|
           case object
           when Track

data/lib/listlace/library.rb

@@ -55,6 +55,40 @@ module Listlace
       playlist
     end
 
+    def add_track(path, options = {})
+      metadata = options.dup
+      if File.exists?(path)
+        TagLib::FileRef.open(path) do |file|
+          if tag = file.tag
+            metadata[:album] ||= tag.album
+            metadata[:artist] ||= tag.artist
+            metadata[:comments] ||= tag.comment
+            metadata[:genre] ||= tag.genre
+            metadata[:title] ||= tag.title
+            metadata[:track_number] ||= tag.track unless tag.track.zero?
+            metadata[:year] ||= tag.year unless tag.year.zero?
+          end
+
+          if prop = file.audio_properties
+            metadata[:bit_rate] = prop.bitrate
+            metadata[:sample_rate] = prop.sample_rate
+            metadata[:total_time] = prop.length * 1000
+          end
+
+          if metadata[:title].nil? or metadata[:title].empty?
+            metadata[:title] = File.basename(path, ".*")
+          end
+
+          metadata[:location] = File.expand_path(path)
+
+          track = Track.new(metadata)
+          track.save && track
+        end
+      else
+        raise FileNotFoundError, "File '%s' doesn't exist." % [path]
+      end
+    end
+
     def import(from, path, options = {})
       logger = options[:logger]
       if not File.exists?(path)
@@ -67,6 +101,11 @@ module Listlace
         num_tracks = 0
         whitelist = tracks.new.attributes.keys
         data["Tracks"].each do |track_id, row|
+          if row["Kind"] !~ /audio/
+            logger.("[skipping non-audio file]") if logger
+            next
+          end
+
           # row already contains a hash of attributes almost ready to be passed to
           # ActiveRecord. We just need to modify the keys, e.g. change "Play Count"
           # to "play_count".
@@ -91,13 +130,8 @@ module Listlace
           end
 
           track = tracks.new(attributes)
-
-          if track.kind =~ /audio/
-            if track.save
-              num_tracks += 1
-            end
-          else
-            logger.("[skipping non-audio file]") if logger
+          if track.save
+            num_tracks += 1
           end
         end
         logger.("Imported #{num_tracks} tracks successfully.") if logger

data/lib/listlace/models/track.rb

@@ -3,6 +3,11 @@ module Listlace
     has_many :playlist_items
     has_many :playlists, through: :playlist_items
 
+    validates :location, presence: true, uniqueness: true
+
+    before_create { |track| track.date_added = Time.now }
+    before_save { |track| track.date_modified = Time.now }
+
     def increment_skip_count
       increment! :skip_count
       update_column :skip_date, Time.now

data/lib/listlace.rb

@@ -3,6 +3,7 @@ require "active_record"
 require "fileutils"
 require "plist"
 require "active_support/core_ext/string"
+require "taglib"
 
 require "listlace/core_ext/array"
 require "listlace/time_helper"

data/listlace.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "listlace"
-  s.version = "0.0.8"
-  s.date = "2012-09-07"
+  s.version = "0.0.9"
+  s.date = "2012-09-17"
   s.summary = "A music player in a REPL."
   s.description = "Listlace is a music player which is interacted with through a Ruby REPL."
   s.author = "Jeremy Ruten"
@@ -10,13 +10,14 @@ Gem::Specification.new do |s|
   s.license = "MIT"
   s.required_ruby_version = ">= 1.9.2"
   s.requirements << "mplayer"
+  s.requirements << "taglib"
   s.executables << "listlace"
 
   s.files = ["Gemfile", "Gemfile.lock", "LICENSE", "listlace.gemspec", "README.md", "README.old"]
   s.files += ["bin/listlace"]
   s.files += Dir["lib/**/*.rb"]
 
-  %w(pry plist sqlite3 activerecord activesupport open4).each do |gem_name|
+  %w(bundler pry plist sqlite3 activerecord activesupport open4 taglib-ruby).each do |gem_name|
     s.add_runtime_dependency gem_name
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listlace
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: taglib-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -173,10 +205,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - mplayer
+- taglib
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A music player in a REPL.
 test_files: []
-has_rdoc: