BtSync 0.4.4 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjhjNTQxZjA4ZjE2NzBmMjBjZTc2MWFiZDg1YjQ2MDdmN2E3MTY5Ng==
+    Zjg0ZjExNzNmN2ZiYWU5OGFmOTFhYzg0ZmI2MDJhMWY1ZmYzMmEwMA==
   data.tar.gz: !binary |-
-    MGZiNjQ3MzY0NDVmNmYyNjM2YjJlOGZmNmQ1YThiMWMyNTA4ZDkyYg==
+    YjUxOGM4MGQ0MjJhZTM4Y2I2OTQ1ZmRlMDZjNzMxNGNiMWYyNTkwMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmMyYjY4ZTU3NWRhOTc4ZThmNTAwYTVmZDEyYjU4YWQyMTg4OTNlOTMzMjk5
-    MmVhNGQ2ZWI3OWJlZmM0ODI4NTFiODIyM2M1NzU5Y2YzM2U0YmVkZDhlYWFl
-    ZGM0NzE1YmY3OGFmZGQ3Y2IxYTVkMjdhZTdmZjIwYTMyZTZjNmY=
+    YmJlMTBlYzNiZWE3ZDI0OWM5ZmUyNWFmNTk1NmZmMjYyY2VkNzFkODYyODdm
+    MzNjN2Q1ZjRmNWFhMWZkYTJlNWRhNWVmOGFkYTNiYTI5ZGUzNDUyN2JjZTQw
+    Y2ZiNGQ5YzM0YTc0ZjYwOGMxOGUyYmIyNjNiZGQyMWVmM2YyMTM=
   data.tar.gz: !binary |-
-    MGFkMWU3ZTAyNTk1MjMwODJiNTk4YWFjMWZiN2Y5OWRmY2Y2YzUyY2E5NTFj
-    MmM1N2YwOTQ0NDVlNDYzZmUwOTdhYjYzMjJhYWFjYTg4NThhZGNlOWFmNTI5
-    MjVhOWIxNmU1ZTZmYTMyNzEyNDhhYTY0MmRhNmExOWJjYWY3MzI=
+    YWQ1MGMzMmUzZDRmZDlmNjE4ODViMTIzODk3OTUxZjNhODM0MWZjZWZjOTll
+    ZmNkODNmYTFiYzFjZTFlM2Y4YmYzZTc2MGJjODcyMzlmZjc3MmQxYTY4YTI4
+    NzcyZTE0MGE0NzhkNjU4ODYwMTBkOTc3NDY3MDk0NGE0ZWFlZTk=

data/README.md

