audio_addict 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5425d1af3034b2836feb21165d62910d1498abe58debb6a3845b210f8ea214e
-  data.tar.gz: a15802a7ce577221ff14a972c4d23e875c0f912b3cb87cfd8b3c38d65133a228
+  metadata.gz: 0b9ee1765ac530791d434e0ae9166dcbbd6c78af0331e6744b798b042a4855cc
+  data.tar.gz: 36572839fec8085f9cdd3e55c0bf092319dac42f707c404097123454fd3f8a59
 SHA512:
-  metadata.gz: ca64d5708f21dc7509232c61e5cb5a8f18d5fc797f5b843ac690d60e731ac82a6a357f8a125b777ef5e686bcec02817611be8db054c159c368beb6f7b66b17d7
-  data.tar.gz: cb9098e36ab1ecf46c9cdcd170b952fc9a66c69b52cf2a29751522a0d505753c61a5d1f1f86e5d5211b5e11d4f7501e8f2322309d62a6c7d0d8337d64ac5790d
+  metadata.gz: 44e14f1f07236555a67735e407c6aa9ae2849fb7db87b67168f9c1ddb233ee8007cfcd0e77c7462fe26df2a92c2cc4e780513e7a2ab4f522e9aa28f9d3886370
+  data.tar.gz: c5ae90ef4ae1304a684f92679e62f66e8adaf75e65a94410b4259cbefec4aba7983e829dde112f2192564c9ce5fd242eeb0ee1fccb0185dd634e4f14e8a2398d

data/README.md

