audio_addict 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a2413418f94134ab1e8ad4bc556c9e31e4bc25f93821d7464761f226d33c51
-  data.tar.gz: 71e19ca4ff20d6b903687361239b119041eb142420b305edcaf0d6b23e261a07
+  metadata.gz: 463dda325c6bd171a44438bea714b4f0058ddc3c34cf5a5cd8cba93d32bf278a
+  data.tar.gz: 0643c29d7061962195bb97aff3db432b8d79d766c9ac31c94edca328742ad53b
 SHA512:
-  metadata.gz: 738afe0afba2a9ee10b62b1f1a9748f88d5a0d81b57bfae2f417ced6b47926fc932423b8cc03e9a72190dd44fd01decefd4de757f4282e05edd973db139f4b98
-  data.tar.gz: 402a9e2f05661831b0a5f7943bed9abf8cb9771c1c23e1d3942deaac54bfb65b71b0cc04d73961bc6a456adbc6d0b7ae250204b67e9321c9cde3303ce6f928e2
+  metadata.gz: bf473be5bba0733b671697664c51cc7250240dfa3dea3839ff01fd55edbb34645e7c8ca01837f86ccf621ee3630b9fcaf5ea6eec68cefd8158c1370deccda6f7
+  data.tar.gz: 0c3cdd6c9741159363ac71ea9b353a4cea9aec56fbc0fab783fe84a8f32d9ea93576fe41f2068cb6710c98547cfcedf6e439980ed674a61194265edec2e90c53

data/README.md

@@ -65,7 +65,7 @@ Commands:
   channels  Show list of channels
   now       Show network, channel and playing track
   history   Show track history for the current channel
-  vote      Vote on the currently playing track
+  vote      Vote on a recently played track
   playlist  Generate playlists
   config    Manage local configuration
   log       Manage local like log

data/bin/radio

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'audio_addict'
+include Colsole
 
 router = AudioAddict::CLI.router
 

data/lib/audio_addict/channel.rb

@@ -35,9 +35,16 @@ module AudioAddict
       track_history.first
     end
 
-    def vote(direction = :up)
-      track_id = current_track.id
-      endpoint = "tracks/#{track_id}/vote/#{id}"
+    def similar_channels
+      similar = properties['similar_channels']
+      return [] unless similar
+      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}"
 
       if direction == :delete
         radio.api.delete endpoint

data/lib/audio_addict/commands/channels.rb

@@ -5,13 +5,17 @@ module AudioAddict
 
       help "List and search channels in the currently set radio network"
 
-      usage "radio channels [SEARCH]"
+      usage "radio channels [SEARCH --info]"
       usage "radio channels --help"
 
+      option "-i --info", "Show results with additional info, such as channel description and related channels"
+
       param "SEARCH", "Channel name or a partial name to search for"
 
       example "radio channels"
+      example "radio channels --info"
       example "radio channels metal"
+      example "radio channels metal -i"
 
       def run(args)
         needs :network
@@ -23,8 +27,38 @@ module AudioAddict
         channels = search ? radio.search(search) : radio.channels
         
         channels = channels.values
+        if args['--info']
+          show_verbose channels
+        else
+          show_compact channels
+        end
+      end
+
+    private
+
+      def show_verbose(channels)
+        channels.each do |channel|
+          say ""
+          say "!txtgrn!#{channel.name.ljust 22} !txtrst!# #{channel.key}"
+          say ""
+          say word_wrap "#{channel.description}"
+          say ""
+
+          similar = channel.similar_channels
+
+          if similar.any?
+            say "Similar Channels:"
+            similar.each do |key, similar|
+              say "- !txtblu!#{similar.name.ljust 20}!txtrst! # #{key}"
+            end
+            say ""
+          end
+        end
+      end
+
+      def show_compact(channels)
         channels.each do |channel|
-          say "!txtgrn!#{channel.key.rjust 25} !txtblu!#{channel.name.strip}"
+          say "!txtblu!#{channel.key.rjust 25} !txtgrn!#{channel.name.strip}"
         end
       end
       

data/lib/audio_addict/commands/history.rb

@@ -10,8 +10,8 @@ module AudioAddict
         needs :network, :channel
         say "!undgrn!#{radio.name} > #{current_channel.name}"
         say ''
-        tracks.each do |channel|
-          say "!txtgrn! #{channel.artist.rjust max_artist_len}!txtrst! : !txtblu!#{channel.title}"
+        tracks.each do |track|
+          say "!txtgrn! #{track.artist.rjust max_artist_len}!txtrst! : !txtblu!#{track.title}"
         end
       end
 

data/lib/audio_addict/commands/log.rb

@@ -3,25 +3,33 @@ module AudioAddict
     class LogCmd < Base
       summary "Manage local like log"
 
-      usage "radio log show"
+      usage "radio log show [SEARCH]"
       usage "radio log tail [--lines N]"
       usage "radio log sort"
       usage "radio log --help"
 
       option "-l --lines N", "Number of lines to show [default: 5]"
 
+      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"
 
       example "radio log show"
+      example "radio log show paramore"
       example "radio log tail"
       example "radio log tail --lines 10"
       example "radio log sort"
 
       def show_command(args)
         setup
-        puts File.read(logfile)
+        search = args['SEARCH']
+        if search
+          puts File.readlines(logfile).select { |l| l.downcase.include? search.downcase }
+        else
+          puts File.read(logfile)
+        end
       end
 
       def tail_command(args)

data/lib/audio_addict/commands/now.rb

@@ -8,7 +8,7 @@ module AudioAddict
       usage "radio now"
       usage "radio now --help"
 
-      def run(args)
+      def run(args = nil)
         needs :network, :channel
 
         say   "!txtblu!  Network !txtrst!: !txtgrn!#{radio.name}!txtrst! # #{radio.network}"

data/lib/audio_addict/commands/vote.rb

@@ -1,44 +1,73 @@
 module AudioAddict
   module Commands
     class VoteCmd < Base
-      summary "Vote on the currently playing track" 
+      summary "Vote on a recently played track" 
 
-      help "Start an interactive voting prompt for the currently playing track."
+      help "Start an interactive voting prompt for the currently playing track or for previously played tracks."
 
-      usage "radio vote [--all]"
+      usage "radio vote [--all --past]"
       usage "radio vote --help"
 
       option "-a --all", "Show all voting options"
+      option "-p --past", "Vote on previously played tracks"
+
+      example "radio vote"
+      example "radio vote --all"
+      example "radio vote --past"
+      example "radio vote --all --past"
+      example "radio vote -ap"
 
       def run(args)
         needs :network, :channel, :session_key
+        @args = args
+        vote_mode == :now ? vote_now : vote_past
+      end
 
-        prompt_style = args['--all'] ? :menu : :simple
+    private
 
-        NowCmd.new.run args
-        puts ""
-        answer = get_user_vote style: prompt_style
-        unless answer == :cancel
-          say "Voting... "
-          current_channel.vote answer
-          resay "!txtgrn!Voted"
+      def vote_past
+        track = get_user_track
+        unless track == :cancel
+          vote = get_user_vote
+          send_vote vote, track unless vote == :cancel
         end
       end
 
-    private
+      def vote_now
+        NowCmd.new.run
+        puts ""
+        vote = get_user_vote
+        send_vote vote unless vote == :cancel
+      end
 
-      def get_user_vote(style: :menu)
-        if style == :menu
-          menu_prompt
-        else
-          simple_prompt
-        end
+      def send_vote(vote, track = nil)
+        say "Voting... "
+        current_channel.vote vote, track: track
+        resay "!txtgrn!Voted"
+      end
+
+      def tracks
+        @tracks ||= current_channel.track_history
+      end
+
+      def max_artist_len
+        tracks.map { |t| t.artist.size }.max
+      end
+
+      def get_user_track
+        options = tracks.map { |t| ["#{t.artist.ljust max_artist_len} > #{t.title}", t.id]}.to_h
+        options = { "Cancel" => :cancel }.merge options
+        prompt.select "Track:", options, marker: '>'
+      end
+
+      def get_user_vote
+        vote_style == :menu ? menu_prompt : simple_prompt
       end
 
       def menu_prompt
         options = { "Like" => :up, "Dislike" => :down, 
           "Unvote" => :delete, "Cancel" => :cancel }
-        prompt.select "Your Vote :", options, marker: '>'
+        prompt.select "Vote:", options, marker: '>'
       end
 
       def simple_prompt
@@ -46,6 +75,14 @@ module AudioAddict
         like ? :up : :cancel
       end
 
+      def vote_style
+        @args['--all'] ? :menu : :simple
+      end
+
+      def vote_mode
+        @args['--past'] ? :past : :now
+      end
+
     end
   end
 end

data/lib/audio_addict/radio.rb

@@ -60,6 +60,11 @@ module AudioAddict
       end 
     end
 
+    def search_by_id(ids)
+      ids = [ids] unless ids.is_a? Array
+      channels.select { |_key, channel| ids.include? channel.id }
+    end
+
     def [](channel_key)
       channels[channel_key]
     end

data/lib/audio_addict/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_addict
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole