douban.fm 0.3.1 → 0.4.0

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 ehonlia
+Copyright (c) 2013 honnix
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -32,6 +32,9 @@ Usage: douban.fm [OPTIONS]
     -r, --remote remote              mpd remote host, in format of <IP>:<Port>
     -c, --channel channel            which channel to play
                                      if not provided, channel 0 will be selected but who knows what it is
+    -k, --kbps kbps                  set kbps
+                                     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
     -i, --interaction [port]         start an http server for interaction
                                      if omit port, 3000 will be used by default
@@ -70,9 +73,12 @@ Basically there are two ways to play music
     * `douban.fm -m -u xxx@xx.com -p` will play private playlist but will ask for your password to sign in
     * if "-m -i" is provided, a web server will start listening on 3000 by default, and you may
         * GET /channels to get all available channels
-        * GET /now to get current playing channel
+        * GET /channel to get current playing channel
         * GET /channel/<id> to switch to channel of the specified id, if id is -1, channel will be selected randomly
           each time fetching playlist
+        * GET /kbps to get current kbps
+        * GET /kbps/<kbps> to set kbps, for non-pro user this option simply does not work
+        * GET / or /index to view channel switch pannel
 
 ## Contributing
 

data/bin/douban.fm

@@ -42,7 +42,14 @@ class DoubanFMCLI
       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
+        options.channel = channel.to_i
+      end
+
+      opts.on('-k', '--kbps kbps',
+              'set kbps',
+              'if not provided, 64kbps will be used as default',
+              'for non-pro user this option simply does not work') do |kbps|
+        options.kbps = kbps.to_i
       end
 
       opts.on('-l', '--list', 'list all available channels') do
@@ -108,6 +115,10 @@ class DoubanFMCLI
       options.channel = 0
     end
 
+    if options.kbps.nil?
+      options.kbps = 64
+    end
+
     if options.email.nil?
       @douban_fm = DoubanFM::DoubanFM.new(logger)
 
@@ -128,6 +139,10 @@ class DoubanFMCLI
 
     logger.log("select channel #{options.channel}")
 
+    @douban_fm.set_kbps(options.kbps)
+
+    logger.log("set kbps #{options.kbps}")
+
     if options.mpd.nil?
       play_proc = proc do |waiting|
         if waiting
@@ -193,10 +208,17 @@ class DoubanFMCLI
                 @@douban_fm.clear_mpd_playlist(@@remote_host, @@remote_port)
                 raise WEBrick::HTTPStatus::OK
               else
-                raise WEBrick::HTTPStatus::NotFound
+                response.body = JSON.generate({'channel' => @@douban_fm.current_channel})
+              end
+            when 'kbps'
+              unless path[1].nil?
+                # there is a race but not a big deal
+                @@douban_fm.set_kbps(path[1].to_i)
+                @@douban_fm.clear_mpd_playlist(@@remote_host, @@remote_port)
+                raise WEBrick::HTTPStatus::OK
+              else
+                response.body = JSON.generate({'kbps' => @@douban_fm.kbps})
               end
-            when 'now'
-              response.body = JSON.generate({'channel' => @@douban_fm.current_channel})
             when 'index', nil
               html_path = File.expand_path('../../index.html', __FILE__)
               response.body = File.readlines(html_path).join('')

data/douban.fm.gemspec

@@ -3,18 +3,18 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'douban.fm/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "douban.fm"
+  gem.name          = 'douban.fm'
   gem.version       = DoubanFM::VERSION
-  gem.authors       = ["honnix"]
-  gem.email         = ["hxliang1982@gmail.com"]
+  gem.authors       = ['honnix']
+  gem.email         = ['hxliang1982@gmail.com']
   gem.description   = %q{douban.fm}
   gem.summary       = %q{douban.fm}
-  gem.homepage      = "https://github.com/honnix/douban.fm"
+  gem.homepage      = 'https://github.com/honnix/douban.fm'
 
   gem.files         = `git ls-files`.split($/)
   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.require_paths = ['lib']
 
   gem.add_dependency 'ruby-mpd', '0.1.5'
   gem.add_dependency 'highline', '1.6.15'

data/index.html

@@ -98,7 +98,12 @@
             <a id="now" class="btn btn-large btn-success" data-loading-text="loading ..." data-complete-text="" href=""><i class="icon-play"></i><i class="icon-music"></i> </a>
             <hr>
             <div class="channels">
