douban.fm 0.2.6 → 0.2.7

data/bin/douban.fm

@@ -225,8 +225,22 @@ class DoubanFMCLI
 
       # there are a lot more chances to get stack overflow in this mode,
       # so can't use the proc way
+      count = 0
       while true
-        @douban_fm.add_to_mpd(options.remote_host, options.remote_port)
+        if not @douban_fm.add_to_mpd(options.remote_host, options.remote_port)
+          count += 1
+
+          logger.log("playlist not updated, wait for 10 seconds, total waiting time #{count * 10} seconds")
+
+          if count == 360
+            logger.log('playlist has been updated for around one hour, go clear it')
+
+            @douban_fmn.clear_mpd_playlist(options.remote_host, options.remote_port)
+            count = 0
+          end
+        else
+          count = 0
+        end
         sleep 10
       end
     end

data/lib/douban.fm/douban_fm.rb

@@ -2,11 +2,14 @@ module DoubanFM
   require 'net/http'
   require 'json'
   require 'ruby-mpd'
+  require 'date'
 
   class DoubanFM
     # DOUBAN_FM_MPD_PLAYLIST = 'douban.fm'
     MIN_SONGS_IN_DOUBAN_FM_MPD_PLAYLIST = 10
 
+    RANDOM_CHANNEL_ID = -1
+
     attr_reader :waiting, :channels, :current_channel
 
     def initialize(logger = DummyLogger.new, email = '', password = '')
@@ -32,9 +35,16 @@ module DoubanFM
     end
 
     def fetch_channels
-      uri = URI('http://www.douban.com/j/app/radio/channels')
-      res = Net::HTTP.get(uri)
-      @channels = JSON.parse(res)
+      today = Date.new
+      if today != @last_fetching_channels_date
+        uri = URI('http://www.douban.com/j/app/radio/channels')
+        res = Net::HTTP.get(uri)
+        @channels = JSON.parse(res)
+
+        @last_fetching_channels_date = today
+      else
+        @logger.log('use channels in cache')
+      end
 
       @logger.log("raw channel list #{channels}")
     end
@@ -44,6 +54,14 @@ module DoubanFM
     end
 
     def fetch_next_playlist
+      if @current_channel == RANDOM_CHANNEL_ID
+        channel_id = select_random_channel
+      else
+        channel_id = @current_channel
+      end
+
+      @logger.log("now fetch next playlist from channel #{channel_id}")
+
       uri = URI('http://www.douban.com/j/app/radio/people')
       params = {
         :app_name => 'radio_desktop_mac',
@@ -53,7 +71,7 @@ module DoubanFM
         :token => @user_info['token'],
         :sid => '',
         :h => '',
-        :channel => @current_channel,
+        :channel => channel_id,
         :type => 'n'
       }
       uri.query = URI.encode_www_form(params)
@@ -136,6 +154,8 @@ module DoubanFM
 
       @logger.log("current total number of songs in mpd #{total}")
 
+      added = false
+
       if total < MIN_SONGS_IN_DOUBAN_FM_MPD_PLAYLIST
         # douban_fm_playlist = MPD::Playlist.new(mpd, {:playlist => DOUBAN_FM_MPD_PLAYLIST})
 
@@ -154,9 +174,13 @@ module DoubanFM
         end
 
         add_current_playlist_to_mpd(mpd)
+
+        added = true
       end
 
       mpd.disconnect
+
+      added
     end
 
     def clear_mpd_playlist(host = 'localhost', port = 6600)
@@ -223,5 +247,13 @@ module DoubanFM
         mpd.delete(i)
       end
     end
+
+    def select_random_channel
+      fetch_channels
+
+      channels = @channels['channels']
+      which = Random.new.rand(0 ... channels.size)
+      channels[which]['channel_id']
+    end
   end  
 end

data/lib/douban.fm/version.rb

@@ -1,3 +1,3 @@
 module DoubanFM
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: douban.fm
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-mpd
-  requirement: &70282342118460 !ruby/object:Gem::Requirement
+  requirement: &70283801171180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70282342118460
+  version_requirements: *70283801171180
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70282342117600 !ruby/object:Gem::Requirement
+  requirement: &70283801170340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,7 +32,7 @@ dependencies:
         version: 1.6.15
   type: :runtime
   prerelease: false
-  version_requirements: *70282342117600
+  version_requirements: *70283801170340
 description: douban.fm
 email:
 - hxliang1982@gmail.com