daapclient 0.0.1 → 0.0.2

data/README

@@ -24,6 +24,10 @@ After that, just install the gem:
 
   sudo gem install daapclient
 
+Also, check out the project page:
+
+http://rubyforge.org/projects/daapclient
+
 == Example Usage
 
   require 'net/daap'
@@ -41,6 +45,9 @@ After that, just install the gem:
         puts "Playlist name: #{pl.name}"
         pl.songs do |song|
           puts "#{song.artist} - #{song.name}"
+          File::open("db/#{song.artist} - #{song.name}.#{song.format}", "w") do |f|
+            f << song.get
+          end
         end
       end
     end
@@ -54,10 +61,11 @@ communication logic to the original Perl version by Richard Clamp.
 == Author
 
 This Ruby version is Copyright (c) Aaron Patterson 2005
+
 It also comes with a shameless plug for employment coding Ruby, my most
 favorite language!  ;-)
 
 == License
 
-This library is distributed un the GPL.  Please see the LICENSE file.
+This library is distributed under the GPL.  Please see the LICENSE file.
 

data/lib/itunes_sync.rb

@@ -0,0 +1,19 @@
+require 'net/daap'
+
+daap = Net::DAAP::Client.new('localhost')
+daap.connect do |dsn|
+  daap.databases do |db|
+    puts "All songs in the database"
+    db.songs do |song|
+      puts "#{song.artist} - #{song.name}"
+    end
+  
+    puts "Songs for each playlist"
+    db.playlists do |pl|
+      puts "Playlist name: #{pl.name}"
+      pl.songs do |song|
+        puts "#{song.artist} - #{song.name}"
+      end
+    end
+  end
+end

data/lib/net/CVS/Entries

@@ -1,2 +1,2 @@
-/daap.rb/1.1.1.1/Wed Dec  7 23:25:52 2005//
+/daap.rb/1.2/Thu Dec  8 18:09:42 2005//
 D/daap////

data/lib/net/daap/CVS/Entries

@@ -1,5 +1,5 @@
 /database.rb/1.1.1.1/Wed Dec  7 23:25:52 2005//
-/dmap.rb/1.1.1.1/Wed Dec  7 23:25:52 2005//
 /playlist.rb/1.1.1.1/Wed Dec  7 23:25:52 2005//
 /song.rb/1.1.1.1/Wed Dec  7 23:25:52 2005//
+/dmap.rb/1.2/Fri Dec  9 22:45:05 2005//
 D

data/lib/net/daap/dmap.rb

@@ -24,16 +24,38 @@ module Net
       end
 
       private
-      TYPE_TO_UNPACK = {
-        1     => 'c',
-        3     => 'n',
-        5     => 'N',
-        7     => 'Q',
-        9     => 'a*',
-        10    => 'N',
-        11    => 'nn',
-        42    => 'a*'
-      }
+      def type_to_unpack
+        types = nil
+        if big_endian?
+          types = {
+            1     => 'c',
+            3     => 'S',
+            5     => 'L',
+            7     => 'Q',
+            9     => 'a*',
+            10    => 'L',
+            11    => 'SS',
+            42    => 'a*'
+          }
+        else
+          types = {
+            1     => 'c',
+            3     => 'n',
+            5     => 'N',
+            7     => 'Q',
+            9     => 'a*',
+            10    => 'N',
+            11    => 'nn',
+            42    => 'a*'
+          }
+        end
+        types
+      end
+
+      def big_endian?
+        return @big_endian if @big_endian
+        @big_endian = "Ruby".unpack("i")[0] != 2036495698 ? true : false
+      end
 
       def update_content_codes
         content_codes = unpack(@daap.do_get("content-codes"))
@@ -75,7 +97,14 @@ module Net
         buffer = @code unless buffer
 
         while(buffer.length > 0)
