ipod_db 0.2.9 → 0.2.10

data/README.md

@@ -4,7 +4,7 @@
 NAME
 ====
 
-    ipod_db v0.2.9
+    ipod_db v0.2.10
 
 SYNOPSIS
 ========

data/bin/ipod

@@ -87,7 +87,8 @@ Main {
       track numbers to delete from device (ranges like
       2-5 are accepted too). As a special case, the word
       'done' means all finished tracks, i.e. with play count
-      above zero or progress above #{ (100*Ipod::Track::FinishedProgress).floor }%
+      above zero or progress above
+      #{ (100*Ipod::Track::FinishedProgress).floor }%
       __
     }
     option('pretend','n') {
@@ -115,7 +116,7 @@ Main {
 
   def ls
     @ipod_db.each_track_with_index do |track,i|
-      list_track i, Ipod::Track.new(track.merge(ipod_root: @ipod_root))
+      list_track i, wrapped_track(track)
     end
   end
 
@@ -223,13 +224,18 @@ Main {
         end
       when 'done'
         @ipod_db.each_track_with_index do |track,n|
-          tracks[n] = track if finished? track
+          tracks[n] = track if wrapped_track(track).finished?
         end
       end
     end
     tracks
   end
 
+  def wrapped_track record
+    @wrapped_tracks ||= Map.new
+    @wrapped_tracks[record[:filename]] ||= Ipod::Track.new( record.merge(ipod_root: @ipod_root) )
+  end
+
   def spread paths, group_lambda = lambda {|path| track_group(path)}
     bins = paths.group_by &group_lambda
     bins.each do |key, bin|

data/lib/ipod/track.rb

@@ -16,7 +16,7 @@ module Ipod
     end
 
     def finished?
-      playcount > 0 or progress > FinishedProgress
+      (playcount and playcount > 0) or progress > FinishedProgress
     end
 
     def progress
@@ -28,7 +28,7 @@ module Ipod
     end
 
     def length
-      #
+      return @length if @length
       # if file is writable TagLib opens it read-write and appears to write something when the file
       # gets closed, or in any case closing a file open read-write is slow on slow media.
       #
@@ -37,7 +37,7 @@ module Ipod
       old_stat = File::Stat.new(absolute_path)
       begin
         FileUtils.chmod('a-w', absolute_path)
-        TagLib::FileRef.open(absolute_path){|file| file.audio_properties.length}
+        return @length = TagLib::FileRef.open(absolute_path){|file| file.audio_properties.length}
       ensure
         FileUtils.chmod(old_stat.mode, absolute_path)
       end

data/lib/ipod_db/version.rb

@@ -1,3 +1,3 @@
 class IpodDB
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipod_db
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -332,18 +332,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4257127508463692162
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4257127508463692162
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23