douban.fm 0.1.1 → 0.2.1

data/README.md

@@ -2,7 +2,7 @@
 
 Play music from douban.fm.
 
-__Note that this project is still on-going, so I won't promise anything.__
+__Note that this project is still on-going, so I will only try my best to stablize the interface.__
 
 ## Installation
 
@@ -20,9 +20,47 @@ Or install it yourself as:
 
 ## Usage
 
-* to play your private playlist
+<pre>
+$ douban.fm -h
 
-    `douban.fm <email> <password>`
+Usage: douban.fm [OPTIONS]
+    -u, --user email                 douban.fm account name, normally an email address
+                                     if not provided, will play anonymous playlist
+    -p, --password [password]        douban.fm account password
+                                     if not provided, will be asked
+    -m, --mpd                        do not play by it own, send playlist to Music Player Daemon
+    -c, --channel channel            which channel to play
+                                     if not provided, channel 0 will be selected but who knows what it is
+    -l, --list                       list all available channels
+    -v, --verbose                    verbose mode
+    -h, --help                       show this message
+</pre>
+
+Basically there are two ways to play music
+
+* to play direclty by `mpg123`
+
+    Under this mode, music will be played by forking `mpg123` directly. Sorry currently there is no way to configure which music player to use.
+
+    * `douban.fm` will play anonymous playlist of channel 0
+    * `douban.fm -c 1` will play channel 1
+    * `douban.fm -u xxx@xxx.com -p xxx` will play private playlist
+    * `douban.fm -u xxx@xxx.com -p xxx -c 1` will play channel 1 but with your account signed in
+    * `douban.fm -u xxx@xx.com -p` will play private playlist but will ask for your password to sign in
+
+* to play by [Music Player Daemon](http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki)
+
+    Under this mode, URL of music will be sent to MPD which will actually play. Whenever there are less than _10_ songs in MPD playlist, more will be retrieved from douban.fm.
+
+    It is fantastic to use MPD since there are quite many [clients](http://mpd.wikia.com/wiki/Clients) to use. I am now just use my iPhone with [MPoD2](http://mpd.wikia.com/wiki/Client:MPoD2).
+
+    Thanks for @tdsparrow pointing out MPD, otherwise I might have been doing some really stupid things.
+
+    * `douban.fm -m` will play anonymous playlist of channel 0
+    * `douban.fm -m -c 1` will play channel 1
+    * `douban.fm -m -u xxx@xxx.com -p xxx` will play private playlist
+    * `douban.fm -m -u xxx@xxx.com -p xxx -c 1` will play channel 1 but with your account signed in
+    * `douban.fm -m -u xxx@xx.com -p` will play private playlist but will ask for your password to sign in
 
 ## Contributing
 

data/bin/douban.fm

@@ -4,128 +4,213 @@ require 'douban.fm'
 require 'optparse'
 require 'ostruct'
 
-def main
-  options = OpenStruct.new
-  options.verbose = false
+class DoubanFMCLI
+  def parse
+    options = OpenStruct.new
+    options.verbose = false
+
+    opts = OptionParser.new do |opts|
+      opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} [OPTIONS]"
+
+      opts.on('-u', '--user email',
+              'douban.fm account name, normally an email address',
+              'if not provided, will play anonymous playlist') do |email|
+        options.email = email
+      end
 
-  opts = OptionParser.new do |opts|
-    opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} [OPTIONS]"
+      opts.on('-p', '--password [password]',
+              'douban.fm account password',
+              'if not provided, will be asked') do |password|
+        options.password = password
+      end
 
-    opts.on('-u', '--user email',
-            'douban.fm account name, normally an email address',
-            'if not provided, will play anonymous playlist') do |email|
-      options.email = email
-    end
+      opts.on('-m', '--mpd', 'do not play by it own, send playlist to Music Player Daemon') do
+        options.mpd = true
+      end
 
-    opts.on('-p', '--password [password]',
-            'douban.fm account password',
-            'if not provided, will be asked') do |password|
-      options.password = password
-    end
+      opts.on('-r', '--remote remote', 'mpd remote host, in format of <IP>:<Port>') do |remote|
+        parts = remote.split(':')
+        if parts.length != 2
+          puts opts
+          exit
+        end
 
-    opts.on('-m', '--mpd', 'do not play by it own, send playlist to Music Player Daemon') do
-      options.mpd = true
-    end
+        options.remote_host = parts[0]
+        options.remote_port = parts[1].to_i
+      end
 