-          tag, len = buffer.unpack("a4N")
+          tag, len = nil, nil
+
+          if big_endian?
+            tag, len = buffer.unpack("a4L")
+          else
+            tag, len = buffer.unpack("a4N")
+          end
+
           data = buffer[8...8+len]
 
           buffer[0...8+len] = ''
@@ -85,11 +114,11 @@ module Net
           if type == 12
             data = unpack(data)
           elsif type == 7
-            n1, n2 = data.unpack("N2")
+            n1, n2 = big_endian? ? data.unpack("L2") : data.unpack("N2")
             data = n1 << 32
             data += n2
           else
-            data = data.unpack(TYPE_TO_UNPACK[type])
+            data = data.unpack(type_to_unpack()[type])
           end
 
           if data.class == Array && data.length == 1 && data[0].class != Array || type == 11

data/lib/net/daap.rb

@@ -57,15 +57,18 @@ module Net
 
 # Connects to the iTunes server.  This method should be called right after
 # construction.  See DAAP for an example.
-      def connect(&connection)
+      def connect
         @http_client = Net::HTTP.start(@server_host, @server_port)
         find_validator
         @dmap = Net::DAAP::DMAP.new(:daap => self)
         load_server_info
         @connected = 1
-        yield @dsn
-        disconnect
-        @connected = 0
+        if block_given?
+          yield @dsn
+          disconnect
+          @connected = 0
+        end
+        @dsn
       end
 
 # Returns the databases found on the iTunes server.
@@ -77,12 +80,12 @@ module Net
         # FIXME check the value of listing
         @databases = []
         unpack_listing(listings) do |value|
+          db = Database.new(  :db_info  => value,
+                              :daap     => self )
           if block_given?
-            yield Database.new( :db_info => value,
-                                :daap    => self )
+            yield db
           else
-            @databases << Database.new( :db_info => value,
-                                        :daap    => self )
+            @databases << db
           end
         end
         @databases
@@ -127,10 +130,11 @@ module Net
         end
       end
 
-      private
+# Disconnects from the DAAP server
       def disconnect
         do_get("logout")
       end
+      private
       def load_server_info
         flat_list = @dmap.flat_list(do_get("server-info"))
         @dsn = flat_list['/dmap.serverinforesponse/dmap.itemname']

metadata

@@ -1,13 +1,13 @@
-!ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+--- !ruby/object:Gem::Specification 
+rubygems_version: 0.8.10
 specification_version: 1
 name: daapclient
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2005-12-07 00:00:00 -08:00
+  version: 0.0.2
+date: 2005-12-09
 summary: Net::DAAP::Client is an iTunes share client.
 require_paths: 
-- lib
+  - lib
 email: aaronp@rubyforge.org
 homepage: daapclient.rubyforge.org
 rubyforge_project: daapclient
@@ -18,131 +18,69 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
+    - 
+      - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
-- Aaron Patterson
+  - Aaron Patterson
 files: 
