audio_addict 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463dda325c6bd171a44438bea714b4f0058ddc3c34cf5a5cd8cba93d32bf278a
-  data.tar.gz: 0643c29d7061962195bb97aff3db432b8d79d766c9ac31c94edca328742ad53b
+  metadata.gz: e4976f81d40edb501b5e1bd16d741a2145aede7a91cac66606c4c8812429feb7
+  data.tar.gz: 6011eeaf3b2c74e2648af08d0cfb25dd999e976a06fabc8181d80ca1fe6ce703
 SHA512:
-  metadata.gz: bf473be5bba0733b671697664c51cc7250240dfa3dea3839ff01fd55edbb34645e7c8ca01837f86ccf621ee3630b9fcaf5ea6eec68cefd8158c1370deccda6f7
-  data.tar.gz: 0c3cdd6c9741159363ac71ea9b353a4cea9aec56fbc0fab783fe84a8f32d9ea93576fe41f2068cb6710c98547cfcedf6e439980ed674a61194265edec2e90c53
+  metadata.gz: c5f40c5d64faabc2c5d37d6d4734ff212484f46e8aa8467c8a8adb0159f2f3b465e940eeb67c99f8dceb5c9721b8d74856be6aeb3fcc8883c6a601e35dd28782
+  data.tar.gz: 6abed1cd956046de5e9ca2c6f25ecde44d039ea7d014288146ce203390cee0174bd1feb34865c6d114cfbf498d111477033aa2ef2dd351c62294196bd90d3a55

data/README.md

@@ -69,7 +69,7 @@ Commands:
   playlist  Generate playlists
   config    Manage local configuration
   log       Manage local like log
