douban.fm 0.4.0 → 0.4.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjAxNmM3NzU1ODc3N2ZjMzc4NDJjMTdmM2Q4Y2VmY2I4NmY3NTJjNg==
+  data.tar.gz: !binary |-
+    NzIzM2NiY2IyNjUxOWEyZjRlNGZkNTczMDJhZTllZTRhNTQzZDMzZg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OGI2MGUxZjFkMWVhODA2NTIwODJjYTdiMjQ3Y2I3MzRkNTBhN2Y5NGRkZGJm
+    MWY1OTZjMDA5NjVlMjc3MDI1NjY1N2U2YzY0MmY3MTFlN2FkZDEwYWFjZjAy
+    OGY3ZTBiNmE1N2RmZmUwYTNiMDBlMDExOTM0Y2IyYTY4YzRmMDg=
+  data.tar.gz: !binary |-
+    YTAzMmY5Yzk0MWUyOWM2NjlkZmQ5OWZmOGIzYjYwZGY4OTg1MTg2OGUyZDdk
+    M2UwOWM2MDQ1OWI3ODkyOWI2OWUzOWFlMjVkMjZhNGQ5OTIyNzVmMTMzYzRi
+    MGFjNDBhOWIzYTk5YmZiYzNmNjRjODJkNGM4ZGQxMmNmZjg1MmE=

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea/*

data/README.md

@@ -36,6 +36,7 @@ Usage: douban.fm [OPTIONS]
                                      if not provided, 64kbps will be used as default
                                      for non-pro user this option simply does not work
     -l, --list                       list all available channels
+    -f, --favor [count]              list favorites songs
     -i, --interaction [port]         start an http server for interaction
                                      if omit port, 3000 will be used by default
                                      GET /channels to get all available channels

data/bin/douban.fm

@@ -56,6 +56,11 @@ class DoubanFMCLI
         options.list = true
       end
 
+      opts.on('-f', '--favor [count]', 'list favorites songs') do |count|
+        options.favor = true
+        options.liked = count.to_i
+      end
+
       opts.on('-i', '--interaction [port]',
               'start an http server for interaction',
               'if omit port, 3000 will be used by default',
@@ -135,6 +140,15 @@ class DoubanFMCLI
       logger.log("login as user [#{options.email}]")
     end
 
+    if options.favor
+      @douban_fm.fetch_liked_songs(options.liked)
+      @douban_fm.liked_songs['songs'].each_with_index do |song, index|
+        puts "#{index}#{' '*(4 - index.to_s.length)}#{song['title']} - #{song['artist']}"
+      end
+
+      exit
+    end
+
     @douban_fm.select_channel(options.channel)
 
     logger.log("select channel #{options.channel}")

data/index.html

@@ -8,7 +8,7 @@
     <meta name="author" content="@honnix,@jihao">
 
     <!-- CSS -->
-    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="http://twitter.github.io/bootstrap/assets/css/bootstrap.css" rel="stylesheet">
     <style type="text/css">
 
       /* Sticky footer styles
@@ -66,7 +66,7 @@
         padding: 2px 2px;
       }
     </style>
-    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="http://twitter.github.io/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
@@ -121,7 +121,7 @@
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
-    <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-button.js"></script>
+    <script src="http://twitter.github.io/bootstrap/assets/js/bootstrap-button.js"></script>
     <script type="text/javascript">
       $(function(){
         $('a#now').button('loading');

data/lib/douban.fm/douban_fm.rb

@@ -10,7 +10,7 @@ module DoubanFM
 
     RANDOM_CHANNEL_ID = -1
 
-    attr_reader :waiting, :channels, :current_channel, :kbps
+    attr_reader :waiting, :channels, :current_channel, :kbps, :liked_songs
 
     def initialize(logger = DummyLogger.new, email = '', password = '')
       @logger = logger
@@ -23,7 +23,7 @@ module DoubanFM
 
     def login
       uri = URI('http://www.douban.com/j/app/login')
-      res = Net::HTTP.post_form(uri,
+      res = get_http_client().post_form(uri,
                                 'email' => @email,
                                 'password' => @password,
                                 'app_name' => 'radio_desktop_mac',
@@ -38,7 +38,7 @@ module DoubanFM
       today = Date.new
       if today != @last_fetching_channels_date
         uri = URI('http://www.douban.com/j/app/radio/channels')
-        res = Net::HTTP.get(uri)
+        res = get_http_client().get(uri)
         @channels = JSON.parse(res)
 
         @last_fetching_channels_date = today
@@ -49,6 +49,27 @@ module DoubanFM
       @logger.log("raw channel list #{channels}")
     end
 
+    def fetch_liked_songs(count)
+      uri = URI('http://www.douban.com/j/app/radio/liked_songs')
+      params = {
+          :app_name => 'radio_desktop_mac',
+          :version => '100',
+          :user_id => @user_info['user_id'],
+          :expire => @user_info['expire'],
+          :token => @user_info['token'],
+          :count => count,
+          :exclude => ''
+      }
+      uri.query = URI.encode_www_form(params)
+      res = get_http_client().get_response(uri)
+      @liked_songs = JSON.parse(res.body)
+      @logger.log("liked songs #{@liked_songs}")
+
+      unless @liked_songs['err'].nil?
+        raise @liked_songs
+      end
+    end
+
     def select_channel(channel_num)
       @current_channel = channel_num
     end
@@ -81,7 +102,7 @@ module DoubanFM
       }
       @logger.log(params)
       uri.query = URI.encode_www_form(params)
-      res = Net::HTTP.get_response(uri)
+      res = get_http_client().get_response(uri)
 
       @current_playlist = JSON.parse(res.body)
 
@@ -230,6 +251,15 @@ module DoubanFM
     end
 
     private
+    def get_http_client
+      proxy = ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
+      unless proxy.nil?
+        m = proxy.match(/(http(s)?:\/\/)?(?<proxy_addr>.*):(?<proxy_port>[0-9]*)/)
+        Net::HTTP::Proxy(m['proxy_addr'], m['proxy_port'])
+      else
+        Net::HTTP
+      end
+    end
 
     def add_current_playlist_to_mpd(mpd)
       @logger.log("add more songs to mpd")

data/lib/douban.fm/version.rb

@@ -1,3 +1,3 @@
 module DoubanFM
-  VERSION = '0.4.0'
+  VERSION = '0.4.4'
 end

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: douban.fm
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors:
 - honnix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-mpd
-  requirement: &70273789925180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70273789925180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70273789924420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.15
   type: :runtime
   prerelease: false
-  version_requirements: *70273789924420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.15
 description: douban.fm
 email:
 - hxliang1982@gmail.com
@@ -55,27 +60,26 @@ files:
 - lib/douban.fm/version.rb
 homepage: https://github.com/honnix/douban.fm
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: douban.fm
 test_files: []
 has_rdoc: