Merge pull request #2 from orlando/master

[rbdr/lyricli.rb] / lib / lyricli / sources / rdio.rb

diff --git a/lib/lyricli/sources/rdio.rb b/lib/lyricli/sources/rdio.rb
index afb736d606069e9812092031c442fa86a39754a2..0be89f390a7b04ec8b224ef7eea44bb01f9bbae3 100644 (file)
--- a/lib/lyricli/sources/rdio.rb
+++ b/lib/lyricli/sources/rdio.rb
@@ -1,65 +1,73 @@
 module Lyricli
   module Sources
 module Lyricli
   module Sources

-    module Rdio

 
 

-      # Returns the name of the source, in snake_case
-      def self.name
-        "rdio"
+    # This is the Source for rdio
+    class Rdio
+
+      class << self
+        attr_accessor :name

       end
 
       end
 

+      @name = "rdio"
+

       # The enable method should run all of the tasks needed to validate
       # the source. In the case of Rdio it has to authenticate with OAuth.
       def self.enable
         # Validation Code
       # The enable method should run all of the tasks needed to validate
       # the source. In the case of Rdio it has to authenticate with OAuth.
       def self.enable
         # Validation Code

-        @config = Lyricli::Config
-        unless @config[:rdio_auth_token] && !@config[:rdio_auth_token].empty?
+        @config = Configuration.instance
+        unless @config["rdio_auth_token"] && !@config["rdio_auth_token"].empty?

           create_auth_token
         end
 
           create_auth_token
         end
 

+        puts "***"
+        puts "Hello, rdio tends to be a bit aggressive and tends to have trouble with other sources. If you're having trouble, you can disable it temporarily. You will not have to reauthenticate."
+        puts "***"
+

       end
 
       # Instantiates everything it needs to run.
       end
 
       # Instantiates everything it needs to run.

-      def self.start
-        @rdio = Rdio::SimpleRdio.new([@config[:rdio_key], @config[:rdio_secret]], @config[:rdio_auth_token])
+      def initialize
+        @name = 'rdio'
+        @config = Configuration.instance
+        @rdio = ::Rdio::SimpleRdio.new([@config["rdio_key"], @config["rdio_secret"]], @config["rdio_auth_token"])

       end
 
       # The current_track method should return the name of the current
       # artist and song.
       end
 
       # The current_track method should return the name of the current
       # artist and song.

+      #

       # @return [Hash] A hash containing the current `:song` and `:artist`.
       # @return [Hash] A hash containing the current `:song` and `:artist`.

-      def self.current_track
-        u = @rdio.call('currentUser', {'extras' => 'lastSongPlayed'})
-        artist = u["result"]["lastSongPlayed"]["artist"]
-        song = u["result"]["lastSongPlayed"]["name"]
-        {artist: artist, song: song}
+      def current_track
+        response = @rdio.call('currentUser', {'extras' => 'lastSongPlayed'})
+        artist = response["result"]["lastSongPlayed"]["artist"]
+        song = response["result"]["lastSongPlayed"]["name"]
+        {:artist => artist, :song => song}

       end
 
       # The reset method resets any configurations it may have
       def self.reset
       end
 
       # The reset method resets any configurations it may have
       def self.reset

-        # Reset Code
+        @config = Configuration.instance
+        @config.delete("rdio_auth_token")

       end
 
       end
 

-      private
-

       # Signs in to rdio with our credentials and requests access for a new auth
       # token.
       # Signs in to rdio with our credentials and requests access for a new auth
       # token.

-      def create_auth_token
-        rdio = Rdio::SimpleRdio.new([@config])
+      def self.create_auth_token
+        rdio = ::Rdio::SimpleRdio.new([@config["rdio_key"], @config["rdio_secret"]], @config["rdio_auth_token"])

 
         # Request Authorization
         puts "Follow this URL to authorize lyricli:"
         auth_url = rdio.begin_authentication('oob')
         puts auth_url
 
         # Request Authorization
         puts "Follow this URL to authorize lyricli:"
         auth_url = rdio.begin_authentication('oob')
         puts auth_url

-        Launchy.open(auth_url)
+        ::Launchy.open(auth_url)

 
         # Request Code, Obtain Token
         print "Please type the authorization code: "
         auth_code = gets.chomp
         token = rdio.complete_authentication(auth_code)
 
 
         # Request Code, Obtain Token
         print "Please type the authorization code: "
         auth_code = gets.chomp
         token = rdio.complete_authentication(auth_code)
 

-        @config[:rdio_auth_token] = token
+        @config["rdio_auth_token"] = token

         token
       end
         token
       end

-

     end
   end
 end
     end
   end
 end