@@ -24,7 +24,18 @@ Or install it yourself as:
 ### Using BtSync
 
 ```ruby
-bittorrent = BtSync.new
+bittorrent = BtSync.new(options)
+
+options is a hash that can contain any of the following options.  The values shown are the defaults if no argument is passed in
+
+```ruby
+{
+  :protocol => "http",
+  :uri => "localhost",
+  :port => "8888",
+  :user => "",
+  :password => ""
+}
 ```
 
 ####BtSync::Directory
@@ -44,7 +55,12 @@ On a ```BtSync::Directory``` you can
 
 ## Todo
 
-[ ] Manage predefined hosts
+[x] Manage predefined hosts
+[x] Allow user authentication
+
+## Known Issues
+
+[] Bittorrent Sync must be run on a Linux system
 
 ## Contributing
 

data/lib/btsync.rb

@@ -10,10 +10,17 @@ class BtSync
   include HTTParty
   default_params :output => 'json'
   def initialize options = {}
-    @opts = options.symbolize
-    @opts.merge!({:uri => "http://localhost", :port => "8888", :user => "", :password => ""})
-    @uri = @opts[:uri]
+    @opts = {
+      :protocol => "http",
+      :uri => "localhost",
+      :port => "8888",
+      :user => "",
+      :password => ""}
+    @opts.merge!(options.symbolize)
+    @opts[:uri].gsub!(/^(https?:\/\/){1,}/i, '')
     @port =  @opts[:port]
+    @user = @opts[:user]
+    @pass = @opts[:password]
     @errors = []
     @token_cache = 0
   end
@@ -30,6 +37,35 @@ class BtSync
     end
     folders
   end
+  def upload_limit
+    get_settings["ulrate"].to_i
+  end
+  def download_limit
+    get_settings["dlrate"].to_i
+  end
+  def device_name
+    get_settings["devicename"]
+  end
+  def listening_port
+    get_settings["listeningport"].to_i
+  end
+  def upload_limit= opt
+    change_setting "ulrate", opt
+  end
+  def download_limit= opt
+    change_setting "dlrate", opt
+  end
+  def device_name= opt
+    change_setting "devicename", opt
+  end
+  def listening_port= opt
+    change_setting "listeningport", opt
+  end
+  def change_setting type, opt
+    options = get_settings.merge!({type => opt})
+
+    res = self.class.get(path('setsettings'), :query => options, :headers => {"Cookie" => cookies })
+  end
   def get_speed
     s = get_folder_list["speed"].split(", ")
     up = s[0].split(" ")

data/lib/btsync/communicator.rb

@@ -6,10 +6,22 @@ module BtCommunicator
     res.parsed_response["secret"]
   end
   def port
-    @port
+    @opts[:port]
   end
   def uri
-    @uri
+    @opts[:uri]
+  end
+  def protocol
+    @opts[:protocol]
+  end
+  def user
+    @opts[:user]
+  end
+  def password
+    @opts[:password]
+  end
+  def communication_options
+    @opts
   end
   def token force = false
     @token_cache ||= 0
@@ -25,7 +37,7 @@ module BtCommunicator
     @cookies ||= request_token.headers["set-cookie"].split("; ")[0]
   end
   def root_url
-    "#{uri}:#{port}/"
+    "#{starter}#{uri}:#{port}/"
   end
   def request_token force = false
     @last_request ||= 0
@@ -37,7 +49,9 @@ module BtCommunicator
       @request_token
     end
   end
-
+  def starter
+    "#{protocol}://#{user}:#{password}@"
+  end
   def path action_name
     "#{root_url}gui/?token=#{token}&action=#{action_name}"
   end

data/lib/btsync/directory.rb

@@ -9,8 +9,7 @@ class BtSync
       @name = name
       @secret = secret
 
-      @uri = btsync.uri
-      @port = btsync.port
+      @opts = btsync.communication_options
 
       find_or_create
 
@@ -43,7 +42,24 @@ class BtSync
     end
     def known_hosts
       res = self.class.get(path('getknownhosts'), :query => {:name => name, :secret => secret}, :headers => {"Cookie" => cookies })
-      res["hosts"]
+      hosts = {}
+      res["hosts"].map{|h| hosts[h["index"]] = h["peer"]}
+      hosts
+    end
+    def add_host host, port
+      res = self.class.get(path('addknownhosts'), :query =>{:name => name, :secret => secret, :addr =>host, :port => port}, :headers => {"Cookie" => cookies })
+      true
+    end
+    def remove_host index
+      res = self.class.get(path('removeknownhosts'), :query =>{:name => name, :secret => secret, :index => index}, :headers => {"Cookie" => cookies })
+      if res.parsed_response != {}
+        res.parsed_response
+      else
+        true
+      end
+    end
+    def remove_host_by_ip ip, port = nil
+      @hosts = known_hosts
     end
     def use_tracker=(opt)
       set_pref('usetracker', opt)

data/lib/btsync/version.rb

@@ -1,3 +1,3 @@
 module BtsyncVersion
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/spec/BtSync/bt_sync_spec.rb

@@ -20,6 +20,66 @@ describe 'BtSync' do
     @settings["devicename"].should == "IceyEC-Virtual1"
     @settings["listeningport"].should == 63754
   end
+  it "can get listening port" do
+    VCR.use_cassette("get-settings") do
+      @bt.listening_port.should == 63754
+    end
+  end
+  it "can get upload limit" do
+    VCR.use_cassette("get-settings") do
+      @bt.upload_limit.should == 0
+    end
+  end
+  it "can get download limit" do
+    VCR.use_cassette("get-settings") do
+      @bt.download_limit.should == 0
+    end
+  end
+  it "can get device name" do
+    VCR.use_cassette("get-settings") do
+      @bt.device_name.should == "IceyEC-Virtual1"
+    end
+  end
+  it "can change the device_name" do
+    VCR.use_cassette("change_name") do
+      @bt.device_name = "IceyEC-Virtual2"
+      @bt.device_name.should == "IceyEC-Virtual2"
+    end
+    VCR.use_cassette('reset_device_name') do
+      @bt.device_name = "IceyEC-Virtual1"
+      @bt.device_name.should == "IceyEC-Virtual1"
+    end
+  end
+  it "can change the upload limit" do
+    VCR.use_cassette("change_upload_limit") do
+      @bt.upload_limit = 1000
+      @bt.upload_limit.should == 1000
+    end
+    VCR.use_cassette('reset_upload_limit') do
+      @bt.upload_limit = 0
+      @bt.upload_limit.should == 0
+    end
+  end
+  it "can change the download limit" do
+    VCR.use_cassette("change_download_limit") do
+      @bt.download_limit = 1000
+      @bt.download_limit.should == 1000
+    end
+    VCR.use_cassette('reset_download_limit') do
+      @bt.download_limit = 0
+      @bt.download_limit.should == 0
+    end
+  end
+  it "can change the listening_port" do
+    VCR.use_cassette("change_listening_port") do
+      @bt.listening_port = 12345
+      @bt.listening_port.should == 12345
+    end
+    VCR.use_cassette('reset_listening_port') do
+      @bt.listening_port = 63754
+      @bt.listening_port.should == 63754
+    end
+  end
   it "can check the OS" do
     VCR.use_cassette("get-os-type") do
       @os = @bt.get_os_type

data/spec/BtSync/directory_spec.rb

@@ -33,13 +33,27 @@ describe 'BtSync::Directory' do
     VCR.use_cassette("get-peers") do
       @peers = @directory.peers
     end
-    @peers.first.should == nil
+    @peers.first.should == {"direct"=>1, "name"=>"IceyEC Portable", "status"=>"Synced on 06/05/13 20:52:35"}
   end
-  it "can get see known hosts" do
+  it "can get known hosts" do
     VCR.use_cassette("get-known-hosts") do
       @hosts = @directory.known_hosts
     end
-    @hosts.first["peer"].should == "192.168.1.5:45685"
+    @hosts[0].should == "192.168.1.5:45685"
+  end
+  it "can add a known host" do
+    VCR.use_cassette('add-known-host') do
+      @directory.add_host('10.0.1.254', '12345')
+      @hosts = @directory.known_hosts
+    end
+    @hosts[1].should == "10.0.1.254:12345"
+  end
+  it "can remove a known host" do
+    VCR.use_cassette('remove-known-host') do
+      @directory.remove_host(1)
+      @hosts = @directory.known_hosts
+    end
+    @hosts.values.should_not include '10.0.1.254:12345'
   end
   it "can check it's settings" do
     VCR.use_cassette("get-preferences") do

data/spec/fixtures/cassettes/Setup-BtSync-Directory.yml

@@ -19,23 +19,23 @@ http_interactions:
       Content-Type:
       - text/html
       Set-Cookie:
-      - GUID=E3lhmlycmFgf7ESFDvoZ; path=/
+      - GUID=cQaFdm1vWSBv9LvephVY; path=/
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: <html><div id='token' style='display:none;'>XkuWXu3e6UgIFlZ7Z-DRbgZRZKUuVp5HOH9Z5m1d4B_DS4YoEU_Tqy4fslEAAAAA</div></html>
+      string: <html><div id='token' style='display:none;'>QLBnhvyW_0jKDqQDwuhTM-1X6DfFF7xJDNSq4G5QowPTdzMqbGLGBn-DtlEAAAAA</div></html>
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:14 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=XkuWXu3e6UgIFlZ7Z-DRbgZRZKUuVp5HOH9Z5m1d4B_DS4YoEU_Tqy4fslEAAAAA
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=QLBnhvyW_0jKDqQDwuhTM-1X6DfFF7xJDNSq4G5QowPTdzMqbGLGBn-DtlEAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=E3lhmlycmFgf7ESFDvoZ
+      - GUID=cQaFdm1vWSBv9LvephVY
   response:
     status:
       code: 200
@@ -44,16 +44,17 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '185'
+      - '270'
       Content-Type:
       - application/json; charset=utf-8
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [  ],
-        "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files" } ],
-        "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files"
+        } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:14 GMT
 recorded_with: VCR 2.5.0

data/spec/fixtures/cassettes/Setup-Directory-Settings.yml

@@ -19,23 +19,23 @@ http_interactions:
       Content-Type:
       - text/html
       Set-Cookie:
-      - GUID=BuR9HOy5Q7UR5Kg4zToj; path=/
+      - GUID=SZGEavWRWlylZwpb4y1U; path=/
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: <html><div id='token' style='display:none;'>5K85aW3p3a6w1SYpvmcT2b8wfIf78_IiXbhF8rWcC89R0jqH44Zm3C4fslEAAAAA</div></html>
+      string: <html><div id='token' style='display:none;'>cNJuLdTzhAVEgK83V3Ai3F9LGEGb2oDNWAwa1BWst7Dpo45MpwWH93-DtlEAAAAA</div></html>
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:14 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=5K85aW3p3a6w1SYpvmcT2b8wfIf78_IiXbhF8rWcC89R0jqH44Zm3C4fslEAAAAA
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=cNJuLdTzhAVEgK83V3Ai3F9LGEGb2oDNWAwa1BWst7Dpo45MpwWH93-DtlEAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=BuR9HOy5Q7UR5Kg4zToj
+      - GUID=SZGEavWRWlylZwpb4y1U
   response:
     status:
       code: 200
@@ -44,27 +44,28 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '185'
+      - '270'
       Content-Type:
       - application/json; charset=utf-8
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [  ],
-        "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files" } ],
-        "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files"
+        } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:14 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=setfolderpref&deletetotrash=1&name=/home/chris/Documents&output=json&relay=1&searchdht=0&searchlan=1&secret=6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ&token=5K85aW3p3a6w1SYpvmcT2b8wfIf78_IiXbhF8rWcC89R0jqH44Zm3C4fslEAAAAA&usehosts=1&usetracker=1
+    uri: http://localhost:8888/gui/?action=setfolderpref&deletetotrash=1&name=/home/chris/Documents&output=json&relay=1&searchdht=0&searchlan=1&secret=6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ&token=cNJuLdTzhAVEgK83V3Ai3F9LGEGb2oDNWAwa1BWst7Dpo45MpwWH93-DtlEAAAAA&usehosts=1&usetracker=1
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=BuR9HOy5Q7UR5Kg4zToj
+      - GUID=SZGEavWRWlylZwpb4y1U
   response:
     status:
       code: 200
@@ -82,5 +83,5 @@ http_interactions:
       encoding: US-ASCII
       string: ! '{  }'
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:14 GMT
 recorded_with: VCR 2.5.0

data/spec/fixtures/cassettes/add-folder-list.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=7cFoPQ5VvJbcU25vUUYeQSl9uIa5_NkKsdM3lRLFyhjTp7_f9OnU8S4fslEAAAAA
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=0yGezY2QZeVy7GPzaV-TQ6SuOMns8TlPgbHND059Qv-NnsquBvqIln-DtlEAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=ONEG0039oAQKNtLjyOBm
+      - GUID=YvUwERzuA6KDtWx5gBqG
   response:
     status:
       code: 200
@@ -17,19 +17,20 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '310'
+      - '395'
       Content-Type:
       - application/json; charset=utf-8
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [  ],
-        "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files" },
-        { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "SXBX73B6OSTJ3P3AEUKGGPK6EKLO5L4K",
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files"
+        }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "FEEBRD6KX6NFZYJRVVN6WKGONI467MZE",
         "size": "0 B in 0 files" } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:13 GMT
 - request:
     method: get
     uri: http://localhost:8888/gui/token.html?output=text
@@ -49,23 +50,23 @@ http_interactions:
       Content-Type:
       - text/html
       Set-Cookie:
-      - GUID=jlXfE6H2JiIC9fxgLaBP; path=/
+      - GUID=Cp4jt4ReFqAFFPOa27Ug; path=/
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: <html><div id='token' style='display:none;'>N5D8txAkMcW3ObY8moLCoGcM_YnI-O9Wik1iTXirs846mayy0WsnnC4fslEAAAAA</div></html>
+      string: <html><div id='token' style='display:none;'>M-w4xBeY_d3X2M0_exuoHEuilyomwOAykfZQQBoqiBJYEnv-U7EtQ3-DtlEAAAAA</div></html>
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:13 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=N5D8txAkMcW3ObY8moLCoGcM_YnI-O9Wik1iTXirs846mayy0WsnnC4fslEAAAAA
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=M-w4xBeY_d3X2M0_exuoHEuilyomwOAykfZQQBoqiBJYEnv-U7EtQ3-DtlEAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=jlXfE6H2JiIC9fxgLaBP
+      - GUID=Cp4jt4ReFqAFFPOa27Ug
   response:
     status:
       code: 200
@@ -74,19 +75,20 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '310'
+      - '395'
       Content-Type:
       - application/json; charset=utf-8
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [  ],
-        "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files" },
-        { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "SXBX73B6OSTJ3P3AEUKGGPK6EKLO5L4K",
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files"
+        }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "FEEBRD6KX6NFZYJRVVN6WKGONI467MZE",
         "size": "0 B in 0 files" } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:13 GMT
 - request:
     method: get
     uri: http://localhost:8888/gui/token.html?output=text
@@ -106,23 +108,23 @@ http_interactions:
       Content-Type:
       - text/html
       Set-Cookie:
-      - GUID=NTxZnDWPqRo7MpZ0QSdl; path=/
+      - GUID=WBI9LeZzdEJEU8GfuXFY; path=/
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: <html><div id='token' style='display:none;'>-Ic-huNGlb8K_-Pg1klrdCIgKD9efaYWpx2yXli-v83JfZ46-P26lC4fslEAAAAA</div></html>
+      string: <html><div id='token' style='display:none;'>w7z2LJ6KChGJLPNEAKaHWyfhXeY0qUSd106gAEt-Zpax0zeVZp0NVH-DtlEAAAAA</div></html>
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:13 GMT
 - request:
     method: get
-    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=-Ic-huNGlb8K_-Pg1klrdCIgKD9efaYWpx2yXli-v83JfZ46-P26lC4fslEAAAAA
+    uri: http://localhost:8888/gui/?action=getsyncfolders&output=json&token=w7z2LJ6KChGJLPNEAKaHWyfhXeY0qUSd106gAEt-Zpax0zeVZp0NVH-DtlEAAAAA
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Cookie:
-      - GUID=NTxZnDWPqRo7MpZ0QSdl
+      - GUID=WBI9LeZzdEJEU8GfuXFY
   response:
     status:
       code: 200
@@ -131,17 +133,18 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '310'
+      - '395'
       Content-Type:
       - application/json; charset=utf-8
       Cache-Control:
       - no-cache
     body:
       encoding: US-ASCII
-      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [  ],
-        "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files" },
-        { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "SXBX73B6OSTJ3P3AEUKGGPK6EKLO5L4K",
+      string: ! '{ "folders": [ { "name": "\/home\/chris\/Documents", "peers": [ {
+        "direct": 1, "name": "IceyEC Portable", "status": "Synced on 06\/05\/13 20:52:35"
+        } ], "secret": "6PX74LIR2RA2FF2W3DC25MG2CF6SQDSJ", "size": "0 B in 0 files"
+        }, { "name": "\/home\/chris\/bt_test", "peers": [  ], "secret": "FEEBRD6KX6NFZYJRVVN6WKGONI467MZE",
         "size": "0 B in 0 files" } ], "speed": "0.0 kB\/s up, 0.0 kB\/s down" }'
     http_version: 
-  recorded_at: Fri, 07 Jun 2013 17:58:06 GMT
+  recorded_at: Tue, 11 Jun 2013 01:55:13 GMT
 recorded_with: VCR 2.5.0