-    opts.on('-c', '--channel channel',
-            'which channel to play',
-            'if not provided, channel 0 will be selected but who knows what it is') do |channel|
-      options.channel = channel
-    end
+      opts.on('-c', '--channel channel',
+              'which channel to play',
+              'if not provided, channel 0 will be selected but who knows what it is') do |channel|
+        options.channel = channel
+      end
 
-    opts.on('-l', '--list', 'list all available channels') do
-      options.list = true
-    end
+      opts.on('-l', '--list', 'list all available channels') do
+        options.list = true
+      end
+
+      opts.on('-i', '--interaction', 'start an http server for interaction') do
+        options.interaction = true
+      end
+
+      opts.on('-v', '--verbose', 'verbose mode') do
+        options.verbose = true
+      end
 
-    opts.on('-v', '--verbose', 'verbose mode') do
-      options.verbose = true
+      opts.on_tail('-h', '--help', 'show this message') do
+        puts opts
+        exit
+      end
     end
 
-    opts.on_tail('-h', '--help', 'show this message') do
-      puts opts
+    opts.parse!
+
+    options
+  end
+
+  def main
+    options = parse
+
+    if not options.interaction.nil? and options.mpd.nil?
+      puts 'only mpd mode supports interaction'
       exit
     end
-  end
 
-  opts.parse!
+    if options.verbose
+      logger = DoubanFM::ConsoleLogger.new
+    else
+      logger = DoubanFM::DummyLogger.new
+    end
 
-  if options.verbose
-    logger = DoubanFM::ConsoleLogger.new
-  else
-    logger = DoubanFM::DummyLogger.new
-  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|
+        channel_id = channel['channel_id']
+        puts "#{channel_id}.#{' ' * (4 - channel_id.to_s.length)}#{channel['name']}"
+      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|
-      channel_id = channel['channel_id']
-      puts "#{channel_id}.#{' ' * (4 - channel_id.to_s.length)}#{channel['name']}"
+      exit
     end
 
-    exit
-  end
+    if options.channel.nil?
+      options.channel = 0
+    end
 
-  if options.channel.nil?
-    options.channel = 0
-  end
+    if options.email.nil?
+      @@douban_fm = DoubanFM::DoubanFM.new(logger)
+
+      logger.log('play anonymous playlist')
+    else
+      if options.password.nil? or options.password.empty?
+        require 'highline/import'
+        options.password = ask("Enter password: ") { |q| q.echo = false }
+      end
 
-  if options.email.nil?
-    douban_fm = DoubanFM::DoubanFM.new(logger)
+      @@douban_fm = DoubanFM::DoubanFM.new(logger, options.email, options.password)
+      @@douban_fm.login
 
-    logger.log('play anonymous playlist')
-  else
-    if options.password.nil? or options.password.empty?
-      require 'highline/import'
-      options.password = ask("Enter password: ") { |q| q.echo = false }
+      logger.log("login as user [#{options.email}]")
     end
 
-    douban_fm = DoubanFM::DoubanFM.new(logger, options.email, options.password)
-    douban_fm.login
+    @@douban_fm.select_channel(options.channel)
 
-    logger.log("login as user [#{options.email}]")
-  end
+    logger.log("select channel #{options.channel}")
+
+    if options.mpd.nil?
+      play_proc = proc do |waiting|
+        if waiting
+          begin
+            logger.log('fetch next playlist')
 
-  douban_fm.select_channel(options.channel)
+            @@douban_fm.fetch_next_playlist
+          rescue
+            logger.log('session expired, relogin')
 
-  logger.log("select channel #{options.channel}")
+            @@douban_fm.login
 
-  if options.mpd.nil?
-    play_proc = proc do |waiting|
-      if waiting
-        begin
-          logger.log('fetch next playlist')
+            logger.log('fetch next playlist')
 
-          douban_fm.fetch_next_playlist
-        rescue
-          logger.log('session expired, relogin')
+            @@douban_fm.fetch_next_playlist
+          end
 
-          douban_fm.login
+          logger.log('play current playlist')
 
-          logger.log('fetch next playlist')
+          @@douban_fm.play do |waiting|
+            play_proc.call(waiting)
+          end
+        end
+      end
 
