douban.fm 0.2.1 → 0.2.2

data/bin/douban.fm

@@ -83,9 +83,9 @@ class DoubanFMCLI
     end
 
     if options.list
-      @@douban_fm = DoubanFM::DoubanFM.new(logger)
-      @@douban_fm.fetch_channels
-      @@douban_fm.channels['channels'].sort_by { |i| i['channel_id'] }.each do |channel|
+      @douban_fm = DoubanFM::DoubanFM.new(logger)
+      @douban_fm.fetch_channels
+      @douban_fm.channels['channels'].sort_by { |i| i['channel_id'] }.each do |channel|
         channel_id = channel['channel_id']
         puts "#{channel_id}.#{' ' * (4 - channel_id.to_s.length)}#{channel['name']}"
       end
@@ -98,7 +98,7 @@ class DoubanFMCLI
     end
 
     if options.email.nil?
-      @@douban_fm = DoubanFM::DoubanFM.new(logger)
+      @douban_fm = DoubanFM::DoubanFM.new(logger)
 
       logger.log('play anonymous playlist')
     else
@@ -107,13 +107,13 @@ class DoubanFMCLI
         options.password = ask("Enter password: ") { |q| q.echo = false }
       end
 
-      @@douban_fm = DoubanFM::DoubanFM.new(logger, options.email, options.password)
-      @@douban_fm.login
+      @douban_fm = DoubanFM::DoubanFM.new(logger, options.email, options.password)
+      @douban_fm.login
 
       logger.log("login as user [#{options.email}]")
     end
 
-    @@douban_fm.select_channel(options.channel)
+    @douban_fm.select_channel(options.channel)
 
     logger.log("select channel #{options.channel}")
 
@@ -123,20 +123,20 @@ class DoubanFMCLI
           begin
             logger.log('fetch next playlist')
 
-            @@douban_fm.fetch_next_playlist
+            @douban_fm.fetch_next_playlist
           rescue
             logger.log('session expired, relogin')
 
-            @@douban_fm.login
+            @douban_fm.login
 
             logger.log('fetch next playlist')
 
-            @@douban_fm.fetch_next_playlist
+            @douban_fm.fetch_next_playlist
           end
 
           logger.log('play current playlist')
 
-          @@douban_fm.play do |waiting|
+          @douban_fm.play do |waiting|
             play_proc.call(waiting)
           end
         end
@@ -158,9 +158,15 @@ class DoubanFMCLI
             def remote_port=(port)
               @@remote_port = port
             end
+
+            def douban_fm=(fm)
+              @@douban_fm = fm
+            end
           end
+
           @@remote_host = nil
           @@remote_port = nil
+          @@douban_fm = nil
 
           def do_GET request, response
             path = request.path[1..-1].split('/')
@@ -178,6 +184,8 @@ class DoubanFMCLI
               else
                 raise WEBrick::HTTPStatus::NotFound
               end
+            when 'now'
+              response.body = JSON.generate({'channel' => @@douban_fm.current_channel})
             else
               raise WEBrick::HTTPStatus::NotFound
             end
@@ -186,6 +194,7 @@ class DoubanFMCLI
 
         servletClass.remote_host = options.remote_host
         servletClass.remote_port = options.remote_port
+        servletClass.douban_fm = @douban_fm
 
         Thread.new do
           server = WEBrick::HTTPServer.new(:Port => 3000)
@@ -205,7 +214,7 @@ class DoubanFMCLI
       # there are a lot more chances to get stack overflow in this mode,
       # so can't use the proc way
       while true
-        @@douban_fm.add_to_mpd(options.remote_host, options.remote_port)
+        @douban_fm.add_to_mpd(options.remote_host, options.remote_port)
         sleep 10
       end
     end

data/lib/douban.fm/douban_fm.rb

@@ -7,7 +7,7 @@ module DoubanFM
     # DOUBAN_FM_MPD_PLAYLIST = 'douban.fm'
     MIN_SONGS_IN_DOUBAN_FM_MPD_PLAYLIST = 10
 
-    attr_reader :waiting, :channels, :current_playlist
+    attr_reader :waiting, :channels, :current_channel
 
     def initialize(logger = DummyLogger.new, email = '', password = '')
       @logger = logger
@@ -61,7 +61,7 @@ module DoubanFM
 
       @current_playlist = JSON.parse(res.body)
 
-      @logger.log("raw playlist #{current_playlist}")
+      @logger.log("raw playlist #{@current_playlist}")
 
       unless @current_playlist['err'].nil?
         raise @current_playlist

data/lib/douban.fm/version.rb

@@ -1,3 +1,3 @@
 module DoubanFM
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

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