cloudruby 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c190dbded5261f41bb498514cc555dc242ce2ac6
-  data.tar.gz: e4e64db8837ca1db44c143b92064b4e38fb845b6
+  metadata.gz: 7d65284ff7faa2d2be8f6b1ef10fb0ed825557fb
+  data.tar.gz: 500dbcb28787f33896a1493abcff9bc96b49c1a1
 SHA512:
-  metadata.gz: 016cb876daaa4694fea7289d10779e86d4ebe1efb0c35338aa4b9bd0f35bc5e687c23fe3968bed5c04e25eb2fd5396ab26059d995c16d3b2d883011e3148d58c
-  data.tar.gz: a53de0174fbfb83dd03971fff46e2e17c8cd185b230bed7085faf7eadcf63e8e1b86e4299d68e47abfc688a172d10200f50617988846baf5024705ca8db33b6c
+  metadata.gz: 8f9753df56f183867581be5cd7b601c525a23476684e040ffa593f6f57163d50bf1a6e31acf333712503fa22f4c0c3f86ebb883f182742f9531ee90ae8b9cce8
+  data.tar.gz: 973cde30b03d01ef0922fcf41fad6f76330971522eaf39f512c2d0dac5ab98cf1fc2161944057b147a47ea6c721430ca2e89efae37ce92f11d740fdf76b5ec8d

data/bin/cloudruby

@@ -2,6 +2,7 @@
 
 require 'json/pure'
 require 'cloudruby'
+# require_relative '../lib/cloudruby'
 
 @config = {}
 @query = []

data/lib/cloudruby.rb

@@ -4,22 +4,27 @@ require 'logger'
 require 'json/pure'
 require_relative 'soundcloud.rb'
 require_relative 'mpg123player.rb'
+require_relative 'gstplayer.rb'
 require_relative 'ncurses_ui.rb'
 
 class Cloudruby
   def init(q, config)
     @config = config
-    @cloud = SoundCloud.new "76796f79392f9398288cdac3fe3391c0"
-    @player = MPG123Player.new
-    @ui = NCursesUI.new self, (@config[:ncurses] || @config[:curses])
 
     # @logger = Logger.new "logfile.log"
     @logger = Logger.new STDERR
     # @logger.level = Logger::DEBUG
     @logger.level = Logger::Severity::UNKNOWN
 
-    @player.logger = @logger
-    @ui.logger = @logger
+    @cloud = SoundCloud.new "76796f79392f9398288cdac3fe3391c0", logger: @logger
+    case @config[:"audio-backend"] 
+    when "gstreamer"
+      @player = GstPlayer.new logger: @logger, audio_params: @config[:"audio-params"]
+    else
+      @player = MPG123Player.new logger: @logger
+    end
+    @ui = NCursesUI.new self, (@config[:ncurses] || @config[:curses]), logger: @logger, audio_backend: @player
+
     @logger.info {"logger inited"}
     
     @player.add_observer @ui, :player_update

data/lib/gstplayer.rb

@@ -0,0 +1,209 @@
+require 'gst'
+
+class GstPlayer
+  include Observable
+  attr_reader :error, :paused
+  attr_accessor :logger, :audio_params
+
+  def version
+    as = nil
+    unless @pipeline.nil?
+      as = @pipeline.get_property "audio-sink"
+      as = ", Sink: #{as.name}"
+    end
+    return "Audio backend: Gstreamer #{Gst.version.join('.')}#{as}"
+  end
+
+  def initialize params = {}
+    params.each { |key, value| send "#{key}=", value }
+
+    @logger.info version
+    @inqueue = []
+    begin
+      @pipeline = Gst::ElementFactory.make("playbin", "cloudruby_pipeline")
+      if @pipeline.nil?
+        puts "Cannot initialize playing pipeline. Is gstreamer installed?"
+        exit false
+      end
+      @pipeline.set_property "buffer-size", 16 * 1024 * 1024
+      if @audio_params
+        @audio_params.each do |key, value|
+          case key
+          when :"audio-sink"
+            sink = Gst::ElementFactory.make(value, "#{value}")
+            @pipeline.set_property "audio-sink", sink unless sink.nil?
+          when :"buffer-duration", :"buffer-size", :"mute", :"volume"
+            @pipeline.set_property key, value
+          end
+        end
+      end
+
+      changed
+      notify_observers :state => :inited
+      runMainLoop
+    rescue => err
+      @error = err
+      changed
+      notify_observers :state => :error, :error => err
+    end
+  end
+
+  def play(track)
+    @last_track = track
+    unless track.nil? || track.is_a?(Hash) && track[:error] && !Gst.valid_uri?(track["mpg123url"])
+      gstPlayUrl track["mpg123url"]
+    end
+    changed
+    notify_observers :state => :load, :track => track
+  rescue => err
+    @error = err
+    changed
+    notify_observers :state => :error, :error => err
+  end
+
+  def playing?
+    @pipeline.playing?
+  end
+
+  def pause()
+    @paused = !@paused
+    if @paused
+      @pipeline.pause
+    else
+      @pipeline.play
+    end
+  rescue => err
+    @error = err
+    changed
+    notify_observers :state => :error, :error => err
+  end
+
+  def stop()
+    @playbin.stop
+  rescue => err
+    @error = err
+    changed
+    notify_observers :state => :error, :error => err
+  end
+
+  def volume= (val)
+    @volume = volume
+    @volume += val
+    @volume = [@volume, 100].min
+    @volume = [@volume, 0].max
+    @pipeline.volume = @volume/100.0
+    changed
+    notify_observers :state => :status, :type => "Volume", :value => "#{@volume}%"
+  rescue => err
+    @error = err
+    changed
+    notify_observers :state => :error, :error => err
+  end
+
+  def volume
+    (@pipeline.get_property("volume") * 100).to_int
+  end
+
+  def mute
+    @pipeline.set_property "mute", !@pipeline.get_property("mute")
+    changed
+    notify_observers :state => :status, :type => "Volume", :value => "#{muted? ? 0 : @volume}%"
+  rescue => err
+    @error = err
+    changed
+    notify_observers :state => :error, :error => err
+  end
+
+  def muted?
+    @pipeline.get_property "mute"
+  end
+
+  def close()
+    @pipeline.stop
+    @mainloop.quit
+    changed
+    notify_observers :state => :closed
+  rescue => err
+    @error = err
+    changed
+    notify_observers :state => :error, :error => err
+  end
+
+  def gstPlayUrl(url)
+    @pipeline.stop
+    @pipeline.uri = url
+    @pipeline.play
+  end
+
+  private
+
+  def runMainLoop
+    @logger.debug {"listen to gst pipeline"}
+    @mainloop = GLib::MainLoop.new nil, true
+
+    # Add custom tasks
+    GLib::Timeout.add_seconds(1) do
+      pos_res, position = @pipeline.query_position(Gst::Format::TIME)
+      dur_res, duration = @pipeline.query_duration(Gst::Format::TIME)
+      # @pipeline.query
+      duration = (duration / 1000000.0 / 1000).to_int
+      position = (position / 1000000.0 / 1000).to_int
+      if position > 0 && duration > 0 && duration > position
+        changed
+        notify_observers :state => :info, 
+          :frame => position, 
+          :frameleft => duration-position, 
+          :time => position,
+          :timeleft => position-duration
+      end
+      true
+    end
+
+    bus = @pipeline.bus
+    bus.add_watch do |bus, message|
+      raise "message nil" if message.nil?
+
+      case message.type
+      when Gst::MessageType::EOS
+        changed
+        notify_observers :state => :stop
+      when Gst::MessageType::WARNING
+        warning, debug = message.parse_warning
+        changed
+        notify_observers :state => :error, :error => warning.message
+      when Gst::MessageType::ERROR
+        error, debug = message.parse_error
+        changed
+        notify_observers :state => :error, :error => error.message
+      when Gst::MessageType::BUFFERING
+        percent = message.parse_buffering
+        changed
+        notify_observers :state => :status, :type => "Buffering", :value => "#{percent}%"
+      when Gst::MessageType::STATE_CHANGED
+        error, state = message.parse_state_changed
+        case state
+        when Gst::State::PAUSED
+          changed
+          notify_observers :state => :pause
+        when Gst::State::PLAYING
+          changed
+          notify_observers :state => :play
+        end
+      else
+        @logger.info {"bus event: #{message.type.name} #{message.type} #{message.structure}"}
+      end
+      true
+    end
+
+    # @pipeline.play
+    context = @mainloop.context
+    thread = Thread.new do
+      while @mainloop.running? do
+        context.iteration false
+        sleep 0.05
+      end
+    end
+
+  end
+
+end

data/lib/mpg123player.rb

@@ -1,13 +1,28 @@
 require 'open3'
+begin
+  require 'httpclient'
+rescue LoadError
+end
 
 class MPG123Player
   include Observable
   attr_reader :error, :paused
   attr_accessor :logger
 
-  def initialize()
+  def version
+    return "Audio backend: #{`mpg123 --version`.strip}"
+  end
+
+  def initialize params = {}
+    params.each { |key, value| send "#{key}=", value }
+    unless defined? HTTPClient
+      puts "Mpg123 requires HTTPClient to work"
+      exit false
+    end
+
     @volume = 100
     @muted = false
+    @logger.info version
     @inqueue = []
     begin
       @pin, @pout, @perr = Open3.popen3 "mpg123 --keep-open --remote"
@@ -25,7 +40,11 @@ class MPG123Player
   def play(track)
     @last_track = track
     unless track.nil? || track.is_a?(Hash) && track[:error]
-      mpg123puts "load #{track["mpg123url"]}"
+      # mpg123puts "load #{track["mpg123url"]}"
+      strhead   = HTTPClient.new.head(track['mpg123url'])
+      streamuri = strhead.header['Location'][0]
+      streamuri.sub! 'https', 'http'
+      mpg123puts "load #{streamuri}"
       @pstate = 2
     end
     changed

data/lib/ncurses_ui.rb

@@ -1,9 +1,25 @@
 require 'curses'
 
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    self.merge(second, &merger)
+  end
+end
+
 class NCursesUI
-  attr_accessor :logger
+  attr_accessor :logger, :audio_backend
+
+  def initialize cloud, options = {}, params = {}
+    params.each { |key, value| send "#{key}=", value }
+
+    if not @audio_backend
+      @audio_backend = Object.new
+      def @audio_backend.version
+        "Audio backend: None" 
+      end 
+    end
 
-  def initialize cloud, options = {}
     defaults = {
       :colors => {
         :default => [:cyan, :blue],
@@ -12,11 +28,12 @@ class NCursesUI
         :progress => [:cyan, :blue],
         :progress_bar => [:blue, :cyan],
         :title => [:cyan, :black],
-        :artist => [:cyan, :black]
+        :artist => [:cyan, :black],
+        :status => [:magenta, :black]
       }
     }.freeze
 
-    @options = defaults.merge(options || {})
+    @options = defaults.deep_merge(options || {})
     @cloud = cloud
     @state = :running
     @frac = 0
@@ -40,7 +57,7 @@ class NCursesUI
       Curses.timeout = 5
       @p = NProgress.new stdscr, 0, 0, :progress, :progress_bar
       @l = NPlaylist.new stdscr, 4, 0, :playlist, :playlist_active, 0, 0, @playlist
-      @i = NInfobox.new stdscr, 4, 0, :playlist, 0, 8
+      @i = NInfobox.new self, stdscr, 4, 0, :playlist, 0, 9
       @d = NDownloadBox.new stdscr, Curses.lines-1, 0, :default, 0, 1
       @l.active = 0
       last_ch = nil
@@ -78,8 +95,10 @@ class NCursesUI
           @cloud.pause
         end
 
-        if @error
-          Nutils.print stdscr, 3, 0, "Error: #{@error}", :red
+        statusLine = @status || @error
+
+        if statusLine
+          Nutils.print stdscr, 3, 0, "#{statusLine}", :status
           Curses.refresh
         end
         tr = " %s " % [Nutils.timestr(@timetotal)]
@@ -122,7 +141,7 @@ class NCursesUI
       @l.active = pos if @l
     when :download
       if arg[:error]
-        @error = arg[:error]
+        @error = "Error: #{arg[:error]}"
       end
       if arg[:count]
         count = arg[:count]
@@ -146,13 +165,13 @@ class NCursesUI
     when :load
       track = arg[:track]
       if track.nil?
-        @error = "Nothing found!"
+        @error = "Error: Nothing found!"
       else
         @error = nil
         @title = track["title"]
         @username = track["user"]["username"]
         @timetotal = track["duration"]
-        @error = track[:error] if track[:error]
+        @error = "Error: #{track[:error]}" if track[:error]
       end
     when :info
       frame = arg[:frame].to_f
