audio_addict 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1344d6300842af6ee581d4ea2b5695c9f741ea0a839993dfae73d218280d0b88
-  data.tar.gz: facf7ab27a2e123012fa721e1eb4f36ed90e9fd6d0f184950b9ea6a6a2d37b39
+  metadata.gz: 20084805bf5d4e9fa5409b4354364be364e005e8c5db251d4bc84dfa68f04436
+  data.tar.gz: 8011bab35c939ffd10c183b56e62d169259add2f6c7c042a4e60b29b9e1fa1ca
 SHA512:
-  metadata.gz: e95982e148ee53bba66319321918cc89ce3b17f0f1d8865677ba660a3e3bdb0dcf0ec503feea3baa4aef6434be5368b0f88293ecd43ece461ec570c082effa78
-  data.tar.gz: e9e0219a73b6e51390fd8c22a98195add6596e5d7b7bd81fd93f889aa9cc40b2c1f5b87a4ed95e081386152abfed1f9bae4d933a2da8d9097b3a4fb690b72b18
+  metadata.gz: d28c3632e64e82c2154c70366c6664c90f1cb9a9e84b3ef6082efcf0629cde1ab3003ee6985a048d2d21c5d699bf7a87ba15119e5ff4d8ec18a581d7e9dad7bc
+  data.tar.gz: f53f5dfeaabed9bb8d099809bae886f2b7b5cca0eb838e401f235257407cc9e8f7d386eab99d30577699b91f8110a7eda34126f059e3ea9b3a9d434fe0e8d775

data/README.md

@@ -14,12 +14,17 @@ radio network.
 
 ---
 
+Demo
+--------------------------------------------------
+
+![Demo](https://raw.githubusercontent.com/DannyBen/audio_addict/master/demo/demo.gif)
+
 
 Install
 --------------------------------------------------
 
-Please note that in order to use this gem you need to have a premium account
-at one of the AudioAddict networks.
+Please note that in order to use this gem you need to have an AUdioAddict 
+account (free or premium) at one of the AudioAddict networks.
 
 ```
 $ gem install audio_addict
@@ -40,7 +45,7 @@ Features
 - View currently playing track
 - Vote on the currently playing track
 - Save a log of a all your liked tracks
-- Generate playlists
+- Generate playlists (requires a premium account)
 
 
 Usage

data/lib/audio_addict/api.rb

@@ -17,6 +17,8 @@ module AudioAddict
       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.save
     end
 
@@ -42,10 +44,8 @@ module AudioAddict
 
     def session(username, password)
       params = { member_session: { username: username, password: password } }
-      cache.get "/#{network}/member_sessions" do
-        basic_auth
-        response http.post "/#{network}/member_sessions", body: params
-      end
+      basic_auth
+      response http.post "/#{network}/member_sessions", body: params
     end
 
     def session_key

data/lib/audio_addict/commands/base.rb

@@ -18,6 +18,10 @@ module AudioAddict
         end
       end
 
+      def require_premium_account
+        raise PremiumAccount, "This operation requires a premium account" unless Config.premium
+      end
+
       def radio
         @radio ||= Radio.new current_network
       end

data/lib/audio_addict/commands/config.rb

@@ -76,6 +76,7 @@ module AudioAddict
 
       def key_guide
         {
+          email: "Last email used for logging in.\nUsually set with !txtpur!radio login!txtrst!.",
           session_key: "Used for authentication.\nUsually set with !txtpur!radio login!txtrst!.",
           listen_key: "Used for generating playlists.\nUsually set with !txtpur!radio login!txtrst!.",
           network: "Specify the AudioAddict network you are currently listening to.\nUsually set with !txtpur!radio set!txtrst!.",

data/lib/audio_addict/commands/login.rb

@@ -12,7 +12,7 @@ module AudioAddict
         proceed = true
 
         if radio.api.logged_in?
-          say "!txtylw!You are already logged in"
+          say "!txtylw!You are already logged in as !undylw!#{Config.email}"
           proceed = prompt.yes? "Login again?"
         end
         
@@ -22,7 +22,7 @@ module AudioAddict
     private
 
       def login_prompt
-        user = prompt.ask "Username :"
+        user = prompt.ask "Username :", default: Config.email
         pass = prompt.mask "Password :"
         
         if user and pass

data/lib/audio_addict/commands/playlist.rb

@@ -18,6 +18,8 @@ module AudioAddict
       def init_command(args)
         needs :network, :channel, :listen_key
 
+        require_premium_account
+
         name = args['NAME']
         outfile = "#{name}.yml"
 
@@ -33,6 +35,8 @@ module AudioAddict
       def generate_command(args)
         needs :network, :channel, :listen_key
 
+        require_premium_account
+
         name = args['NAME']
 
         infile = "#{name}.yml"

data/lib/audio_addict/commands/status.rb

@@ -13,6 +13,9 @@ module AudioAddict
           path: { 
             name: "Config Path", value: Config.path },
 
+          email: { 
+            name: "Email", command: 'login' },
+
           session_key: { 
             name: "Session Key", command: 'login', secret: true },
 

data/lib/audio_addict/exceptions.rb

@@ -4,6 +4,7 @@ module AudioAddict
   class Interrupt < Error; end
   class ArgumentError < Error; end
   class ConfigError < Error; end
+  class PremiumAccount < Error; end
   
   class APIError < Error
     attr_reader :response

data/lib/audio_addict/version.rb

@@ -1,3 +1,3 @@
 module AudioAddict
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audio_addict
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Danny Ben Shitrit