@@ -2,7 +2,7 @@ AudioAddict Command Line
 ==================================================
 
 [![Gem Version](https://badge.fury.io/rb/audio_addict.svg)](https://badge.fury.io/rb/audio_addict)
-[![Build Status](https://travis-ci.com/DannyBen/audio_addict.svg?branch=master)](https://travis-ci.com/DannyBen/audio_addict)
+[![Build Status](https://github.com/DannyBen/audio_addict/workflows/Test/badge.svg)](https://github.com/DannyBen/audio_addict/actions?query=workflow%3ATest)
 [![Maintainability](https://api.codeclimate.com/v1/badges/91e1a8251b771881bf6b/maintainability)](https://codeclimate.com/github/DannyBen/audio_addict/maintainability)
 
 ---
@@ -41,11 +41,13 @@ Features
   - [RadioTunes]
   - [JazzRadio]
   - [ClassicalRadio]
+  - [ZenRadio]
 - View list of channels
 - View currently playing track
 - Vote on the currently playing track
 - Save a log of a all your liked tracks
 - Generate playlists (requires a premium account)
+- Download songs from YouTube (requires [youtube-dl][youtube-dl])
 
 
 Usage
@@ -68,6 +70,7 @@ Commands:
   playlist  Generate playlists
   config    Manage local configuration
   log       Manage local like log
+  download  Download songs from YouTube
   api       Make direct calls to the AudioAddict API
 
 ```
@@ -80,3 +83,5 @@ Commands:
 [RadioTunes]: http://www.radiotunes.com
 [JazzRadio]: http://www.jazzradio.com
 [ClassicalRadio]: http://www.classicalradio.com
+[ZenRadio]: http://www.zenradio.com
+[youtube-dl]: https://github.com/ytdl-org/youtube-dl/

data/bin/radio

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'audio_addict'
+require 'colsole'
 include Colsole
 
 router = AudioAddict::CLI.router
@@ -7,7 +8,7 @@ router = AudioAddict::CLI.router
 begin
   exit router.run ARGV
 
-rescue AudioAddict::Interrupt, TTY::Reader::InputInterrupt
+rescue Interrupt, AudioAddict::Interrupt, TTY::Reader::InputInterrupt
   say "\nGoodbye"
   exit 1  
 
@@ -29,4 +30,5 @@ rescue => e
   say "!undred!ERROR: #{e.class}"
   say e.message
   exit 1
+
 end

data/lib/audio_addict.rb

@@ -1,9 +1,9 @@
-require 'requires'
-require 'byebug' if ENV['BYEBUG']
+require "requires"
+require "byebug" if ENV["BYEBUG"]
 requires \
-  'audio_addict/exceptions', 
-  'audio_addict/cache', 
-  'audio_addict/inspectable', 
-  'audio_addict/auto_properties',
-  'audio_addict/commands/base',
-  'audio_addict'
+  "audio_addict/exceptions",
+  "audio_addict/cache",
+  "audio_addict/inspectable",
+  "audio_addict/auto_properties",
+  "audio_addict/commands/base",
+  "audio_addict"

data/lib/audio_addict/api.rb

@@ -1,11 +1,12 @@
-require 'httparty'
+require "httparty"
 
 module AudioAddict
   class API
     include HTTParty
     include Cache
 
-    base_uri 'https://api.audioaddict.com/v1'
+    base_uri "https://api.audioaddict.com/v1"
+    debug_output $stderr if ENV['AUDIO_ADDICT_DEBUG']
 
     attr_accessor :network
 
@@ -15,22 +16,22 @@ module AudioAddict
 
     def login(username, password)
       session = session(username, password)
-      Config.session_key = session['key']
-      Config.listen_key = session['member']['listen_key']
-      Config.email = session['member']['email']
-      Config.premium = session['member']['user_type'] == 'premium'
+      Config.session_key = session["key"]
+      Config.listen_key = session["member"]["listen_key"]
+      Config.email = session["member"]["email"]
+      Config.premium = session["member"]["user_type"] == "premium"
       Config.save
     end
 
-    def get(path, args={})
+    def get(path, args = {})
       response http.get "/#{network}/#{path}", headers: headers, body: args
     end
 
-    def post(path, args={})
+    def post(path, args = {})
       response http.post "/#{network}/#{path}", headers: headers, body: args
     end
 
-    def delete(path, args={})
+    def delete(path, args = {})
       response http.delete "/#{network}/#{path}", headers: headers, body: args
     end
 
@@ -39,13 +40,13 @@ module AudioAddict
     end
 
     def basic_auth
-      http.basic_auth 'streams', 'diradio'
+      http.basic_auth "streams", "diradio"
     end
 
     def session(username, password)
       params = { member_session: { username: username, password: password } }
       basic_auth
-      response http.post "/#{network || 'di'}/member_sessions", body: params
+      response http.post "/#{network || "di"}/member_sessions", body: params
     end
 
     def session_key
@@ -56,7 +57,7 @@ module AudioAddict
       Config.listen_key
     end
 
-  private
+    private
 
     def response(httparty_response)
       raise APIError.new httparty_response unless httparty_response.success?
@@ -70,6 +71,5 @@ module AudioAddict
     def headers
       { "X-Session-Key" => session_key }
     end
-
   end
 end

data/lib/audio_addict/auto_properties.rb

@@ -5,7 +5,7 @@ module AudioAddict
     def method_missing(method_sym, *args, &block)
       respond_to?(method_sym) ? properties[method_sym.to_s] : super
     end
-    
+
     def respond_to_missing?(method_sym, _include_private = false)
       properties.has_key?(method_sym.to_s) || super
     end

data/lib/audio_addict/cache.rb

@@ -1,8 +1,7 @@
-require 'lightly'
+require "lightly"
 
 module AudioAddict
   module Cache
-
     def cache
       @cache ||= Lightly.new life: cache_life, dir: cache_dir
     end
@@ -12,7 +11,7 @@ module AudioAddict
     end
 
     def cache_life!
-      Config.cache_life || '6h'
+      Config.cache_life || "6h"
     end
 
     def cache_dir
@@ -22,6 +21,5 @@ module AudioAddict
     def cache_dir!
       Config.cache_dir || "#{Dir.home}/.audio_addict/cache"
     end
-
   end
 end

data/lib/audio_addict/channel.rb

@@ -3,11 +3,11 @@ module AudioAddict
     include Cache
     include AutoProperties
     include Inspectable
-    
+
     attr_reader :radio
 
     def initialize(radio, properties)
-      @radio, @properties  = radio, properties
+      @radio, @properties = radio, properties
     end
 
     def inspectable
@@ -17,8 +17,8 @@ module AudioAddict
     def active?
       # Seems like each network has a different way of marking inactive channels.
       # This is where we normalize it
-      return false if !properties['asset_id']
-      return false if name[0] == 'X' and key[0] != 'x'
+      return false if !properties["asset_id"]
+      return false if name[0] == "X" and key[0] != "x"
       return true
     end
 
@@ -36,15 +36,15 @@ module AudioAddict
     end
 
     def similar_channels
-      similar = properties['similar_channels']
+      similar = properties["similar_channels"]
       return [] unless similar
-      ids = similar.map { |s| s['similar_channel_id'] }
+      ids = similar.map { |s| s["similar_channel_id"] }
       radio.search_by_id ids
     end
 
     def vote(direction = :up, track: nil)
-      track ||= current_track.id
-      endpoint = "tracks/#{track}/vote/#{id}"
+      track ||= current_track
+      endpoint = "tracks/#{track.id}/vote/#{id}"
 
       if direction == :delete
         radio.api.delete endpoint
@@ -52,16 +52,16 @@ module AudioAddict
         radio.api.post "#{endpoint}/#{direction}"
       end
 
-      log_like if direction == :up and Config.like_log
+      log_like track if direction == :up and Config.like_log
     end
 
-  private
+    private
 
-    def log_like
-      message = "#{radio.name} :: #{name} :: #{current_track.artist} :: #{current_track.title}"
+    def log_like(track = nil)
+      track ||= current_track
+      message = "#{radio.name} :: #{name} :: #{track.artist} :: #{track.title}"
       file = Config.like_log
       File.append file, message unless File.contains? file, message
     end
-    
   end
 end

data/lib/audio_addict/cli.rb

@@ -4,19 +4,19 @@ module AudioAddict
       router = MisterBin::Runner.new version: VERSION,
         header: "AudioAddict Radio Utilities"
 
-      router.route 'login',    to: Commands::LoginCmd
-      router.route 'set',      to: Commands::SetCmd
-      router.route 'channels', to: Commands::ChannelsCmd
-      router.route 'now',      to: Commands::NowCmd
-      router.route 'history',  to: Commands::HistoryCmd
-      router.route 'vote',     to: Commands::VoteCmd
-      router.route 'playlist', to: Commands::PlaylistCmd
-      router.route 'config',   to: Commands::ConfigCmd
-      router.route 'log',      to: Commands::LogCmd
-      router.route 'api',      to: Commands::APICmd
+      router.route "login", to: Commands::LoginCmd
+      router.route "set", to: Commands::SetCmd
+      router.route "channels", to: Commands::ChannelsCmd
+      router.route "now", to: Commands::NowCmd
+      router.route "history", to: Commands::HistoryCmd
+      router.route "vote", to: Commands::VoteCmd
+      router.route "playlist", to: Commands::PlaylistCmd
+      router.route "config", to: Commands::ConfigCmd
+      router.route "log", to: Commands::LogCmd
+      router.route "download", to: Commands::DownloadCmd
+      router.route "api", to: Commands::APICmd
 
       router
     end
   end
-
 end

data/lib/audio_addict/commands/api.rb

@@ -10,9 +10,9 @@ module AudioAddict
 
       param "ENDPOINT", "API endpoint path"
 
-      example "radio channels"
-      example "radio get track_history/channel/1"
-      example "radio post tracks/1/vote/2/up"
+      example "radio api channels"
+      example "radio api get track_history/channel/1"
+      example "radio api post tracks/1/vote/2/up"
 
       def run
         needs :network
@@ -20,22 +20,21 @@ module AudioAddict
         puts response.to_yaml
       end
 
-    private
+      private
 
       def api_method
-        return :post if args['post']
-        return :delete if args['delete']
+        return :post if args["post"]
+        return :delete if args["delete"]
         return :get
       end
 
       def endpoint
-        args['ENDPOINT']
+        args["ENDPOINT"]
       end
 
       def api
         @api ||= API.new current_network
       end
-
     end
   end
-end
+end

data/lib/audio_addict/commands/base.rb

@@ -1,11 +1,10 @@
-require 'mister_bin'
-require 'colsole'
-require 'tty/prompt'
+require "mister_bin"
+require "colsole"
+require "tty/prompt"
 
 module AudioAddict
   module Commands
     class Base < MisterBin::Command
-
       def needs(*config_keys)
         missing = []
         config_keys.each do |key|
@@ -34,7 +33,6 @@ module AudioAddict
       def prompt
         @prompt ||= TTY::Prompt.new
       end
-
     end
   end
-end
+end

data/lib/audio_addict/commands/channels.rb

@@ -22,19 +22,19 @@ module AudioAddict
 
         say "!undgrn!#{radio.name}\n"
 
-        search = args['SEARCH']
+        search = args["SEARCH"]
 
         channels = search ? radio.search(search) : radio.channels
-        
+
         channels = channels.values
-        if args['--info']
+        if args["--info"]
           show_verbose channels
         else
           show_compact channels
         end
       end
 
-    private
+      private
 
       def show_verbose(channels)
         channels.each do |channel|
@@ -61,7 +61,6 @@ module AudioAddict
           say "!txtblu!#{channel.key.rjust 25} !txtgrn!#{channel.name.strip}"
         end
       end
-      
     end
   end
-end
+end

data/lib/audio_addict/commands/config.rb

@@ -34,21 +34,21 @@ module AudioAddict
       example "radio config get listen_key"
 
       def get_command
-        key = args['KEY'].to_sym
+        key = args["KEY"].to_sym
         value = Config.properties[key]
         say value ? "!txtgrn!#{value}" : "!txtred!<Unset>"
       end
 
       def set_command
-        key = args['KEY'].to_sym
-        value = args['VALUE']
+        key = args["KEY"].to_sym
+        value = args["VALUE"]
         Config.properties[key] = value
         Config.save
         say "!txtgrn!#{key}=#{value}"
       end
 
       def del_command
-        key = args['KEY'].to_sym
+        key = args["KEY"].to_sym
         Config.delete key
         Config.save
         say "!txtgrn!Deleted"
@@ -64,7 +64,7 @@ module AudioAddict
       end
 
       def edit_command
-        editor = ENV['EDITOR'] || 'vi'
+        editor = ENV["EDITOR"] || "vi"
         system "#{editor} #{Config.path}"
       end
 
@@ -77,14 +77,14 @@ module AudioAddict
       end
 
       def check_command
-        errors   = verify_and_show_keys required_keys, critical: true
+        errors = verify_and_show_keys required_keys, critical: true
         warnings = verify_and_show_keys optional_keys
 
         say "Done. #{errors} errors, #{warnings} warnings."
         errors > 0 ? 1 : 0
       end
 
-    private
+      private
 
       def verify_and_show_keys(keys, critical: false)
         problems = 0
@@ -115,20 +115,19 @@ module AudioAddict
 
       def required_keys
         {
-          email: 'login',
-          session_key: 'login',
-          listen_key: 'login',
-          network: 'set',
-          channel: 'set',
+          email: "login",
+          session_key: "login",
+          listen_key: "login",
+          network: "set",
+          channel: "set",
         }
       end
 
       def optional_keys
         {
-          like_log: 'config set like_log PATH',
+          like_log: "config set like_log PATH",
         }
       end
-
     end
   end
-end
+end

data/lib/audio_addict/commands/download.rb

@@ -0,0 +1,73 @@
+module AudioAddict
+  module Commands
+    class DownloadCmd < Base
+      summary "Download songs from YouTube"
+
+      help "This command uses youtube-dl to download the currently playing song, or songs from your like-log."
+
+      usage "radio download current [--count N]"
+      usage "radio download log [--lines N --count N]"
+      usage "radio download search QUERY [--count N]"
+      usage "radio download --help"
+
+      option "-l --lines N", "Number of log lines to download [default: 1]"
+      option "-c --count N", "Number of YouTube search results to download\nDefaults to the value of the AUDIO_ADDICT_DOWNLOAD_COUNT environment variable, or 1"
+
+      param "QUERY", "YouTube search query"
+
+      command "current", "Download the currently playing song"
+      command "log", "Download the last N songs from the like-log"
+      command "search", "Download any song matching the Youtube search query"
+
+      environment "AUDIO_ADDICT_DOWNLOAD_COUNT", "Set the default download count (--count)"
+
+      example "radio download current"
+      example "radio download current --count 3"
+      example "radio download log --lines 2 --count 3"
+      example "radio download search 'Brimstone, Bright Shadow' -c2"
+
+      def current_command
+        needs :network, :channel
+
+        say "!txtblu!Downloading !txtrst!: ... "
+
+        track = current_channel.current_track
+        query = track.search_string
+
+        resay "!txtblu!Downloading !txtgrn!: #{query}"
+
+        Youtube.new(query).get count
+      end
+
+      def log_command
+        needs :like_log
+        lines = args['--lines']&.to_i
+
+        data = log.data[-lines..-1]
+        data.each do |line|
+          network, channel, artist, song = line.split(" :: ")
+          query = "#{artist}, #{song}"
+          say "\n!txtblu!Downloading !txtgrn!: #{query}"
+          Youtube.new(query).get count
+        end
+      end
+
+      def search_command
+        query = args['QUERY']
+
+        say "\n!txtblu!Downloading !txtgrn!: #{query}"
+        Youtube.new(query).get count
+      end
+
+    private
+
+      def count
+        args['--count']&.to_i || ENV['AUDIO_ADDICT_DOWNLOAD_COUNT']&.to_i || 1
+      end
+
+      def log
+        @log ||= Log.new
+      end
+    end
+  end
+end

data/lib/audio_addict/commands/history.rb

@@ -1,7 +1,7 @@
 module AudioAddict
   module Commands
     class HistoryCmd < Base
-      summary "Show track history for the current channel" 
+      summary "Show track history for the current channel"
 
       help "This command shows the last few tracks that were playing on the currently active channel in reverse order (top track is the most recent)."
 
@@ -11,13 +11,13 @@ module AudioAddict
       def run
         needs :network, :channel
         say "!undgrn!#{radio.name} > #{current_channel.name}"
-        say ''
+        say ""
         tracks.each do |track|
           say "!txtgrn! #{track.artist.rjust max_artist_len}!txtrst! : !txtblu!#{track.title}"
         end
       end
 
-    private
+      private
 
       def tracks
         @tracks ||= current_channel.track_history
@@ -28,4 +28,4 @@ module AudioAddict
       end
     end
   end
-end
+end

data/lib/audio_addict/commands/log.rb

@@ -32,13 +32,13 @@ module AudioAddict
 
       def show_command
         needs :like_log
-        query = args['SEARCH']
+        query = args["SEARCH"]
         puts query ? log.search(query) : log.data
       end
 
       def tail_command
         needs :like_log
-        lines = args['--lines'].to_i
+        lines = args["--lines"].to_i
         puts log.data[-lines..-1]
       end
 
@@ -52,10 +52,10 @@ module AudioAddict
         tree = log.tree
 
         say ""
-        network = prompt.select "Network:", tree.keys, marker: '>', filter: true
-        channel = prompt.select "Channel:", tree[network].keys, marker: '>', filter: true, per_page: page_size
-        artist  = prompt.select "Artist:",  tree[network][channel].keys, marker: '>', filter: true, per_page: page_size
-        
+        network = prompt.select "Network:", tree.keys, symbols: { marker: ">" }, filter: true, per_page: 10
+        channel = prompt.select "Channel:", tree[network].keys, symbols: { marker: ">" }, filter: true, per_page: page_size
+        artist = prompt.select "Artist:", tree[network][channel].keys, symbols: { marker: ">" }, filter: true, per_page: page_size
+
         say "Songs:"
         tree[network][channel][artist].each { |song| say "- !txtgrn!#{song}" }
         say ""
@@ -65,8 +65,8 @@ module AudioAddict
 
       def tree_command
         yaml = log.tree.to_yaml
-        filename = args['--save']
-        
+        filename = args["--save"]
+
         if filename
           File.write filename, yaml
           say "!txtgrn!Saved #{filename}"
@@ -75,7 +75,7 @@ module AudioAddict
         end
       end
 
-    private
+      private
 
       def log
         @log ||= Log.new
@@ -84,7 +84,6 @@ module AudioAddict
       def page_size
         @page_size ||= detect_terminal_size[1] - 4
       end
-
     end
   end
-end
+end

data/lib/audio_addict/commands/login.rb

@@ -15,16 +15,16 @@ module AudioAddict
           say "!txtylw!You are already logged in as !undylw!#{Config.email}"
           proceed = prompt.yes? "Login again?"
         end
-        
+
         login_prompt if proceed
       end
 
-    private
+      private
 
       def login_prompt
         user = prompt.ask "Username :", default: Config.email
         pass = prompt.mask "Password :"
-        
+
         if user and pass
           say "Logging in... "
           radio.api.login user, pass
@@ -33,7 +33,6 @@ module AudioAddict
           say "!txtred!Cancelled"
         end
       end
-      
     end
   end
-end
+end

data/lib/audio_addict/commands/now.rb

@@ -1,7 +1,7 @@
 module AudioAddict
   module Commands
     class NowCmd < Base
-      summary "Show network, channel and playing track" 
+      summary "Show network, channel and playing track"
 
       help "This command displays the active network and channel, as well as the currently playing track."
 
@@ -11,15 +11,14 @@ module AudioAddict
       def run
         needs :network, :channel
 
-        say   "!txtblu!  Network !txtrst!: !txtgrn!#{radio.name}!txtrst! # #{radio.network}"
-        say   "!txtblu!  Channel !txtrst!: !txtgrn!#{current_channel.name}!txtrst! # #{current_channel.key}"
-        say   "!txtblu!    Track !txtrst!: ... "
+        say "!txtblu!  Network !txtrst!: !txtgrn!#{radio.name}!txtrst! # #{radio.network}"
+        say "!txtblu!  Channel !txtrst!: !txtgrn!#{current_channel.name}!txtrst! # #{current_channel.key}"
+        say "!txtblu!    Track !txtrst!: ... "
 
         track = current_channel.current_track
         resay "!txtblu!    Track !txtrst!: !txtgrn!#{track.title.strip}"
-        say   "!txtblu!       By !txtrst!: !txtgrn!#{track.artist.strip}"
+        say "!txtblu!       By !txtrst!: !txtgrn!#{track.artist.strip}"
       end
-
     end
   end
-end
+end

data/lib/audio_addict/commands/playlist.rb

@@ -1,7 +1,7 @@
 module AudioAddict
   module Commands
     class PlaylistCmd < Base
-      summary "Generate playlists" 
+      summary "Generate playlists"
 
       help "This command lets you generate playlists for the active network. In order to allow configuration, the process is done in two stages: 'init' and 'generate'."
 
@@ -22,7 +22,7 @@ module AudioAddict
 
         require_premium_account
 
-        name = args['NAME']
+        name = args["NAME"]
         outfile = "#{name}.yml"
 
         say "!txtred!Warning!txtrst!: !txtgrn!#{outfile}!txtrst! already exists!" if File.exist? outfile
@@ -34,12 +34,12 @@ module AudioAddict
         end
       end
 
-      def generate_command(name=nil)
+      def generate_command(name = nil)
         needs :network, :channel, :listen_key
 
         require_premium_account
 
-        name ||= args['NAME']
+        name ||= args["NAME"]
 
         infile = "#{name}.yml"
         outfile = "#{name}.pls"
@@ -53,15 +53,12 @@ module AudioAddict
         end
       end
 
-    private
+      private
 
       def generate_config(outfile)
-        data = {
-          template: "http://prem2.#{radio.domain}:80/%{channel_key}?%{listen_key}"
-        }
-
+        data = { template: radio.url_template }
         channels = {}
-        
+
         radio.channels.each do |key, channel|
           key = fix_key key.to_sym
           channels[key] = channel.name
@@ -107,10 +104,9 @@ module AudioAddict
 
       # This is a patch to circumvent some anomalies in the AudioAddict API
       def fix_key(key)
-        key = :electrohouse if current_network == 'di' and key == :electro
+        key = :electrohouse if current_network == "di" and key == :electro
         key
       end
-
     end
   end
-end
+end

data/lib/audio_addict/commands/set.rb

@@ -19,8 +19,8 @@ module AudioAddict
       example "radio set - rockradio"
 
       def run
-        channel = args['CHANNEL']
-        network = args['NETWORK']
+        channel = args["CHANNEL"]
+        network = args["NETWORK"]
 
         full_set = (channel and network) || !(channel or network)
 
@@ -31,7 +31,7 @@ module AudioAddict
         end
       end
 
-    private
+      private
 
       def set_both(channel, network)
         needs :session_key
@@ -50,19 +50,14 @@ module AudioAddict
 
         if !channel
           channel_menu
-
-        elsif channel == '-'
+        elsif channel == "-"
           save_channel radio.channels.keys.first
-
         elsif radio.valid_channel? channel
           save_channel channel
-        
         elsif radio.search(channel).any?
           channel_menu channel
-
         else
           say "!txtred!Invalid channel: #{radio.name} > #{channel}"
-
         end
       end
 
@@ -91,13 +86,13 @@ module AudioAddict
       def channel_prompt(channels)
         options = channels.map { |channel| ["#{channel.name.ljust 20} # #{channel.key}", channel.key] }.to_h
         options = { "Cancel" => :cancel }.merge options
-        prompt.select "Channel :", options, marker: '>', filter: true
+        prompt.select "Channel :", options, symbols: { marker: ">" }, filter: true
       end
 
       def network_prompt(networks)
         options = networks.invert
         options["Skip"] = :cancel
-        prompt.select "Network :", options, marker: '>', filter: true
+        prompt.select "Network :", options, symbols: { marker: ">" }, filter: true, per_page: 10
       end
 
       def save_channel(channel, echo: true)
@@ -111,7 +106,6 @@ module AudioAddict
         Config.save
         say "Network : !txtgrn!#{radio.name}!txtrst! # #{network}" if echo
       end
-
     end
   end
-end
+end

data/lib/audio_addict/commands/vote.rb

@@ -1,7 +1,7 @@
 module AudioAddict
   module Commands
     class VoteCmd < Base
-      summary "Vote on a recently played track" 
+      summary "Vote on a recently played track"
 
       help "This command starts an interactive voting prompt for the currently playing track or for previously played tracks."
 
@@ -22,7 +22,7 @@ module AudioAddict
         vote_mode == :now ? vote_now : vote_past
       end
 
-    private
+      private
 
       def vote_past
         track = get_user_track
@@ -54,9 +54,9 @@ module AudioAddict
       end
 
       def get_user_track
-        options = tracks.map { |t| ["#{t.artist.ljust max_artist_len} > #{t.title}", t.id]}.to_h
+        options = tracks.map { |t| ["#{t.artist.ljust max_artist_len} > #{t.title}", t] }.to_h
         options = { "Cancel" => :cancel }.merge options
-        prompt.select "Track:", options, marker: '>'
+        prompt.select "Track:", options, symbols: { marker: ">" }
       end
 
       def get_user_vote
@@ -64,9 +64,9 @@ module AudioAddict
       end
 
       def menu_prompt
-        options = { "Like" => :up, "Dislike" => :down, 
-          "Unvote" => :delete, "Cancel" => :cancel }
-        prompt.select "Vote:", options, marker: '>'
+        options = { "Like" => :up, "Dislike" => :down,
+                    "Unvote" => :delete, "Cancel" => :cancel }
+        prompt.select "Vote:", options, symbols: { marker: ">" }
       end
 
       def simple_prompt
@@ -75,13 +75,12 @@ module AudioAddict
       end
 
       def vote_style
-        args['--all'] ? :menu : :simple
+        args["--all"] ? :menu : :simple
       end
 
       def vote_mode
-        args['--past'] ? :past : :now
+        args["--past"] ? :past : :now
       end
-
     end
   end
 end

data/lib/audio_addict/config.rb

@@ -1,4 +1,4 @@
-require 'yaml'
+require "yaml"
 
 module AudioAddict
   class Config
@@ -6,7 +6,7 @@ module AudioAddict
       attr_writer :path
 
       def method_missing(name, *args, &_blk)
-        if name.to_s.end_with? '='
+        if name.to_s.end_with? "="
           name = name[0..-2].to_sym
           properties[name] = args.first
         else
@@ -39,13 +39,12 @@ module AudioAddict
       end
 
       def path
-        @path ||= ENV.fetch('AUDIO_ADDICT_CONFIG_PATH', default_path)
+        @path ||= ENV.fetch("AUDIO_ADDICT_CONFIG_PATH", default_path)
       end
 
       def default_path
         "#{Dir.home}/.audio_addict/config"
       end
-
     end
   end
 end

data/lib/audio_addict/exceptions.rb

@@ -1,25 +1,24 @@
 module AudioAddict
   class Error < StandardError; end
-  
   class Interrupt < Error; end
-
   class ArgumentError < Error; end
+  class DependencyError < Error; end
 
   class ConfigError < Error
     attr_reader :missing_keys
 
     def initialize(missing_keys)
       @missing_keys = missing_keys
-      super "Some parameters required by this operation are missing" 
+      super "Some parameters required by this operation are missing"
     end
   end
-  
+
   class PremiumAccount < Error
-    def initialize(message="This operation requires a premium account")
+    def initialize(message = "This operation requires a premium account")
       super
     end
   end
-  
+
   class APIError < Error
     attr_reader :response
 
@@ -28,4 +27,4 @@ module AudioAddict
       super "#{response.code} #{response.message}:\n#{response.body}"
     end
   end
-end
+end

data/lib/audio_addict/extensions/file.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 class File
   def self.contains?(file, content)
@@ -10,7 +10,7 @@ class File
   end
 
   def self.append(file, content)
-    open(file, 'a') { |f| f.puts content }
+    open(file, "a") { |f| f.puts content }
   end
 
   def self.deep_write(file, content)

data/lib/audio_addict/inspectable.rb

@@ -2,7 +2,7 @@ module AudioAddict
   module Inspectable
     def inspect
       keys = inspectable.map { |k| %Q[@#{k}="#{send k}"] }
-      "#<#{self.class} #{keys.join ', '}>"
+      "#<#{self.class} #{keys.join ", "}>"
     end
   end
 end

data/lib/audio_addict/log.rb

@@ -31,9 +31,9 @@ module AudioAddict
 
     def tree!
       result = {}
-      
+
       data.each do |line|
-        network, channel, artist, song = line.split(' :: ')
+        network, channel, artist, song = line.split(" :: ")
         result[network] ||= {}
         result[network][channel] ||= {}
         result[network][channel][artist] ||= []
@@ -42,6 +42,5 @@ module AudioAddict
 
       result
     end
-
   end
 end

data/lib/audio_addict/radio.rb

@@ -10,7 +10,8 @@ module AudioAddict
       rockradio: "Rock Radio",
       radiotunes: "Radio Tunes",
       jazzradio: "Jazz Radio",
-      classicalradio: "Classical Radio"
+      classicalradio: "Classical Radio",
+      zenradio: "Zen Radio",
     }
 
     DOMAINS = {
@@ -18,7 +19,8 @@ module AudioAddict
       rockradio: "rockradio.com",
       radiotunes: "radiotunes.com",
       jazzradio: "jazzradio.com",
-      classicalradio: "classicalradio.com"
+      classicalradio: "classicalradio.com",
+      zenradio: "zenradio.com",
     }
 
     def self.networks(search = nil)
@@ -50,6 +52,11 @@ module AudioAddict
       DOMAINS[network.to_sym]
     end
 
+    def url_template
+      channel_path = network == "zenradio" ? "zr%{channel_key}_aac" : "%{channel_key}"
+      "http://prem2.#{domain}:80/#{channel_path}?%{listen_key}"
+    end
+
     def channels
       @channels ||= channels!
     end
@@ -57,7 +64,7 @@ module AudioAddict
     def search(query)
       channels.select do |key, channel|
         "#{key} #{channel.name.downcase}".include? query.downcase
-      end 
+      end
     end
 
     def search_by_id(ids)
@@ -77,16 +84,16 @@ module AudioAddict
       @api ||= API.new network
     end
 
-  private
+    private
 
     def channels!
       response = cache.get "#{network}/channels" do
-        api.get 'channels'
+        api.get "channels"
       end
 
       result = {}
       response.map do |channel|
-        key = channel['key']
+        key = channel["key"]
         candidate = Channel.new self, channel
         result[key] = candidate if candidate.active?
       end

data/lib/audio_addict/track.rb

@@ -6,7 +6,7 @@ module AudioAddict
     attr_reader :channel
 
     def initialize(channel, properties)
-      @channel, @properties  = channel, properties
+      @channel, @properties = channel, properties
     end
 
     def inspectable
@@ -14,11 +14,15 @@ module AudioAddict
     end
 
     def id
-      properties['track_id']
+      properties["track_id"]
     end
 
     def title
-      properties['title'].strip
+      properties["title"].strip
+    end
+
+    def search_string
+      "#{artist}, #{title}"
     end
   end
 end

data/lib/audio_addict/version.rb

@@ -1,3 +1,3 @@
 module AudioAddict
-  VERSION = "0.2.0"
-end
+  VERSION = "0.4.1"
+end

data/lib/audio_addict/youtube.rb

@@ -0,0 +1,41 @@
+module AudioAddict
+  class Youtube
+    include Inspectable
+    include Colsole
+
+    attr_reader :query
+
+    def initialize(query)
+      @query = query
+    end
+
+    def inspectable
+      [:query]
+    end
+
+    def get(count = 1)
+      raise DependencyError, "This command requires youtube-dl" unless command_exist? 'youtube-dl'
+      success = execute command(count: count, query: query)
+      raise DependencyError, "youtube-dl exited with an error" unless success
+    end
+
+    def command(args)
+      command_template % args
+    end
+
+  private
+
+    def execute(command)
+      if ENV['AUDIO_ADDICT_DOWNLOAD_DRY_RUN']
+        puts "DRY RUN: #{command}"
+        true
+      else
+        system command
+      end
+    end
+
+    def command_template
+      @command_template ||= %Q[youtube-dl --extract-audio --audio-format mp3 ytsearch%{count}:"%{query}"]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_addict
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
 description: Command line for playlist management and voting for AudioAddict radio
   networks
 email: db@dannyben.com
@@ -114,6 +114,7 @@ files:
 - lib/audio_addict/commands/base.rb
 - lib/audio_addict/commands/channels.rb
 - lib/audio_addict/commands/config.rb
+- lib/audio_addict/commands/download.rb
 - lib/audio_addict/commands/history.rb
 - lib/audio_addict/commands/log.rb
 - lib/audio_addict/commands/login.rb
@@ -129,6 +130,7 @@ files:
 - lib/audio_addict/radio.rb
 - lib/audio_addict/track.rb
 - lib/audio_addict/version.rb
+- lib/audio_addict/youtube.rb
 homepage: https://github.com/dannyben/audio_addict
 licenses:
 - MIT
@@ -148,8 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: AudioAddict Command Line