douban.fm 0.0.2 → 0.1.0

data/bin/douban.fm

@@ -1,53 +1,131 @@
 #!/usr/bin/env ruby
 
 require 'douban.fm'
+require 'optparse'
+require 'ostruct'
 
-unless ARGV.length == 2
-  p "douban_fm.rb <email> <password>"
-  exit
-end
+def main
+  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.on('-p', '--password [password]',
+            'douban.fm account password',
+            'if not provided, will be asked') do |password|
+      options.password = password
+    end
+
+    opts.on('-m', '--mpd', 'do not play by it own, send playlist to Music Player Daemon') do
+      options.mpd = true
+    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('-v', '--verbose', 'verbose mode') do
+      options.verbose = true
+    end
+
+    opts.on_tail('-h', '--help', 'show this message') do
+      puts opts
+      exit
+    end
+  end
+
+  opts.parse!
+
+  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
+
+    exit
+  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
+
+    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)
+
+  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.fetch_next_playlist
+        rescue
+          logger.log('session expired, relogin')
+
+          douban_fm.login
+
+          logger.log('fetch next playlist')
+
+          douban_fm.fetch_next_playlist
+        end
+
+        logger.log('play current playlist')
+
+        douban_fm.play do |waiting|
+          play_proc.call(waiting)
+        end
+      end
+    end
 
-email = ARGV[0]
-password = ARGV[1]
-douban_fm = DoubanFM::DoubanFM.new(email, password)
-douban_fm.login
-douban_fm.get_channels
-douban_fm.select_channel(0)
-
-# stop = false
-# go_on = true
-# while not stop
-#   if go_on
-#     p "================="
-#     go_on = false
-#     douban_fm.get_next_playlist
-#     douban_fm.play_current_playlist do |waiting|
-#       unless waiting
-#         stop = true
-#         break
-#       else
-#         go_on = true
-#       end
-#     end
-#   else
-#     sleep 10
-#   end
-# end
-
-play_proc = proc do |waiting|
-  if waiting
-    begin
-      douban_fm.get_next_playlist
-    rescue
-      douban_fm.login
-    end
-    
-    douban_fm.play_current_playlist do |waiting|
-      play_proc.call(waiting)
+    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
     end
   end
 end
 
-play_proc.call(true)
+main
 
 sleep

data/douban.fm.gemspec

@@ -15,4 +15,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_dependency 'ruby-mpd'
+  gem.add_dependency 'highline'
 end

data/lib/douban.fm.rb

@@ -1,2 +1,3 @@
 require 'douban.fm/version'
 require 'douban.fm/douban_fm'
+require 'douban.fm/logger'

data/lib/douban.fm/douban_fm.rb

@@ -1,15 +1,21 @@
 module DoubanFM
   require 'net/http'
   require 'json'
+  require 'ruby-mpd'
 
   class DoubanFM
-    attr_reader :waiting
+    DOUBAN_FM_MPD_PLAYLIST = 'douban.fm'
+    MIN_SONGS_IN_DOUBAN_FM_MPD_PLAYLIST = 10
 
-    def initialize(email, password)
+    attr_reader :waiting, :channels, :current_playlist
+
+    def initialize(logger = DummyLogger.new, email = '', password = '')
+      @logger = logger
       @email = email
       @password = password
       @semaphore = Mutex.new
-      @waiting = false # read this to determin whether to get one more playlist
+      @waiting = false # read this to determin whether to fetch one more playlist
+      @user_info = {'user_id' => '', 'expire' => '', 'token' => ''}
     end
 
     def login
@@ -25,17 +31,19 @@ module DoubanFM
       end
     end
 
-    def get_channels
+    def fetch_channels
       uri = URI('http://www.douban.com/j/app/radio/channels')
-      res = Net::HTTP.get(URI('http://www.douban.com/j/app/radio/channels'))
+      res = Net::HTTP.get(uri)
       @channels = JSON.parse(res)
+
+      @logger.log("raw channel list #{channels}")
     end
 
     def select_channel(channel_num)
       @current_channel = channel_num
     end
 
-    def get_next_playlist
+    def fetch_next_playlist
       uri = URI('http://www.douban.com/j/app/radio/people')
       params = {
         :app_name => 'radio_desktop_mac',
@@ -53,12 +61,14 @@ module DoubanFM
 
       @current_playlist = JSON.parse(res.body)
 
+      @logger.log("raw playlist #{current_playlist}")
+
       unless @current_playlist['err'].nil?
         raise @current_playlist
       end
     end
 
-    def play_current_playlist
+    def play
       @continue = true
 
       Thread.new do
@@ -72,10 +82,12 @@ module DoubanFM
             break
           end
 
-          @player_pid = spawn("mpg123 #{song['url']}")
+          @player_pid = spawn("mpg123 #{song['url']} > /dev/null 2>&1")
 
           @semaphore.unlock
 
+          @logger.log("playing song \"#{song['title']}\"")
+
           Process.wait
         end
 
@@ -84,12 +96,58 @@ module DoubanFM
       end
     end
 
+    def add_to_mpd(host = 'localhost', port = 6600)
+      mpd = MPD.new(host, port)
+      mpd.connect
+
+      begin
+        songs = mpd.send_command(:listplaylistinfo, DOUBAN_FM_MPD_PLAYLIST)
+        if songs.is_a? String
+          total = 1
+        else
+          total = songs.length
+        end
+      rescue
+        total = 0
+      end
+
+      @logger.log("current total number of songs in mpd #{total}")
+
+      if total < MIN_SONGS_IN_DOUBAN_FM_MPD_PLAYLIST
+        douban_fm_playlist = MPD::Playlist.new(mpd, {:playlist => DOUBAN_FM_MPD_PLAYLIST})
+
+        begin
+          @logger.log('fetch next playlist')
+
+          fetch_next_playlist
+        rescue
+          @logger.log('session expired, relogin')
+
+          login
+
+          @logger.log('fetch next playlist')
+
+          fetch_next_playlist
+        end
+
+        @logger.log("add more songs to mpd")
+
+        @current_playlist['song'].each do |song|
+          @logger.log("send [#{song['url'].gsub('\\', '')}] to mpd")
+
+          douban_fm_playlist.add(song['url'].gsub('\\', ''))
+        end
+      end
+
+      mpd.disconnect
+    end
+
     def stop
       @semaphore.synchronize do
         @continue = false
 
         begin
-          Process.kill(9, @player_pid)
+          Process.kill(9, @player_pid) unless @player_pid.nil?
         rescue Errno::ESRCH
         end
       end

data/lib/douban.fm/logger.rb

@@ -0,0 +1,11 @@
+module DoubanFM
+  class DummyLogger
+    def log(message); end
+  end
+
+  class ConsoleLogger
+    def log(message)
+      puts message
+    end
+  end
+end

data/lib/douban.fm/version.rb

@@ -1,3 +1,3 @@
 module DoubanFM
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: douban.fm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-01-17 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-mpd
+  requirement: &70182454448200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70182454448200
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &70182454447640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70182454447640
 description: douban.fm
 email:
 - hxliang1982@gmail.com
@@ -28,6 +50,7 @@ files:
 - douban.fm.gemspec
 - lib/douban.fm.rb
 - lib/douban.fm/douban_fm.rb
+- lib/douban.fm/logger.rb
 - lib/douban.fm/version.rb
 homepage: https://github.com/honnix/douban.fm
 licenses: []
@@ -49,8 +72,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: douban.fm
 test_files: []
+has_rdoc: