ipod_db 0.2.8 → 0.2.9

data/Guardfile

@@ -3,6 +3,7 @@
 
 guard 'bundler' do
   watch('Gemfile')
+  watch('ipod_db.gemspec')
 end
 
 guard 'minitest' do

data/README.md

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

data/bin/ipod

@@ -2,38 +2,29 @@
 
 Main {
   version IpodDB::VERSION
+  author 'artm <femistofel@gmail.com>'
+  name 'ipod_db'
 
   description <<-__
   A couple of tools for working with iPod Shuffle (2nd gen) database from
   command line. Each subcommand understands -h/--help flag.
   __
 
-  author 'artm <femistofel@gmail.com>'
-
-  name 'ipod_db'
-  config(
-    ipod_root: "/media/#{ENV['USER']}/IPOD",
-    group_together: [
-      # Just an example
-      [ "60-Second", "Science Talk", "This Week in Science" ],
-      [ "StarShipSofa", "Tales To Terrify" ],
-    ])
   option('books','b') {
     argument_required
     default 'books'
     description 'subdirectory of ipod with bookmarkable media'
   }
+
   option('songs','s') {
     argument_required
     default 'songs'
     description 'subdirectory of ipod with non-bookmarkable media'
   }
+
   option('version','v') {
     description 'show package version and exit'
   }
-  IgnorePlaybackPosUnder = 10
-  IgnoreProgressUnder = 0.01
-  FinishedProgress = 0.97
 
   def run
     if param['version'].given?
@@ -96,7 +87,7 @@ 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*FinishedProgress).floor }%
+      above zero or progress above #{ (100*Ipod::Track::FinishedProgress).floor }%
       __
     }
     option('pretend','n') {
@@ -123,7 +114,9 @@ Main {
   end
 
   def ls
-    @ipod_db.each_track_with_index {|track,i| list_track i, track}
+    @ipod_db.each_track_with_index do |track,i|
+      list_track i, Ipod::Track.new(track.merge(ipod_root: @ipod_root))
+    end
   end
 
   def rm
@@ -133,8 +126,8 @@ Main {
     unless @pretend
       if agree "Are you sure you want them gone (Y/n)?", true
         FileUtils.rm tracks.map{|i,path|resolve_ipod_path path}
+        sync
       end
-      sync
     end
   end
 
@@ -146,10 +139,6 @@ Main {
     File.join @ipod_root, ipath
   end
 
-  def track_length( path )
-    TagLib::FileRef.open(path){|file| file.audio_properties.length}
-  end
-
   def load_ipod_db
     @ipod_root = config['ipod_root']
     unless IpodDB.looks_like_ipod? @ipod_root
@@ -189,48 +178,35 @@ Main {
     IpodDB::ExtToFileType.include? File.extname(path)
   end
 
-  def track_info track
-    info = Map.new
-    info['playcount'] = track.playcount if track.fetch('playcount',0) > 0
-    info['skipcount'] = track.skippedcount if track.fetch('skippedcount',0) > 0
-    if track.fetch('bookmarktime',0) > 0
-      abs_path = resolve_ipod_path track.filename
-      total_time = track_length(abs_path)
-      # ipod keeps time in 256 ms increments
-      pos = [total_time, track.bookmarktime * 0.256].min
-      progress = pos / total_time
-      if pos > IgnorePlaybackPosUnder && progress >= IgnoreProgressUnder
-        info['pos'] = Pretty.seconds pos
-        info['total'] = Pretty.seconds total_time
-        info['progress'] = progress
-      end
-    end
-    info
-  end
-
   def list_track i, track
-    abs_path = resolve_ipod_path track.filename
-    exists = File.exists?(abs_path)
-    track_color = exists ? :green : :red
-
-    listing_entry = "%2d: %s" % [i,track.filename.apply_format( color: track_color )]
+    listing_entry = "%2d: %s" % [i,track.filename.apply_format( color: track_color(track))]
     listing_entry = listing_entry.bold if @ipod_db.playback_state.trackno == i
     puts listing_entry
+    display_progress track
+  end
+
+  def track_color track
+    if track.exists? then
+      if track.finished?
+        :cyan
+      else
+        :green
+      end
+    else
+      :red
+    end
+  end
 
-    return unless exists
+  def display_progress track
+    if track.exists? and track.pos >= IgnoreProgressUnder and
+      track.progress.between?(IgnoreProgressUnder,Ipod::Track::FinishedProgress)
 
-    info = track_info(track)
-    if info.include? 'progress'
       progress = ProgressBar.create(
-        format: "    [%b #{info.pos.yellow} %P%%%i] #{info.total.yellow}",
-        starting_at: (100*info.progress),
+        format: "    [%b #{Pretty.seconds(track.pos).yellow} %P%%%i] #{Pretty.seconds(track.length).yellow}",
+        starting_at: (100*track.progress),
       )
       puts
     end
-    ['pos','total','progress'].each{|f| info.delete(f)}
-    if info.count > 0
-      puts "    " + info.map{|label,value| "#{label}: #{value.to_s.yellow}"}.join(" ")
-    end
   end
 
   def parse_track_list args
@@ -254,10 +230,6 @@ Main {
     tracks
   end
 
-  def finished? track
-    track.fetch('playcount',0) > 0 || track_info(track).fetch('progress',0) >= FinishedProgress
-  end
-
   def spread paths, group_lambda = lambda {|path| track_group(path)}
     bins = paths.group_by &group_lambda
     bins.each do |key, bin|
@@ -274,6 +246,17 @@ Main {
     end
     File.dirname(track)
   end
+
+  IgnorePlaybackPosUnder = 10
+  IgnoreProgressUnder = 0.01
+
+  config({
+    ipod_root: "/media/#{ENV['USER']}/IPOD",
+    group_together: [
+      # Just an example
+      [ "60-Second", "Science Talk", "This Week in Science" ],
+      [ "StarShipSofa", "Tales To Terrify" ],
+    ]})
 }
 
 BEGIN {
@@ -282,7 +265,6 @@ BEGIN {
   require 'pathname'
   require 'smart_colored/extend'
   require 'map'
-  require 'taglib'
   require 'ruby-progressbar'
   require 'highline/import'
   require 'fileutils'
@@ -290,6 +272,7 @@ BEGIN {
 
   # our own
   require 'ipod_db'
+  require 'ipod/track'
   require 'pretty'
   require 'spread'
 }

data/ipod_db.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler', '~> 1.3'
   # not sure where this belongs, they are part of my development process
-  s.add_development_dependency 'purdytest'
+  s.add_development_dependency 'minitest-reporters'
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-minitest'
   s.add_development_dependency 'guard-bundler'

data/lib/ipod/track.rb

@@ -0,0 +1,54 @@
+require 'ostruct'
+require 'taglib'
+require 'fileutils'
+
+module Ipod
+  class Track < OpenStruct
+    FinishedProgress = 0.97
+    SecondsPerTick = 0.256
+
+    def absolute_path
+      File.join ipod_root, filename
+    end
+
+    def exists?
+      @exists ||= File.exists? absolute_path
+    end
+
+    def finished?
+      playcount > 0 or progress > FinishedProgress
+    end
+
+    def progress
+      pos / length
+    end
+
+    def pos
+      Track.ticks_to_sec(bookmarktime)
+    end
+
+    def 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.
+      #
+      # if file is readonly TagLib still opens it but closing is much faster.
+      #
+      old_stat = File::Stat.new(absolute_path)
+      begin
+        FileUtils.chmod('a-w', absolute_path)
+        TagLib::FileRef.open(absolute_path){|file| file.audio_properties.length}
+      ensure
+        FileUtils.chmod(old_stat.mode, absolute_path)
+      end
+    end
+
+    def self.sec_to_ticks(sec)
+      sec / SecondsPerTick
+    end
+
+    def self.ticks_to_sec(ticks)
+      ticks * SecondsPerTick
+    end
+  end
+end

data/lib/ipod_db/version.rb

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

data/spec/ipod/track_spec.rb

@@ -0,0 +1,68 @@
+require "spec_helper"
+require "ipod/track"
+
+describe Ipod::Track do
+
+  describe "#exists?" do
+
+    it "knows if file exists" do
+      track = Ipod::Track.new filename: "/books/chapter1.mp3", ipod_root: "/mount/ipod"
+
+      File.mock_stub :exists?, true, ["/mount/ipod/books/chapter1.mp3"] do
+        assert track.exists?
+      end
+    end
+
+    it "knows if file doesn't exist" do
+      track = Ipod::Track.new filename: "/books/chapter1.mp3", ipod_root: "/mount/ipod"
+
+      File.mock_stub :exists?, false, ["/mount/ipod/books/chapter1.mp3"] do
+        refute track.exists?
+      end
+    end
+
+  end
+
+  describe '#finished?' do
+
+    it 'is true if playcount > 0' do
+      track = Ipod::Track.new playcount: 1
+      assert track.finished?
+    end
+
+    it 'is true if progress above threshold' do
+      track = Ipod::Track.new playcount: 0, bookmarktime: Ipod::Track.sec_to_ticks(99)
+      track.stub :length, 100 do
+        assert track.finished?
+      end
+    end
+
+    it 'is false if progress below threshold' do
+      track = Ipod::Track.new playcount: 0, bookmarktime: Ipod::Track.sec_to_ticks(5)
+      track.stub :length, 100 do
+        refute track.finished?
+      end
+    end
+
+  end
+
+  describe '#pos' do
+
+    it 'represents bookmarktime in seconds' do
+      track = Ipod::Track.new bookmarktime: 1
+      assert_in_delta track.pos, Ipod::Track::SecondsPerTick
+    end
+
+  end
+
+  describe '#progress' do
+
+    it 'represents progress in track' do
+      track = Ipod::Track.new bookmarktime: Ipod::Track.sec_to_ticks(25)
+      track.stub :length, 100 do
+        assert_in_delta track.progress, 0.25
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 require 'minitest/autorun'
-require 'purdytest'
+require "minitest/reporters"
+MiniTest::Reporters.use!  [
+  MiniTest::Reporters::DefaultReporter.new,
+  MiniTest::Reporters::GuardReporter.new,
+]
 $LOAD_PATH.push "File.dirname(__FILE__)/../lib"
 require 'bindata'
 
@@ -51,3 +55,14 @@ module Enumerable
     ds
   end
 end
+
+class Object
+  def mock_stub name, retval, args=[], &block
+    mock = MiniTest::Mock.new
+    mock.expect name, retval, args
+    stub name, proc{|*args| mock.method_missing(name,*args)} do
+      yield
+    end
+    mock.verify
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipod_db
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -172,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: purdytest
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -303,10 +303,12 @@ files:
 - doc/ITunesDB - wikiPodLinux.html
 - ipod_db.gemspec
 - lib/bindata/itypes.rb
+- lib/ipod/track.rb
 - lib/ipod_db.rb
 - lib/ipod_db/version.rb
 - lib/pretty.rb
 - lib/spread.rb
+- spec/ipod/track_spec.rb
 - spec/ipod_db_spec.rb
 - spec/spec_helper.rb
 - spec/spread_spec.rb
@@ -332,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1960172244731333251
+      hash: 4257127508463692162
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -341,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1960172244731333251
+      hash: 4257127508463692162
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -349,6 +351,7 @@ signing_key:
 specification_version: 3
 summary: ipod database access
 test_files:
+- spec/ipod/track_spec.rb
 - spec/ipod_db_spec.rb
 - spec/spec_helper.rb
 - spec/spread_spec.rb