daapclient 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,13 @@
+= Net::DAAP::Client Changelog
+
+== 0.2.2
+
+* Added Net::DAAP::Song#save which will automatically save files for you
+* Added Net::DAAP::Client#connect_db which will automatically yield a database
+* Added a new example for downloading songs
+* Added 'net/daap/speed_hacks' for improving Net::HTTP speed
+* Fixed a couple warnings
+
 == 0.2.1
 
 * Added support for DAAP server passwords

data/EXAMPLES

@@ -1,6 +1,6 @@
 = Net::DAAP::Client examples
 
-== Simple example
+== Simple example, download every song
   require 'net/daap'
   require 'fileutils'
   
@@ -10,13 +10,7 @@
     daap.databases.each do |db|
       puts "All songs in the database"
       db.songs.each do |song|
-        filename = "#{song.artist.name} - #{song.name}.#{song.format}"
-        directory = "db/#{song.artist.name}/#{song.album.name}"
-        FileUtils::mkdir_p(directory)
-  
-        File.open("#{directory}/#{filename}", "w") do |f|
-          song.get { |str| f.write str }
-        end
+        song.save
       end
     end
   end

data/NOTES

@@ -1,5 +1,26 @@
 = Net::DAAP::Client Release Notes
 
+== 0.2.2
+
+This release of Net::DAAP::Client (the ruby itunes client) has a few important
+improvements.  First, a new method called "connect_db" has been added to
+Net::DAAP::Client.  This method will automatically connect to a server and
+yield every database to the block.  Here's an example:
+ Net::DAAP::Client.new('localhost').connect_db { |db|
+   db.songs.each { |song| puts song }
+ }
+A 'save' method has been added to Net::DAAP::Song to make it easier to save
+that song.  The save method comes up with a name to save the song for you.
+For example, to save every song in the database you could do this:
+ Net::DAAP::Client.new('localhost').connect_db { |db|
+   db.songs.each { |song| song.save }
+ }
+The final new addition is 'net/daap/speed_hacks'.  iTunes uses HTTP as its
+transport, and ruby's net/http is slow when downloading large files.  Be
+very careful when requiring this library as it overrides a method in the
+built in net/http library.  Just require the library and you will get a
+significant speed increase.
+
 == 0.2.0
 
 Net::DAAP::Client has a newer, extended interface.  In addition to the song

data/lib/net/daap.rb

@@ -9,6 +9,7 @@ require 'net/daap/song'
 require 'net/daap/playlist'
 require 'net/daap/database'
 require 'net/daap/daap_version'
+require 'net/daap/speed_hacks'
 
 
 module Net
@@ -63,6 +64,7 @@ module Net
         @log         = Logger.new(nil)
         @session_id  = nil
         @request_id  = nil
+        @connected   = nil
         yield self if block_given?
       end
 
@@ -84,6 +86,15 @@ module Net
         @dsn
       end
 
+      # Connect to the server and yield each database to the caller, then
+      # automatically disconnect from the server.
+      def connect_db(&block)
+        raise ArgumentError if block.nil?
+        connect
+        databases.each { |db| block.call(db) }
+        disconnect
+      end
+
 # Returns the databases found on the iTunes server.
       def databases
         unless @connected
@@ -123,7 +134,7 @@ module Net
         req = Net::HTTP::Get.new(url, request_headers(url))
         req.basic_auth('iTunes_4.6', @password) if ! @password.nil?
         res = @http_client.request(req) do |response|
-          response.read_body &block
+          response.read_body(&block)
         end
 
         case res

data/lib/net/daap/daap_version.rb

@@ -1,7 +1,5 @@
-# DO NOT EDIT
-# This file is auto-generated by build scripts
 module Net
   module DAAP
-    Version = '0.2.1'
+    Version = '0.2.2'
   end
 end

data/lib/net/daap/song.rb

@@ -1,9 +1,12 @@
+require 'fileutils'
+
 module Net
   module DAAP
 # This class contains song information returned from the DAAP server.
     class Song
       include Comparable
       attr_reader :size, :album, :name, :artist, :format, :persistentid, :id
+      attr_accessor :path, :file
 
       alias :to_s :name
 
@@ -18,6 +21,10 @@ module Net
         @id             = args['dmap.itemid']
         @daap           = args[:daap]
         @db             = args[:db]
+        @path = [@artist.name, @album.name].collect { |name|
+          name.gsub(File::SEPARATOR, '_')
+        }.join(File::SEPARATOR)
+        @file = "#{@name.gsub(File::SEPARATOR, '_')}.#{@format}"
       end
 
 # Fetches the song data from the DAAP server and returns it.
@@ -26,6 +33,18 @@ module Net
         @daap.get_song("databases/#{@db.id}/items/#{filename}", &block)
       end
 
+      def save(basedir = nil)
+        path = "#{basedir}#{File::SEPARATOR}#{@path}"
+        FileUtils::mkdir_p(path)
+        filename = "#{path}#{File::SEPARATOR}#{@file}"
+        File.open(filename, "wb") { |file|
+          get do |str|
+            file.write str
+          end
+        }
+        @daap.log.debug("Saved #{filename}") if @daap.log
+      end
+
       def <=>(other)
         name <=> other.name
       end

data/lib/net/daap/speed_hacks.rb

@@ -0,0 +1,25 @@
+if RUBY_VERSION > "1.8.2"
+class Net::InternetMessageIO #:nodoc:
+  alias :old_rbuf_fill :rbuf_fill
+  def rbuf_fill
+    begin
+      @rbuf << @io.read_nonblock(65536)
+    rescue Errno::EWOULDBLOCK
+      if IO.select([@io], nil, nil, @read_timeout)
+        @rbuf << @io.read_nonblock(65536)
+      else
+        raise Timeout::TimeoutError
+      end
+    end
+  end
+end
+else
+class Net::InternetMessageIO #:nodoc:
+  alias :old_rbuf_fill :rbuf_fill
+  def rbuf_fill
+    timeout(@read_timeout) {
+      @rbuf << @socket.sysread(8192)
+    }
+  end
+end
+end

data/test/mock_server.rb

@@ -39,6 +39,7 @@ module Net
       get(req.url, block)
     end
 
+    alias :old_get :get
     def get(*args, &block)
       md5 = Digest::MD5.new(args[0])
       contents = nil

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: daapclient
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2006-07-09 00:00:00 -07:00
+  version: 0.2.2
+date: 2006-08-27 00:00:00 -07:00
 summary: Net::DAAP::Client is an iTunes share client.
 require_paths: 
   - lib
@@ -64,6 +64,7 @@ files:
   - lib/net/daap/dmap.rb
   - lib/net/daap/playlist.rb
   - lib/net/daap/song.rb
+  - lib/net/daap/speed_hacks.rb
   - README
   - LICENSE
   - CHANGELOG