ipod_db 0.2.5 → 0.2.6

data/README.md

@@ -1,7 +1,7 @@
 NAME
 ====
 
-    ipod_db v0.2.4
+    ipod_db v0.2.5
 
 SYNOPSIS
 ========
@@ -17,6 +17,10 @@ DESCRIPTION
 PARAMETERS
 ==========
 
+    --books=books, -b (0 ~> books=books) 
+        subdirectory of ipod with bookmarkable media 
+    --songs=songs, -s (0 ~> songs=songs) 
+        subdirectory of ipod with non-bookmarkable media 
     --version, -v 
         show package version and exit 
     --help, -h 
@@ -29,6 +33,8 @@ AUTHOR
 
 [![Build Status](https://travis-ci.org/artm/ipod_db.png)](https://travis-ci.org/artm/ipod_db)
 
+[![Code Climate](https://codeclimate.com/github/artm/ipod_db.png)](https://codeclimate.com/github/artm/ipod_db)
+
 
 SUBCOMMAND: sync
 ================
@@ -67,12 +73,12 @@ DESCRIPTION
 PARAMETERS
 ==========
 
-    --version, -v 
-        show package version and exit 
     --books=books, -b (0 ~> books=books) 
         subdirectory of ipod with bookmarkable media 
     --songs=songs, -s (0 ~> songs=songs) 
         subdirectory of ipod with non-bookmarkable media 
+    --version, -v 
+        show package version and exit 
     --help, -h 
 
 SUBCOMMAND: ls
@@ -91,6 +97,10 @@ DESCRIPTION
 PARAMETERS
 ==========
 
+    --books=books, -b (0 ~> books=books) 
+        subdirectory of ipod with bookmarkable media 
+    --songs=songs, -s (0 ~> songs=songs) 
+        subdirectory of ipod with non-bookmarkable media 
     --version, -v 
         show package version and exit 
     --help, -h 
@@ -115,6 +125,10 @@ PARAMETERS
     track (-2 -> track) 
          track numbers to delete from device (ranges like 2-5 are accepted 
         too). 
+    --books=books, -b (0 ~> books=books) 
+        subdirectory of ipod with bookmarkable media 
+    --songs=songs, -s (0 ~> songs=songs) 
+        subdirectory of ipod with non-bookmarkable media 
     --version, -v 
         show package version and exit 
     --help, -h 

data/Rakefile

@@ -1,4 +1,5 @@
 task :default => [:test, :build]
+
 task :readme do
   readme = `bin/ipod help`
 
@@ -6,6 +7,8 @@ task :readme do
 
 [![Build Status](https://travis-ci.org/artm/ipod_db.png)](https://travis-ci.org/artm/ipod_db)
 
+[![Code Climate](https://codeclimate.com/github/artm/ipod_db.png)](https://codeclimate.com/github/artm/ipod_db)
+
   __
 
   %w(sync ls rm).each do |subcommand|

data/bin/ipod

@@ -105,6 +105,8 @@ Main {
   def sync
     books_path = params['books'].value
     songs_path = params['songs'].value
+    sanitize_filenames books_path
+    sanitize_filenames songs_path
     books = collect_tracks books_path
     books = spread(books)
     songs = collect_tracks songs_path
@@ -149,14 +151,28 @@ Main {
   end
 
   def collect_tracks path
-    begin
-      tracks = []
-      Find.find(resolve_ipod_path path) do |filepath|
-        tracks << ipod_path(filepath) if track? filepath
+    tracks = []
+    Find.find(resolve_ipod_path path) do |filepath|
+      tracks << ipod_path(filepath) if track? filepath
+    end
+    tracks
+  rescue Errno::ENOENT
+    []
+  end
+
+  def sanitize_filenames path
+    rename_us = []
+    Find.find(resolve_ipod_path path) do |filepath|
+      base_name = File.basename filepath
+      sane_name = IpodDB.sanitize_filename base_name
+      unless base_name == sane_name
+        dir = File.dirname filepath
+        rename_us << [ filepath, "#{dir}/#{sane_name}" ]
       end
-      tracks
-    rescue Errno::ENOENT
-      []
+    end
+    rename_us.reverse_each do |from,to|
+      info "renaming #{from} to #{to}"
+      File.rename from, to
     end
   end
 
@@ -166,12 +182,13 @@ Main {
 
   def track_info track
     info = Map.new
-    info['playcount'] = track.playcount if track.playcount > 0
-    info['skipcount'] = track.skippedcount if track.skippedcount > 0
-    if track.bookmarkflag && track.bookmarktime > 0
-      pos = track.bookmarktime * 0.256 # ipod keeps time in 256 ms increments
+    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
       if pos > IgnorePlaybackPosUnder && pos / total_time >= IgnoreProgressUnder
         info['pos'] = Pretty.seconds pos
         info['total'] = Pretty.seconds total_time

data/ipod_db.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'taglib-ruby'
   s.add_runtime_dependency 'ruby-progressbar'
   s.add_runtime_dependency 'highline'
+  s.add_runtime_dependency 'activesupport'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler', '~> 1.3'

data/lib/bindata/itypes.rb

@@ -1,15 +1,16 @@
 require 'bindata'
 
-class Bool24 < BinData::Primitive
-  uint24le :int
+class IntBool < BinData::Primitive
   def get;   self.int==0 ? false : true ; end
   def set(v) self.int = v ? 1 : 0 ; end
 end
 
-class Bool8 < BinData::Primitive
+class Bool24 < IntBool
+  uint24le :int
+end
+
+class Bool8 < IntBool
   uint8 :int
-  def get;   self.int==0 ? false : true ; end
-  def set(v) self.int = v ? 1 : 0 ; end
 end
 
 class EncodedString < BinData::Primitive

data/lib/ipod_db/version.rb

@@ -1,3 +1,3 @@
 class IpodDB
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/lib/ipod_db.rb

@@ -3,6 +3,7 @@ require 'bindata'
 require 'bindata/itypes'
 require 'map'
 require 'pathname'
+require 'active_support/inflector'
 
 require 'ipod_db/version'
 
@@ -155,6 +156,10 @@ class IpodDB
     "#{@root_dir}/iPod_Control/iTunes/iTunes#{suffix}"
   end
 
+  def self.sanitize_filename filename
+    ActiveSupport::Inflector.transliterate(filename, '_')
+  end
+
   class PState < BinData::Record
     endian :little
     uint8 :volume, initial_value: 29

data/lib/pretty.rb

@@ -1,5 +1,6 @@
 module Pretty
   def Pretty.seconds seconds
+    seconds = seconds.to_i
     if seconds < 60
       "#{seconds} sec"
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipod_db
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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