@@ -166,7 +185,19 @@ class NCursesUI
     when :stop
       @op = "\u25FC"
     when :error
-      @error = arg[:error]
+      @error = "Error: #{arg[:error]}"
+    when :status
+      if arg[:type]
+        @status = "#{arg[:type]}: #{arg[:value]}"
+        if @statusTimeout
+          @statusTimeout.exit
+        end
+        @statusTimeout = Thread.new do
+          sleep 5
+          @status = nil
+          @statusTimeout = nil
+        end
+      end
     end
   end
 
@@ -382,7 +413,8 @@ end
 
 class NInfobox
   attr_accessor :visible
-  def initialize scr, row, col, color, w, h
+  def initialize parent, scr, row, col, color, w, h
+    @parent = parent
     @scr = scr
     @row = row
     @col = col
@@ -418,12 +450,13 @@ class NInfobox
 
   def refresh
     return unless @visible
-    Nutils.print @win, 1, 2, "Cloudruby v1", :default
-    Nutils.print @win, 2, 4, "Curses version: #{(Curses.const_defined?"VERSION")?Curses::VERSION : "N/A"}", :default
-    Nutils.print @win, 3, 4, "Ruby version: #{RUBY_VERSION}", :default
-    Nutils.print @win, 4, 4, "Author: kulpae <my.shando@gmail.com>", :artist
-    Nutils.print @win, 5, 4, "Website: uraniumlane.net", :title
-    Nutils.print @win, 6, 4, "License: MIT", :default
+    Nutils.print @win, 1, 2, "Cloudruby v1.1", :default
+    Nutils.print @win, 2, 4, "UI Toolkit: #{(Curses.const_defined?"VERSION")?Curses::VERSION : "N/A"}", :default
+    Nutils.print @win, 3, 4, "#{@parent.audio_backend.version}", :default
+    Nutils.print @win, 4, 4, "Ruby version: #{RUBY_VERSION}", :default
+    Nutils.print @win, 5, 4, "Author: kulpae <my.shando@gmail.com>", :artist
+    Nutils.print @win, 6, 4, "Website: uraniumlane.net", :title
+    Nutils.print @win, 7, 4, "License: MIT", :default
     @win.attron(Colors.map(@color)) if @color
     @win.box 0, 0
     @win.attroff(Colors.map(@color)) if @color

data/lib/soundcloud.rb

@@ -5,8 +5,10 @@ require 'json/pure'
 class SoundCloud
   include Observable
   LIMIT = 100
+  attr_accessor :logger
 
-  def initialize(client_id)
+  def initialize client_id, params = {}
+    params.each { |key, value| send "#{key}=", value }
     @cid = client_id
     @playlist_pos = -1
     @download_queue = []
@@ -16,9 +18,9 @@ class SoundCloud
   def load_playlist(search = nil, offset = 0)
     search = "" unless search && !search.empty?
     if search =~ /\s*http(s)?:\/\/(www.)?soundcloud.com.*/
-      url = "http://api.soundcloud.com/resolve.json?url=%s&client_id=%s" % [CGI.escape(search), @cid]
+      url = "https://api.soundcloud.com/resolve.json?url=%s&client_id=%s" % [CGI.escape(search), @cid]
     else
-      url = "http://api.soundcloud.com/tracks.json?client_id=%s&filter=streamable&limit=%d&offset=%d&q=%s" \
+      url = "https://api.soundcloud.com/tracks.json?client_id=%s&filter=streamable&limit=%d&offset=%d&q=%s" \
         % [@cid, LIMIT, offset, CGI.escape(search)]
     end
     c = open(url) do |io|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Paul Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: "== A soundcloud player written in Ruby \nwith Ncurses for user interface
   and \nmpg123 for playback.\n\nRequires the mpg123 executable to be present in the
   PATH.\n\n== Usage\n\n* lists recently uploaded tracks from soundcloud\n   cloudruby\n\n*
@@ -51,6 +65,7 @@ extra_rdoc_files: []
 files:
 - bin/cloudruby
 - lib/cloudruby.rb
+- lib/gstplayer.rb
 - lib/mpg123player.rb
 - lib/ncurses_ui.rb
 - lib/soundcloud.rb
@@ -74,9 +89,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
+- gem gstreamer (optional)
 - mpg123 executable
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ncurses player for Soundcloud tracks in Ruby