-- test/data
-- test/ts_daap.rb
-- test/tc_client.rb
-- test/CVS
-- test/tc_protocol.rb
-- test/data/mt-daapd
-- test/data/CVS
-- test/data/mt-daapd/079aca35773150da9fd98db10c7fd0c0.txt
-- test/data/mt-daapd/b3e894b87111bdba88e4765967f4b45a.txt
-- test/data/mt-daapd/d56b699830e77ba53855679cb1d252da.txt
-- test/data/mt-daapd/440c2217e6207c54c317c296f71f9769.txt
-- test/data/mt-daapd/e61ce3062cb76770658896b778ad06cd.txt
-- test/data/mt-daapd/7bded8b540fd082f102d25e181b47bc4.txt
-- test/data/mt-daapd/e9a8e709c2116651157182f130207048.txt
-- test/data/mt-daapd/f9073959a0afacebfab7e3bf19c2714a.txt
-- test/data/mt-daapd/CVS
-- test/data/mt-daapd/2972f65088b42a06b5d3ca089d71791d.txt
-- test/data/mt-daapd/4d1ce9f941cbd823ed06f1f1baa5a3b9.txt
-- test/data/mt-daapd/CVS/Entries
-- test/data/mt-daapd/CVS/Root
-- test/data/mt-daapd/CVS/Repository
-- test/data/CVS/Entries
-- test/data/CVS/Root
-- test/data/CVS/Repository
-- test/CVS/Entries
-- test/CVS/Root
-- test/CVS/Repository
-- lib/net
-- lib/CVS
-- lib/net/daap
-- lib/net/CVS
-- lib/net/daap.rb
-- lib/net/daap/database.rb
-- lib/net/daap/dmap.rb
-- lib/net/daap/song.rb
-- lib/net/daap/CVS
-- lib/net/daap/playlist.rb
-- lib/net/daap/CVS/Entries
-- lib/net/daap/CVS/Root
-- lib/net/daap/CVS/Repository
-- lib/net/CVS/Entries
-- lib/net/CVS/Root
-- lib/net/CVS/Repository
-- lib/CVS/Entries
-- lib/CVS/Root
-- lib/CVS/Repository
-- doc/rdoc-style.css
-- doc/created.rid
-- doc/fr_class_index.html
-- doc/classes
-- doc/index.html
-- doc/fr_method_index.html
-- doc/fr_file_index.html
-- doc/files
-- doc/classes/Net
-- doc/classes/Net.html
-- doc/classes/Net/DAAP
-- doc/classes/Net/DAAP.html
-- doc/classes/Net/DAAP/DAAPv3.html
-- doc/classes/Net/DAAP/DAAPv2.html
-- doc/classes/Net/DAAP/Database.src
-- doc/classes/Net/DAAP/DAAPv2.src
-- doc/classes/Net/DAAP/Playlist.html
-- doc/classes/Net/DAAP/DAAPv3.src
-- doc/classes/Net/DAAP/Database.html
-- doc/classes/Net/DAAP/DMAP.src
-- doc/classes/Net/DAAP/Song.src
-- doc/classes/Net/DAAP/Song.html
-- doc/classes/Net/DAAP/Client.src
-- doc/classes/Net/DAAP/Playlist.src
-- doc/classes/Net/DAAP/DMAP.html
-- doc/classes/Net/DAAP/Client.html
-- doc/classes/Net/DAAP/Database.src/M000011.html
-- doc/classes/Net/DAAP/Database.src/M000010.html
-- doc/classes/Net/DAAP/Database.src/M000009.html
-- doc/classes/Net/DAAP/DAAPv2.src/M000016.html
-- doc/classes/Net/DAAP/DAAPv2.src/M000015.html
-- doc/classes/Net/DAAP/DAAPv3.src/M000017.html
-- doc/classes/Net/DAAP/DAAPv3.src/M000018.html
-- doc/classes/Net/DAAP/DMAP.src/M000014.html
-- doc/classes/Net/DAAP/DMAP.src/M000012.html
-- doc/classes/Net/DAAP/DMAP.src/M000013.html
-- doc/classes/Net/DAAP/Song.src/M000019.html
-- doc/classes/Net/DAAP/Song.src/M000020.html
-- doc/classes/Net/DAAP/Client.src/M000004.html
-- doc/classes/Net/DAAP/Client.src/M000008.html
-- doc/classes/Net/DAAP/Client.src/M000007.html
-- doc/classes/Net/DAAP/Client.src/M000003.html
-- doc/classes/Net/DAAP/Client.src/M000006.html
-- doc/classes/Net/DAAP/Client.src/M000005.html
-- doc/classes/Net/DAAP/Playlist.src/M000001.html
-- doc/classes/Net/DAAP/Playlist.src/M000002.html
-- doc/files/CHANGELOG.html
-- doc/files/lib
-- doc/files/README.html
-- doc/files/LICENSE.html
-- doc/files/lib/net
-- doc/files/lib/net/daap_rb.html
-- doc/files/lib/net/daap
-- doc/files/lib/net/daap/playlist_rb.html
-- doc/files/lib/net/daap/song_rb.html
-- doc/files/lib/net/daap/dmap_rb.html
-- doc/files/lib/net/daap/database_rb.html
-- README
+  - test/CVS
+  - test/data
+  - test/tc_client.rb
+  - test/tc_protocol.rb
+  - test/ts_daap.rb
+  - test/CVS/Entries
+  - test/CVS/Repository
+  - test/CVS/Root
+  - test/data/CVS
+  - test/data/mt-daapd
+  - test/data/CVS/Entries
+  - test/data/CVS/Repository
+  - test/data/CVS/Root
+  - test/data/mt-daapd/079aca35773150da9fd98db10c7fd0c0.txt
+  - test/data/mt-daapd/2972f65088b42a06b5d3ca089d71791d.txt
+  - test/data/mt-daapd/440c2217e6207c54c317c296f71f9769.txt
+  - test/data/mt-daapd/4d1ce9f941cbd823ed06f1f1baa5a3b9.txt
+  - test/data/mt-daapd/7bded8b540fd082f102d25e181b47bc4.txt
+  - test/data/mt-daapd/b3e894b87111bdba88e4765967f4b45a.txt
+  - test/data/mt-daapd/CVS
+  - test/data/mt-daapd/d56b699830e77ba53855679cb1d252da.txt
+  - test/data/mt-daapd/e61ce3062cb76770658896b778ad06cd.txt
+  - test/data/mt-daapd/e9a8e709c2116651157182f130207048.txt
+  - test/data/mt-daapd/f9073959a0afacebfab7e3bf19c2714a.txt
+  - test/data/mt-daapd/CVS/Entries
+  - test/data/mt-daapd/CVS/Repository
+  - test/data/mt-daapd/CVS/Root
+  - lib/CVS
+  - lib/itunes_sync.rb
+  - lib/net
+  - lib/CVS/Entries
+  - lib/CVS/Repository
+  - lib/CVS/Root
+  - lib/net/CVS
+  - lib/net/daap
+  - lib/net/daap.rb
+  - lib/net/CVS/Entries
+  - lib/net/CVS/Repository
+  - lib/net/CVS/Root
+  - lib/net/daap/CVS
+  - lib/net/daap/database.rb
+  - lib/net/daap/dmap.rb
+  - lib/net/daap/playlist.rb
+  - lib/net/daap/song.rb
+  - lib/net/daap/CVS/Entries
+  - lib/net/daap/CVS/Repository
+  - lib/net/daap/CVS/Root
+  - README
 test_files: 
