audio_addict 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3530b3f712aaf7023144c17e182aca9aa659cde5c10426207a7f74a7c5ed94e2
-  data.tar.gz: 84935800acaa568734b0b7d326420f414d03287dab47f23049d5ab1b99c8f5e8
+  metadata.gz: 426a2b37a0f6f0d2f7a0bc151aeb481630ea6c2449065e1d154e87d39af3af36
+  data.tar.gz: 42ef3f68930178372a1bbcc2c9694bce20da72ee65672421c14b672821afa24d
 SHA512:
-  metadata.gz: 831a5050b49f28803e23a1e65565558eea4a10dca028b9320de05994f7028ab3e3721aab474dc5a09e0655fd6b3479b8db0bd11530266f650ab5a128ad0d6725
-  data.tar.gz: 2a8a65335a02e86725780441d78515c9667c83f34b2674269da749e25476bbca1bd56dedcb67e0fca8f68c98b27a88e5eaaf6632a279c2386bb12e6ae4b887a8
+  metadata.gz: 656a86ab1ff70b214af607befecf191bba4de6fc33e74f8c674c938f8732525e9cba98827962f1a86c0fb0ede9340e9b8e78f3f546dc367f6a89d2594f51b9e8
+  data.tar.gz: 33a50eac62b23ad09ed0cf8e5a5d6afa93a082765f44a377050d8105d50501c39788ae7e28b1e7963132589df31ac5539e0f5e7618a207ea30becd35a2a3a09a

data/README.md

@@ -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 (using 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,4 @@ Commands:
 [RadioTunes]: http://www.radiotunes.com
 [JazzRadio]: http://www.jazzradio.com
 [ClassicalRadio]: http://www.classicalradio.com
+[ZenRadio]: http://www.zenradio.com

data/lib/audio_addict/cli.rb

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

data/lib/audio_addict/commands/download.rb

@@ -0,0 +1,70 @@
+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 [default: 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"
+
+      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
+        count = args['--count']
+
+        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
+        count = args['--count']
+        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']
+        count = args['--count']
+
+        say "\n!txtblu!Downloading !txtgrn!: #{query}"
+        Youtube.new(query).get count
+      end
+
+    private
+
+      def log
+        @log ||= Log.new
+      end
+    end
+  end
+end

data/lib/audio_addict/exceptions.rb

@@ -1,9 +1,8 @@
 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

data/lib/audio_addict/track.rb

@@ -20,5 +20,9 @@ module AudioAddict
     def title
       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.3.0"
+  VERSION = "0.4.0"
 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['YOUTUBE_DL_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.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -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