-
+  api       Make direct calls to the AudioAddict API
 
 ```
 

data/lib/audio_addict/cli.rb

@@ -14,6 +14,7 @@ module AudioAddict
       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
     end

data/lib/audio_addict/commands/api.rb

@@ -0,0 +1,43 @@
+module AudioAddict
+  module Commands
+    class APICmd < Base
+      summary "Make direct calls to the AudioAddict API"
+
+      help "This command sends a request to the provided API endpoint. The currently configured network is automatically prepended to the endpoint path, and the output is converted to YAML format."
+
+      usage "radio api [get|post|delete] ENDPOINT"
+      usage "radio api --help"
+
+      param "ENDPOINT", "API endpoint path"
+
+      example "radio channels"
+      example "radio get track_history/channel/1"
+      example "radio post tracks/1/vote/2/up"
+
+      def run(args)
+        needs :network
+        @args = args
+
+        response = api.send(api_method, endpoint)
+        puts response.to_yaml
+      end
+
+    private
+
+      def api_method
+        return :post if @args['post']
+        return :delete if @args['delete']
+        return :get
+      end
+
+      def endpoint
+        @args['ENDPOINT']
+      end
+
+      def api
+        @api ||= API.new current_network
+      end
+
+    end
+  end
+end

data/lib/audio_addict/commands/log.rb

@@ -6,54 +6,81 @@ module AudioAddict
       usage "radio log show [SEARCH]"
       usage "radio log tail [--lines N]"
       usage "radio log sort"
+      usage "radio log browse"
+      usage "radio log tree [--save FILE]"
       usage "radio log --help"
 
       option "-l --lines N", "Number of lines to show [default: 5]"
+      option "-s --save FILE", "Save the tree output to a YAML file"
 
       param "SEARCH", "Show only log lines matching this string"
 
       command "show", "Show the entire like log"
       command "tail", "Show the last few rows of the like log"
       command "sort", "Sort the log alphabetically and save it"
+      command "browse", "Browse the log file interactively"
+      command "tree", "Show or save the log as YAML"
 
       example "radio log show"
       example "radio log show paramore"
       example "radio log tail"
       example "radio log tail --lines 10"
       example "radio log sort"
+      example "radio log tree --save out.yml"
 
       def show_command(args)
-        setup
-        search = args['SEARCH']
-        if search
-          puts File.readlines(logfile).select { |l| l.downcase.include? search.downcase }
-        else
-          puts File.read(logfile)
-        end
+        needs :like_log
+        query = args['SEARCH']
+        puts query ? log.search(query) : log.data
       end
 
       def tail_command(args)
-        setup
+        needs :like_log
         lines = args['--lines'].to_i
-        puts File.readlines(logfile)[-lines..-1]
+        puts log.data[-lines..-1]
       end
 
       def sort_command(args)
-        setup
-        lines = File.readlines logfile
-        File.write logfile, lines.sort.join
+        needs :like_log
+        log.sort
         say "!txtgrn!Sorted"
       end
 
+      def browse_command(args=nil)
+        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
+        
+        say "Songs:"
+        tree[network][channel][artist].each { |song| say "- !txtgrn!#{song}" }
+        say ""
+
+        browse_command if prompt.yes?("Again?")
+      end
+
+      def tree_command(args)
+        yaml = log.tree.to_yaml
+        filename = args['--save']
+        
+        if filename
+          File.write filename, yaml
+          say "!txtgrn!Saved #{filename}"
+        else
+          puts yaml
+        end
+      end
+
     private
 
-      def setup
-        needs :like_log
-        raise Error, "File not found: #{logfile}" unless File.exist? logfile
+      def log
+        @log ||= Log.new
       end
 
-      def logfile
-        @logfile ||= Config.like_log
+      def page_size
+        @page_size ||= detect_terminal_size[1] - 4
       end
 
     end

data/lib/audio_addict/commands/playlist.rb

@@ -58,11 +58,11 @@ module AudioAddict
           template: "http://prem2.#{radio.domain}:80/%{channel_key}?%{listen_key}"
         }
 
-        channels = []
+        channels = {}
         
         radio.channels.each do |key, channel|
-          channel_data = { name: channel.name, key: key, active: true }
-          channels << channel_data
+          key = fix_key key.to_sym
+          channels[key] = channel.name
         end
 
         data[:channels] = channels
@@ -74,7 +74,7 @@ module AudioAddict
       def generate_playlist(infile, outfile)
         data = YAML.load_file infile
         template = data[:template]
-        channels = data[:channels].select { |c| c[:active] }
+        channels = data[:channels]
 
         output = []
         output << "[playlist]"
@@ -82,10 +82,10 @@ module AudioAddict
 
         index = 0
 
-        channels.each do |channel|
+        channels.each do |key, name|
           index += 1
-          output << "File#{index}=#{template}" % template_params(channel[:key])
-          output << "Title#{index}=#{channel[:name]}"
+          output << "File#{index}=#{template}" % template_params(key)
+          output << "Title#{index}=#{name}"
           output << "Length#{index}=0"
         end
 
@@ -103,6 +103,12 @@ module AudioAddict
         Config.listen_key
       end
 
+      # 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
+      end
+
     end
   end
 end

data/lib/audio_addict/commands/set.rb

@@ -8,7 +8,7 @@ module AudioAddict
       usage "radio set [CHANNEL NETWORK]"
       usage "radio set --help"
 
-      param "CHANNEL", "AudioAddict channel key. You can use a partial key here or leave empty for an interactive prompt."
+      param "CHANNEL", "AudioAddict channel key. You can use a partial key here or leave empty for an interactive prompt.\nUse '-' to set the first channel in the network."
       param "NETWORK", "AudioAddict network key. You can use a partial key here or leave empty for an interactive prompt."
 
       example "radio set"
@@ -16,6 +16,7 @@ module AudioAddict
       example "radio set dance digitally"
       example "radio set dance di"
       example "radio set metal rockradio"
+      example "radio set - rockradio"
 
       def run(args)
         channel = args['CHANNEL']
@@ -50,6 +51,9 @@ module AudioAddict
         if !channel
           channel_menu
 
+        elsif channel == '-'
+          save_channel radio.channels.keys.first
+
         elsif radio.valid_channel? channel
           save_channel channel
         

data/lib/audio_addict/log.rb

@@ -0,0 +1,46 @@
+module AudioAddict
+  class Log
+    def path
+      @path ||= Config.like_log
+    end
+
+    def data
+      @data ||= data!
+    end
+
+    def data!
+      if File.exist? path
+        File.readlines(path).map(&:strip)
+      else
+        []
+      end
+    end
+
+    def search(query)
+      data.select { |l| l.downcase.include? query.downcase }
+    end
+
+    def sort
+      File.write path, data.sort.join
+    end
+
+    def tree
+      @tree ||= tree!
+    end
+
+    def tree!
+      result = {}
+      
+      data.each do |line|
+        network, channel, artist, song = line.split(' :: ')
+        result[network] ||= {}
+        result[network][channel] ||= {}
+        result[network][channel][artist] ||= []
+        result[network][channel][artist] << song
+      end
+
+      result
+    end
+
+  end
+end

data/lib/audio_addict/version.rb

@@ -1,3 +1,3 @@
 module AudioAddict
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_addict
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -110,6 +110,7 @@ files:
 - lib/audio_addict/cache.rb
 - lib/audio_addict/channel.rb
 - lib/audio_addict/cli.rb
+- lib/audio_addict/commands/api.rb
 - lib/audio_addict/commands/base.rb
 - lib/audio_addict/commands/channels.rb
 - lib/audio_addict/commands/config.rb
@@ -125,6 +126,7 @@ files:
 - lib/audio_addict/exceptions.rb
 - lib/audio_addict/extensions/file.rb
 - lib/audio_addict/inspectable.rb
+- lib/audio_addict/log.rb
 - lib/audio_addict/radio.rb
 - lib/audio_addict/track.rb
 - lib/audio_addict/version.rb