-
+            </div>
+            <hr>
+            <div class="kbps-list">
+              <div class="music"><a class="btn kbps" href="#" id="kbps_192"><i class="icon-headphones"></i>192kbps</a></div>
+              <div class="music"><a class="btn kbps" href="#" id="kbps_128"><i class="icon-headphones"></i>128kbps</a></div>
+              <div class="music"><a class="btn kbps" href="#" id="kbps_64"><i class="icon-headphones"></i>64kbps</a></div>
             </div>
         </div>
       </div>
@@ -121,11 +126,13 @@
       $(function(){
         $('a#now').button('loading');
         // load current play channel
-        $.getJSON("/now", function(data) {
+        $.getJSON('/channel', function(data) {
           var now_id = data['channel'];
           var now_name;
           if (now_id === -1)
-            now_name = "乱放"
+            now_name = '乱放'
+          else if (now_id === -3)
+            now_name = '红心'
 
           // load all the channels
           $.getJSON('/channels', function(data) {
@@ -136,30 +143,42 @@
               if(val['channel_id'] == now_id)
                 now_name = val['name'];
 
-              items.push('<div class="music"><a class="btn channel" href="#" id="channel_'+val['channel_id']+'"><i class="icon-music"></i> '+val['name']+'</a></div>');
+              items.push('<div class="music"><a class="btn channel" href="#" id="channel_'+val['channel_id']+'"><i class="icon-music"></i>' + val['name'] + '</a></div>');
             });
             items.push('<div class="music"><a class="btn channel" href="#" id="channel_-1"><i class="icon-music"></i>乱放</a></div>');
+            items.push('<div class="music"><a class="btn channel" href="#" id="channel_-3"><i class="icon-heart"></i>红心</a></div>');
 
             $('div.channels').html(items.join(''));
             $('a#now').button('reset');
-            $('a#now').html($('a#now').html()+now_name);
-          }); // end of getJSON
 
+            $.getJSON('/kbps', function(data) {
+              $('a#now').html($('a#now').html() + now_name + '@' + data['kbps'] + 'kbps');
+            });
+          }); // end of getJSON
         });
 
         // bind click event to channel buttons
-        $('body').on('click','a.btn.channel',function(event){
+        $('body').on('click', 'a.btn.channel', function(event){
           $('a#now').button('loading');
           event.preventDefault();
           var channel = $(this).attr('id').substr(8);
           // switch channel
-          $.get("/channel/"+channel, function(data) {
+          $.get('/channel/' + channel, function(data) {
             window.location.href = window.location.href;
           });
         });
 
+        // bind click kbps to kbps buttons
+        $('body').on('click', 'a.btn.kbps', function(event){
+          $('a#now').button('loading');
+          event.preventDefault();
+          var kbps = $(this).attr('id').substr(5);
+          // set kbps
+          $.get('/kbps/'+ kbps, function(data) {
+            window.location.href = window.location.href;
+          });
+        });
       }); // end of document.ready
-
     </script>
   </body>
 </html>

data/lib/douban.fm/douban_fm.rb

@@ -10,7 +10,7 @@ module DoubanFM
 
     RANDOM_CHANNEL_ID = -1
 
-    attr_reader :waiting, :channels, :current_channel
+    attr_reader :waiting, :channels, :current_channel, :kbps
 
     def initialize(logger = DummyLogger.new, email = '', password = '')
       @logger = logger
@@ -53,6 +53,10 @@ module DoubanFM
       @current_channel = channel_num
     end
 
+    def set_kbps(kbps)
+      @kbps = kbps
+    end
+
     def fetch_next_playlist
       if @current_channel == RANDOM_CHANNEL_ID
         channel_id = select_random_channel
@@ -72,8 +76,10 @@ module DoubanFM
         :sid => '',
         :h => '',
         :channel => channel_id,
-        :type => 'n'
+        :type => 'n',
+        :kbps => @kbps
       }
+      @logger.log(params)
       uri.query = URI.encode_www_form(params)
       res = Net::HTTP.get_response(uri)
 

data/lib/douban.fm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: douban.fm
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-mpd
-  requirement: &70313014465400 !ruby/object:Gem::Requirement
+  requirement: &70273789925180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70313014465400
+  version_requirements: *70273789925180
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70313014464720 !ruby/object:Gem::Requirement
+  requirement: &70273789924420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,7 +32,7 @@ dependencies:
         version: 1.6.15
   type: :runtime
   prerelease: false
-  version_requirements: *70313014464720
+  version_requirements: *70273789924420
 description: douban.fm
 email:
 - hxliang1982@gmail.com