-          douban_fm.fetch_next_playlist
+      play_proc.call(true)
+    else
+      unless options.interaction.nil?
+        require 'webrick'
+        require 'webrick/httpstatus'
+        require 'json'
+
+        servletClass = Class.new(WEBrick::HTTPServlet::AbstractServlet) do
+          class << self
+            def remote_host=(host)
+              @@remote_host = host
+            end
+
+            def remote_port=(port)
+              @@remote_port = port
+            end
+          end
+          @@remote_host = nil
+          @@remote_port = nil
+
+          def do_GET request, response
+            path = request.path[1..-1].split('/')
+            case path[0]
+            when 'channels'
+              @@douban_fm.fetch_channels
+              response.body = JSON.generate(@@douban_fm.channels)
+              raise WEBrick::HTTPStatus::OK
+            when 'channel'
+              unless path[1].nil?
+                # there is a race but not a big deal
+                @@douban_fm.select_channel(path[1].to_i)
+                @@douban_fm.clear_mpd_playlist(@@remote_host, @@remote_port)
+                raise WEBrick::HTTPStatus::OK
+              else
+                raise WEBrick::HTTPStatus::NotFound
+              end
+            else
+              raise WEBrick::HTTPStatus::NotFound
+            end
+          end
         end
 
-        logger.log('play current playlist')
+        servletClass.remote_host = options.remote_host
+        servletClass.remote_port = options.remote_port
 
-        douban_fm.play do |waiting|
-          play_proc.call(waiting)
+        Thread.new do
+          server = WEBrick::HTTPServer.new(:Port => 3000)
+
+          %w[INT TERM].each do |signal|
+            trap(signal) do
+              server.shutdown
+              Thread.main.kill # die hard
+            end
+          end
+
+          server.mount("/", servletClass)
+          server.start
         end
       end
-    end
 
-    play_proc.call(true)
-  else
-    # 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
-      sleep 10
+      # 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)
+        sleep 10
+      end
     end
   end
 end
 
-main
-
+DoubanFMCLI.new.main
 sleep

data/lib/douban.fm/douban_fm.rb

@@ -97,7 +97,17 @@ module DoubanFM
     end
 
     def add_to_mpd(host = 'localhost', port = 6600)
+      if host.nil?
+        host = 'localhost'
+      end
+      if port.nil?
+        port = 6600
+      end
+
       mpd = MPD.new(host, port)
+
+      @logger.log("connecting to mpd at #{host}:#{port}")
+
       mpd.connect
 
       # remove after played
@@ -143,14 +153,36 @@ module DoubanFM
           fetch_next_playlist
         end
 
-        @logger.log("add more songs to mpd")
+        add_current_playlist_to_mpd(mpd)
+      end
 
-        @current_playlist['song'].each do |song|
-          @logger.log("send [#{song['url'].gsub('\\', '')}] to mpd")
+      mpd.disconnect
+    end
 
-          # douban_fm_playlist.add(song['url'].gsub('\\', ''))
-          mpd.add(song['url'].gsub('\\', ''))
-        end
+    def clear_mpd_playlist(host = 'localhost', port = 6600)
+      if host.nil?
+        host = 'localhost'
+      end
+      if port.nil?
+        port = 6600
+      end
+
+      mpd = MPD.new(host, port)
+
+      @logger.log("connecting to mpd at #{host}:#{port}")
+
+      mpd.connect
+
+      @logger.log('crop or clear current playlist')
+
+      status = mpd.status
+      mpd.clear # this will stop mpd if it is playing
+
+      fetch_next_playlist
+      add_current_playlist_to_mpd(mpd)
+
+      if status[:state] == :play
+        mpd.play
       end
 
       mpd.disconnect
@@ -166,5 +198,30 @@ module DoubanFM
         end
       end
     end
+
+    private
+
+    def add_current_playlist_to_mpd(mpd)
+      @logger.log("add more songs to mpd")
+
+      @current_playlist['song'].each do |song|
+        @logger.log("send [#{song['url'].gsub('\\', '')}] to mpd")
+
+        mpd.add(song['url'].gsub('\\', ''))
+      end
+    end
+
+    # currently not used
+    def crop(mpd, status)
+      total = status[:playlistlength]
+      current = status[:song]
+
+      total.downto(current + 2) do |i|
+        mpd.delete(i)
+      end
+      current.downto(1) do |i|
+        mpd.delete(i)
+      end
+    end
   end  
 end

data/lib/douban.fm/version.rb

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

metadata

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