doubanfm 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3861716d30ebf71c7ca9da1eff05c42655ee5165
-  data.tar.gz: 1cf80994a730ed474c4cf8556c764980f14a297a
+  metadata.gz: 018dd831b6f7ca1807a4e81723a90243353bb69d
+  data.tar.gz: f817d7eceae4da6b6cd386f99235757f7ba316e1
 SHA512:
-  metadata.gz: 95cbf1b10fe56afae46919d2bde967e83a775051a4faaa2504daefe055fd1e3750e0798c86c20a29400afb0911d84af76f25ba39a2eac803f06a28232e4f59f8
-  data.tar.gz: 5017daacf5e6f2521707c98bf207c027e1973b2dee3c2dc777056969173c76d9c64fcb8540fc1cf6b8274d270b8fc2caa3969bfbffc1b9102b0e4720d07a127e
+  metadata.gz: 84ffd7bc2aa7cc3e0739e07f11ff6404a53c96b989edeb1a53f13409a837872f2239abaeeb76dc16e8be0bf721437efcfa3a9e403d8fcaec750f3e1021c4ad78
+  data.tar.gz: 8e26dd2c80f2c69a77fbd44607bc1288d3d6f556636a0efe5913db92d6b116989fedee951c8fbbbebdc36834b68a6d49b15b031d1b031bcaa372b56cf0c62df1

data/README.md

@@ -1,6 +1,6 @@
 # Doubanfm
 
-A Ruby wrapper of douban.fm api.
+Just another DoubanFM client.
 
 ## Installation
 
@@ -18,7 +18,17 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+    $ doubanfm
+You can use \<Tab\> to list all valid command.
+
+## Todo
+
+- [ ] Allow user to throw a song into trash bin
+- [ ] Allow user to select specific channel
+- [ ] Introduce a better console interface with `curses` or something similar
+- [ ] Refactor all
+- [ ] Use a audio play gem to replace `mpg123` program
+- [ ] Maybe I'll use JRuby and SWT to implement GUI
 
 ## Contributing
 

data/lib/doubanfm/doubanfm.rb

@@ -47,13 +47,10 @@ module DoubanFM
       return true
     end
 
-    def new_playlist
-      fetch_playlist(NEW_PLAYLIST)
+    def set_channel(channel_id)
+      @current_channel = channel_id
     end
 
-    def next_playlist
-      fetch_playlist(NEXT_PLAYLIST)
-    end
 
     def next_song
       if @current_song == @playlist.last
@@ -64,6 +61,56 @@ module DoubanFM
       @current_song = @playlist[next_song_pos]
     end
 
+    def rate
+      return unless user_logged?
+      return if like?
+
+      params = {
+        app_name: APP_NAME,
+        version: APP_VERSION,
+        user_id: @user_info[:user_id],
+        expire: @user_info[:expire],
+        token: @user_info[:token],
+        channel: @current_channel,
+        sid: @current_song[:sid],
+        type: RATE
+      }
+
+      rate_uri = URI('http://www.douban.com/j/app/radio/people')
+      rate_uri.query = URI.encode_www_form(params)
+
+      @playlist = JSON.parse(
+        @client.get(rate_uri),
+        symbolize_names: true
+      )[:song]
+      @current_song = @playlist.first
+    end
+
+    def unrate
+      return unless user_logged?
+      return unless like?
+
+      params = {
+        app_name: APP_NAME,
+        version: APP_VERSION,
+        user_id: @user_info[:user_id],
+        expire: @user_info[:expire],
+        token: @user_info[:token],
+        channel: @current_channel,
+        sid: @current_song[:sid],
+        type: UNRATE
+      }
+
+      rate_uri = URI('http://www.douban.com/j/app/radio/people')
+      rate_uri.query = URI.encode_www_form(params)
+
+      @playlist = JSON.parse(
+        @client.get(rate_uri),
+        symbolize_names: true
+      )[:song]
+      @current_song = @playlist.first
+    end
+
     private
       def fetch_channels
         @channels = JSON.parse(
@@ -75,6 +122,7 @@ module DoubanFM
       def fetch_playlist(type)
         if @current_channel == INVALID_CHANNEL_ID
           channel_id = select_random_channel
+          @current_channel = channel_id
         else
           channel_id = @current_channel
         end
@@ -107,5 +155,17 @@ module DoubanFM
         which = Random.new.rand(first_channel ... @channels.size)
         @channels[which][:channel_id]
       end
+
+      def new_playlist
+        fetch_playlist(NEW_PLAYLIST)
+      end
+
+      def next_playlist
+        fetch_playlist(NEXT_PLAYLIST)
+      end
+
+      def like?
+        return @current_song[:like] == 1 ? true : false;
+      end
   end
 end

data/lib/doubanfm/player.rb

@@ -8,23 +8,30 @@ module DoubanFM
     end
 
     def start
+      play
+
       loop do
-        cmd = ask("DoubanFM> ", %w{login play skip quit}) do |q|
+        cmd = ask("DoubanFM> ", %w{login skip rate unrate quit}) do |q|
+          q.overwrite = true
           q.readline = true
         end
 
         case cmd
         when 'login'
           login
-        when 'play'
-          play
         when 'skip'
           skip
+        when 'rate'
+          say('请先登录') unless @client.user_logged?
+          @client.rate
+        when 'unrate'
+          say('请先登录') unless @client.user_logged?
+          @client.unrate
         when 'quit'
           kill_player_thread
           break
         else
-          puts 'Nothing to do'
+          say('Nothing to do')
         end
       end
     end
@@ -66,9 +73,10 @@ module DoubanFM
 
           @waiting = false
 
+          say("Playing #{@client.current_song[:title]}")
           @player_pid = spawn("mpg123 #{@client.current_song[:url]} > /dev/null 2>&1")
 
-          Process.wait
+          Process.wait(@player_pid)
           @waiting = true
 
           @semaphore.unlock

data/lib/doubanfm/version.rb

@@ -1,3 +1,3 @@
 module DoubanFM
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doubanfm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Edgar Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline