cloudruby 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d65284ff7faa2d2be8f6b1ef10fb0ed825557fb
-  data.tar.gz: 500dbcb28787f33896a1493abcff9bc96b49c1a1
+  metadata.gz: f8d5679ca3d885cee4beedaa63a78115a1c1d6b0
+  data.tar.gz: f49c26dcd1a7626dfbbfdef0786425013a40f401
 SHA512:
-  metadata.gz: 8f9753df56f183867581be5cd7b601c525a23476684e040ffa593f6f57163d50bf1a6e31acf333712503fa22f4c0c3f86ebb883f182742f9531ee90ae8b9cce8
-  data.tar.gz: 973cde30b03d01ef0922fcf41fad6f76330971522eaf39f512c2d0dac5ab98cf1fc2161944057b147a47ea6c721430ca2e89efae37ce92f11d740fdf76b5ec8d
+  metadata.gz: eb15c734a3a25d8285bcbc1fa968c19d31ad942603170b3f78e415bdf0bc8c6172861cb358b41deb877a9a44eb0ff1dce5f4d62de10f3bf81d1eee35b8c7c7be
+  data.tar.gz: a8e322c14749ed65694e1c2adbfb1367337d51afdf3a863aeae5c31182481503e85bb7068b387ff28c582b25a536f5d9c8e954e4721dae96d40902e786658853

data/bin/cloudruby

@@ -1,8 +1,21 @@
 #!/usr/bin/env ruby
 
 require 'json/pure'
-require 'cloudruby'
-# require_relative '../lib/cloudruby'
+begin
+  require_relative '../lib/cloudruby' # from source dir
+rescue LoadError
+  begin
+    require_relative '../lib/cloudruby/lib/cloudruby' # from /usr/bin/
+  rescue LoadError
+    begin
+      require 'cloudruby' # binary installed as gem
+    rescue LoadError
+      puts "Cannot load cloudruby library. Exiting."
+      exit false
+    end
+  end
+end
+
 
 @config = {}
 @query = []

data/lib/cloudruby.rb

@@ -1,7 +1,11 @@
-require 'pp'
 require 'observer'
 require 'logger'
-require 'json/pure'
+begin
+  require 'json/pure'
+rescue LoadError
+  require 'json'
+end
+
 require_relative 'soundcloud.rb'
 require_relative 'mpg123player.rb'
 require_relative 'gstplayer.rb'

data/lib/gstplayer.rb

@@ -1,4 +1,7 @@
-require 'gst'
+begin
+  require 'gst'
+rescue LoadError
+end
 
 class GstPlayer
   include Observable
@@ -15,7 +18,12 @@ class GstPlayer
   end
 
   def initialize params = {}
+    @curvature = 4
     params.each { |key, value| send "#{key}=", value }
+    unless defined? Gst
+      puts "Gstream backend requires gstream gem"
+      exit false
+    end
 
     @logger.info version
     @inqueue = []
@@ -34,6 +42,10 @@ class GstPlayer
             @pipeline.set_property "audio-sink", sink unless sink.nil?
           when :"buffer-duration", :"buffer-size", :"mute", :"volume"
             @pipeline.set_property key, value
+          when :volume
+            @pipeline.set_property key, logscale(value)
+          when :"volume-curvature"
+            @curvature = value.to_f
           end
         end
       end
@@ -86,14 +98,23 @@ class GstPlayer
     notify_observers :state => :error, :error => err
   end
 
+  #approximation to a logarithmic scale
+  def logscale val, inverse = false
+    val = val.to_f
+    if inverse
+      100 * (val ** (1.0/@curvature))
+    else
+      (val/100)**@curvature
+    end
+  end
+
   def volume= (val)
-    @volume = volume
-    @volume += val
-    @volume = [@volume, 100].min
-    @volume = [@volume, 0].max
-    @pipeline.volume = @volume/100.0
+    vol = volume
+    vol += val
+    vol = [0, [vol, 100].min].max
+    @pipeline.volume = logscale(vol)
     changed
-    notify_observers :state => :status, :type => "Volume", :value => "#{@volume}%"
+    notify_observers :state => :status, :type => "Volume", :value => "#{vol.to_i}%"
   rescue => err
     @error = err
     changed
@@ -101,13 +122,14 @@ class GstPlayer
   end
 
   def volume
-    (@pipeline.get_property("volume") * 100).to_int
+    logval = @pipeline.get_property("volume").to_f
+    logscale logval, true
   end
 
   def mute
     @pipeline.set_property "mute", !@pipeline.get_property("mute")
     changed
-    notify_observers :state => :status, :type => "Volume", :value => "#{muted? ? 0 : @volume}%"
+    notify_observers :state => :status, :type => "Volume", :value => "#{muted? ? 0 : volume}%"
   rescue => err
     @error = err
     changed
@@ -178,7 +200,7 @@ class GstPlayer
       when Gst::MessageType::BUFFERING
         percent = message.parse_buffering
         changed
-        notify_observers :state => :status, :type => "Buffering", :value => "#{percent}%"
+        notify_observers :state => :buffer, :value => percent
       when Gst::MessageType::STATE_CHANGED
         error, state = message.parse_state_changed
         case state

data/lib/mpg123player.rb

@@ -81,6 +81,8 @@ class MPG123Player
     @volume = [@volume, 100].min
     @volume = [@volume, 0].max
     mpg123puts "V #{@volume}"
+    changed
+    notify_observers :state => :status, :type => "Volume", :value => "#{@volume.to_i}%"
   rescue => err
     @error = err
     changed

data/lib/ncurses_ui.rb

@@ -27,10 +27,12 @@ class NCursesUI
         :playlist_active => [:white, :blue],
         :progress => [:cyan, :blue],
         :progress_bar => [:blue, :cyan],
+        :buffer_bar => [:blue, :magenta],
         :title => [:cyan, :black],
         :artist => [:cyan, :black],
         :status => [:magenta, :black]
-      }
+      },
+      :palette => {}
     }.freeze
 
     @options = defaults.deep_merge(options || {})
@@ -48,14 +50,14 @@ class NCursesUI
     begin
       stdscr = Curses.init_screen
       Curses.start_color
-      Colors.init @options[:colors]
+      Colors.init @options[:colors], @options[:palette]
       stdscr.keypad true
       Curses.nonl
       Curses.cbreak
       Curses.noecho
       Curses.curs_set 0
       Curses.timeout = 5
-      @p = NProgress.new stdscr, 0, 0, :progress, :progress_bar
+      @p = NProgress.new stdscr, 0, 0, :progress, :progress_bar, :buffer_bar
       @l = NPlaylist.new stdscr, 4, 0, :playlist, :playlist_active, 0, 0, @playlist
       @i = NInfobox.new self, stdscr, 4, 0, :playlist, 0, 9
       @d = NDownloadBox.new stdscr, Curses.lines-1, 0, :default, 0, 1
@@ -95,15 +97,14 @@ class NCursesUI
           @cloud.pause
         end
 
-        statusLine = @status || @error
+        statusLine = @status || @error || ""
 
-        if statusLine
-          Nutils.print stdscr, 3, 0, "#{statusLine}", :status
-          Curses.refresh
-        end
+        Nutils.print stdscr, 3, 0, "#{statusLine}", :status
+        Curses.refresh
         tr = " %s " % [Nutils.timestr(@timetotal)]
         t = " %-#{Curses.cols-tr.size-1}s%s" % [Nutils.timestr(@time), tr]
         @p.value = @frac
+        @p.subvalue = (@bufferPercentage || 0)/100.0
         @p.text = t
         @p.refresh
         Nutils.print stdscr, 1, 0, "#{@op} #{@title}", :title
@@ -117,7 +118,7 @@ class NCursesUI
     ensure
       @l.close if @l
       @p.close if @p
-      stdscr.close
+      stdscr.close if stdscr
       Curses.echo
       Curses.nocbreak
       Curses.nl
@@ -130,6 +131,8 @@ class NCursesUI
 
   def cloud_update(arg)
     case arg[:state]
+    when :error
+      @error = "Error: #{arg[:error]}"
     when :load
       @playlist |= arg[:tracks]
       @l.list = @playlist if @l
@@ -156,6 +159,10 @@ class NCursesUI
           @d.title = ""
         end
       end
+    when :status
+      if arg[:type]
+        status("#{arg[:type]}: #{arg[:value]}")
+      end
     end
   end
 
@@ -186,17 +193,11 @@ class NCursesUI
       @op = "\u25FC"
     when :error
       @error = "Error: #{arg[:error]}"
+    when :buffer
+      @bufferPercentage = arg[:value].to_i || 0
     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
+        status("#{arg[:type]}: #{arg[:value]}")
       end
     end
   end
@@ -204,16 +205,28 @@ class NCursesUI
   def close
     @state = :close
   end
+
+  def status msg
+    @status = msg
+    if @statusTimeout
+      @statusTimeout.exit
+    end
+    @statusTimeout = Thread.new do
+      sleep 5
+      @status = nil
+      @statusTimeout = nil
+    end
+  end
 end
 
 class Nutils
   def self.print(scr, row, col, text, color, width = (Curses.cols))
     width = [Curses.cols, col+width].min - col
     t = "%-#{width}s" % [scroll(text, width)]
-    scr.attron(Colors.map(color)) if color
+    scr.attron(Colors.pairMap(color)) if color
     scr.setpos row, col
     scr.addstr t
-    scr.attroff(Colors.map(color)) if color
+    scr.attroff(Colors.pairMap(color)) if color
   end
 
   def self.scroll(text, width, offset=0)
@@ -234,47 +247,110 @@ class Nutils
 end
 
 class Colors
-  $map = {}
-  $counter = 0
-  def self.init colormap = {}
-    colormap.each do |key, colors|
-      self.add(key, colors[0], colors[1])
+  $pairMap = {}
+  $colorMap = {}
+  $attrMap = {}
+  $pairCounter = 0
+  $colorCounter = 0
+  def self.init colormap = {}, palette = {}
+    Curses.use_default_colors
+    $pairCounter += 1
+
+    Curses::constants.grep(/COLOR_/).each do |c|
+      color = c.to_s.split("_")[1]
+      $colorMap[color.downcase.to_sym] = Curses.const_get "#{c}"
+      $colorCounter += 1;
     end
-  end
 
-  def self.map(key)
-    $map[key] || $map[:default]
+    if Curses.can_change_color?
+      palette.each do |name, definition|
+        if $colorCounter >= Curses.colors || name.length == 0 
+          $colorMap[name] = $colorMap[:white]
+        elsif $colorMap[name]
+          if definition.is_a? Integer
+            $colorMap[name] = definition
+          elsif definition.is_a?(Array) and definition.length == 3
+            Curses.init_color $colorMap[name], definition[0], definition[1], definition[2]
+          end
+        else
+          if definition.is_a? Integer
+            $colorMap[name] = definition
+          elsif definition.is_a?(Array) and definition.length == 3
+            $colorMap[name] = $colorCounter;
+            Curses.init_color $colorCounter, definition[0], definition[1], definition[2]
+            $colorCounter += 1;
+          end
+        end
+      end
+    end
+
+    colormap.each do |key, colors|
+      self.add(key, colors[0], colors[1], colors[2..-1])
+    end
   end
 
-  def self.add(key, fg, bg)
-    Curses.init_pair $counter, ncg(fg), ncg(bg)
-    $map[key] = Curses.color_pair $counter
-    $counter += 1
+  def self.pairMap(key)
+    ($pairMap[key] || $pairMap[:default] ) | ($attrMap[key] || 0)
+  end
+
+  def self.add(key, fg, bg, attrs=[])
+    Curses.init_pair $pairCounter, ncg(fg), ncg(bg)
+    $pairMap[key] = Curses.color_pair $pairCounter
+    $attrMap[key] = attrs.map do |a|
+      case a.to_sym
+      when :bold
+        Curses::A_BOLD
+      when :underline
+        Curses::A_UNDERLINE
+      when :blink
+        Curses::A_BLINK
+      when :dim
+        Curses::A_DIM
+      when :normal
+        Curses::A_NORMAL
+      when :standout
+        Curses::A_STANDOUT
+      when :reverse
+        Curses::A_REVERSE
+      end
+    end.compact.reduce :|
+    $pairCounter += 1
   end
 
   def self.debug
     puts "colors supported: #{Curses.colors}"
-    puts "map: #{$map}"
+    puts "pairMap: #{$pairMap}"
+    puts "attributes: #{$attrMap}"
+    puts "colorPalette: #{$colorMap}"
   end
+
   # get ncurses color constant
   def self.ncg(color)
-    color = :black unless color
-    Curses.const_get "COLOR_#{color.upcase}"
+    if color.is_a? Integer
+      color
+    else
+      color = -1 unless color
+      color = color.to_sym
+      $colorMap[color] || -1
+    end
   end
 end
 
 class NProgress
-  attr_reader :value
+  attr_reader :value, :subvalue
   attr_accessor :text
-  def initialize scr, row, col, color, bar_color, width=0, value = 0, text = ""
+  def initialize scr, row, col, color, bar_color, subbar_color, width=0, value = 0, subvalue = 0, text = ""
     @width = width
     @color = color
     @bar_color = bar_color
+    @subbar_color = subbar_color
     @row = row
     @col = col
     @winfg = Curses::Window.new 1, 1, @row, @col
+    @winsfg = Curses::Window.new 1, 1, @row, @col
     @winbg = Curses::Window.new 1, self.width, @row, @col
     @value = value
+    @subvalue = subvalue
     @text = text
     refresh
   end
@@ -288,11 +364,19 @@ class NProgress
     @winfg.resize(1, fgw) if fgw > 0
   end
 
