douban.fm 0.1.0 → 0.1.1

data/douban.fm.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'ruby-mpd'
-  gem.add_dependency 'highline'
+  gem.add_dependency 'ruby-mpd', '0.1.5'
+  gem.add_dependency 'highline', '1.6.15'
 end

data/lib/douban.fm/douban_fm.rb

@@ -4,7 +4,7 @@ module DoubanFM
   require 'ruby-mpd'
 
   class DoubanFM
-    DOUBAN_FM_MPD_PLAYLIST = 'douban.fm'
+    # DOUBAN_FM_MPD_PLAYLIST = 'douban.fm'
     MIN_SONGS_IN_DOUBAN_FM_MPD_PLAYLIST = 10
 
     attr_reader :waiting, :channels, :current_playlist
@@ -100,21 +100,34 @@ module DoubanFM
       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
+      # remove after played
+      mpd.consume = 1
+
+      # unfortunately it is not the same as i thought.
+      # i can not create a playlist specially for douban.fm since
+      # mpd will not remove song from this playlist anyway which
+      # means there is no chance for me to detect the total number
+      # of songs in the playlist is below a threshhold.
+      # so before i can find any better solution, just make use
+      # of the default playlist which is dynamic.
+
+      # 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
+
+      total = mpd.status[:playlistlength]
 
       @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})
+        # douban_fm_playlist = MPD::Playlist.new(mpd, {:playlist => DOUBAN_FM_MPD_PLAYLIST})
 
         begin
           @logger.log('fetch next playlist')
@@ -135,7 +148,8 @@ module DoubanFM
         @current_playlist['song'].each do |song|
           @logger.log("send [#{song['url'].gsub('\\', '')}] to mpd")
 
-          douban_fm_playlist.add(song['url'].gsub('\\', ''))
+          # douban_fm_playlist.add(song['url'].gsub('\\', ''))
+          mpd.add(song['url'].gsub('\\', ''))
         end
       end
 

data/lib/douban.fm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: douban.fm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,26 +13,26 @@ date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-mpd
-  requirement: &70182454448200 !ruby/object:Gem::Requirement
+  requirement: &70256513065900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70182454448200
+  version_requirements: *70256513065900
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70182454447640 !ruby/object:Gem::Requirement
+  requirement: &70256513062600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.15
   type: :runtime
   prerelease: false
-  version_requirements: *70182454447640
+  version_requirements: *70256513062600
 description: douban.fm
 email:
 - hxliang1982@gmail.com