-- test/ts_daap.rb
+  - test/ts_daap.rb
 rdoc_options: []
-
 extra_rdoc_files: 
-- README
+  - README
 executables: []
-
 extensions: []
-
 requirements: []
-
-dependencies: []
-
+dependencies: []

data/doc/classes/Net/DAAP/Client.html

@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: Net::DAAP::Client</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">Net::DAAP::Client</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/lib/net/daap_rb.html">
-                lib/net/daap.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Object
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-    <div id="description">
-      <h1>Synopsis</h1>
-<p>
-The <a href="Client.html">Client</a> class interacts with the iTunes server
-to fetch lists of songs, databases, and playlists. Each <a
-href="Client.html">Client</a> class can have many <a
-href="Database.html">Database</a>, and each <a
-href="Database.html">Database</a> can have many <a
-href="Playlist.html">Playlist</a>, and many <a href="Song.html">Song</a>.
-See <a href="../DAAP.html">DAAP</a> for a code example.
-</p>
-
-    </div>
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000004">connect</a>&nbsp;&nbsp;
-      <a href="#M000005">databases</a>&nbsp;&nbsp;
-      <a href="#M000006">do_get</a>&nbsp;&nbsp;
-      <a href="#M000007">get_song</a>&nbsp;&nbsp;
-      <a href="#M000003">new</a>&nbsp;&nbsp;
-      <a href="#M000008">unpack_listing</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-    <div id="attribute-list">
-      <h3 class="section-bar">Attributes</h3>
-
-      <div class="name-list">
-        <table>
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">dmap</td>
-          <td class="context-item-value">&nbsp;[R]&nbsp;</td>
-          <td class="context-item-desc"></td>
-        </tr>
-        </table>
-      </div>
-    </div>
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Class methods</h3>
-
-      <div id="method-M000003" class="method-detail">
-        <a name="M000003"></a>
-
-        <div class="method-heading">
-          <a href="Client.src/M000003.html" target="Code" class="method-signature"
-            onclick="popupCode('Client.src/M000003.html');return false;">
-          <span class="method-name">new</span><span class="method-args">(server_host)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p>
-Create a new <a href="Client.html">Client</a> and pass in the host where
-the client will connect.
-</p>
-        </div>
-      </div>
-
-      <h3 class="section-bar">Public Instance methods</h3>
-
-      <div id="method-M000004" class="method-detail">
-        <a name="M000004"></a>
-
-        <div class="method-heading">
-          <a href="Client.src/M000004.html" target="Code" class="method-signature"
-            onclick="popupCode('Client.src/M000004.html');return false;">
-          <span class="method-name">connect</span><span class="method-args">() {|@dsn| ...}</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p>
-Connects to the iTunes server. This method should be called right after
-construction. See <a href="../DAAP.html">DAAP</a> for an example.
-</p>
-        </div>
-      </div>
-
-      <div id="method-M000005" class="method-detail">
-        <a name="M000005"></a>
-
-        <div class="method-heading">
-          <a href="Client.src/M000005.html" target="Code" class="method-signature"
-            onclick="popupCode('Client.src/M000005.html');return false;">
-          <span class="method-name">databases</span><span class="method-args">() {|Database.new( :db_info =&gt; value, :daap =&gt; self )| ...}</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p>
-Returns the databases found on the iTunes server.
-</p>
-        </div>
-      </div>
-
-      <div id="method-M000006" class="method-detail">
-        <a name="M000006"></a>
-
-        <div class="method-heading">
-          <a href="Client.src/M000006.html" target="Code" class="method-signature"
-            onclick="popupCode('Client.src/M000006.html');return false;">
-          <span class="method-name">do_get</span><span class="method-args">(request)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-      <div id="method-M000007" class="method-detail">
-        <a name="M000007"></a>
-
-        <div class="method-heading">
-          <a href="Client.src/M000007.html" target="Code" class="method-signature"
-            onclick="popupCode('Client.src/M000007.html');return false;">
-          <span class="method-name">get_song</span><span class="method-args">(request)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-      <div id="method-M000008" class="method-detail">
-        <a name="M000008"></a>
-
-        <div class="method-heading">
-          <a href="Client.src/M000008.html" target="Code" class="method-signature"
-            onclick="popupCode('Client.src/M000008.html');return false;">
-          <span class="method-name">unpack_listing</span><span class="method-args">(listing) {|record| ...}</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>

data/doc/classes/Net/DAAP/Client.src/M000003.html

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-<head>
-  <title>new (Net::DAAP::Client)</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
-</head>
-<body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/net/daap.rb, line 52</span>
-      <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">server_host</span>)
-        <span class="ruby-ivar">@server_host</span> = <span class="ruby-identifier">server_host</span>
-        <span class="ruby-ivar">@server_port</span> = <span class="ruby-value">3689</span>
-        <span class="ruby-ivar">@debug</span> = <span class="ruby-value">0</span>
-      <span class="ruby-keyword kw">end</span></pre>
-</body>
-</html>