+  def subvalue=(val)
+    @subvalue = val
+    @winsfg.resize(1, sfgw) if sfgw > 0
+  end
+
   def refresh
-    offset = fgw
-    Nutils.print @winbg, 0, offset, @text[offset..-1], @color
+    bgOffset = [fgw, sfgw].max
+    sbOffset = fgw
+    Nutils.print @winbg, 0, bgOffset, @text[bgOffset..-1], @color
+    Nutils.print @winsfg, 0, sbOffset, @text[sbOffset..-1], @subbar_color if sfgw > 0
     Nutils.print @winfg, 0, 0, @text, @bar_color if fgw > 0
     @winbg.refresh
+    @winsfg.refresh if sfgw > 0
     @winfg.refresh if fgw > 0
   end
   
@@ -301,6 +385,7 @@ class NProgress
 
   def close
     @winbg.close
+    @winsfg.close
     @winfg.close
   end
 
@@ -309,6 +394,10 @@ class NProgress
     w = width() == 0 ? Curses.cols - @col : width()
     (w * @value).floor
   end
+  def sfgw
+    w = width() == 0 ? Curses.cols - @col : width()
+    (w * @subvalue).floor
+  end
 end
 
 class NPlaylist
@@ -399,9 +488,13 @@ class NPlaylist
         end
       end
     end
-    @win.attron(Colors.map(@color)) if @color
+    while r < height
+      Nutils.print @win, r, 0, "", @color
+      r += 1
+    end
+    @win.attron(Colors.pairMap(@color)) if @color
     @win.box 0, 0
-    @win.attroff(Colors.map(@color)) if @color
+    @win.attroff(Colors.pairMap(@color)) if @color
     @win.refresh
     @dirty = false
   end
@@ -450,16 +543,16 @@ class NInfobox
 
   def refresh
     return unless @visible
-    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, 1, 2, "Cloudruby v1.2", :default
+    Nutils.print @win, 2, 4, "UI Toolkit: #{(Curses.const_defined?"VERSION")?"#{Curses::VERSION}, #colors: #{Curses::colors}" : "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.attron(Colors.pairMap(@color)) if @color
     @win.box 0, 0
-    @win.attroff(Colors.map(@color)) if @color
+    @win.attroff(Colors.pairMap(@color)) if @color
     @win.refresh
   end
 

data/lib/soundcloud.rb

@@ -1,6 +1,12 @@
 require 'cgi'
 require 'open-uri'
-require 'json/pure'
+require 'httpclient'
+
+begin
+  require 'json/pure'
+rescue LoadError
+  require 'json'
+end
 
 class SoundCloud
   include Observable
@@ -13,6 +19,7 @@ class SoundCloud
     @playlist_pos = -1
     @download_queue = []
     @dthread = Thread.new do downloader end
+    @dthread.run
   end
 
   def load_playlist(search = nil, offset = 0)
@@ -91,46 +98,48 @@ class SoundCloud
       filename = "#{t["permalink"]}.#{t["original_format"]}"
       path = File.join(target_dir, filename)
       pair = [path, t['download']]
+      @logger.debug {"download queued: #{pair}"}
       @download_queue << pair unless @download_queue.include? pair
-      @dthread.run
 
       changed
       notify_observers :state => :download, :count => @download_queue.size
     else
       changed
-      notify_observers :state => :download, :error => "Not downloadable"
+      notify_observers :state => :status, :type => "Download", :value => "Not granted by content owner"
     end
   end
 
   # download thread
   def downloader
     loop do
-      size = @download_queue.size
       while d = @download_queue.shift
         path = d[0]
         uri = d[1]
+        size = @download_queue.size
         changed
         notify_observers :state => :download, :name => path, :count => size
-        size = @download_queue.size
         begin
           path = File.expand_path path
-          file = File.new(path, "wb")
           File.open(path, "wb") do |file|
-            file.print open(uri).read
+            cl = HTTPClient.new
+            cl.redirect_uri_callback = ->(uri, res) {
+              res.header['location'][0]
+            }
+            cl.get_content(uri) do |chunk|
+              file.write(chunk)
+            end
           end
-          changed
-          notify_observers :state => :download, :name => path, :count => size
-        rescue OpenURI::HTTPError => e
+        rescue Exception => e
+          @logger.error {"Download error: #{e}"}
           changed
           notify_observers :state => :error, :error => e
-        ensure
-          file.close
         end
       end
       sleep 5
     end
   rescue => e
     changed
+    @logger.error {"Downloader thread: #{e}"}
     notify_observers :state => "error", :error => e
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudruby
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Paul Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses