spotify-to-mp3 0.3.1 → 0.4

data/README.markdown

@@ -4,25 +4,53 @@ A simple command line utility to download MP3 files of Spotify tracks
 
 ## Installation
 
+### Mac OS X (Lion)
+
     $ gem install spotify-to-mp3
 
+### Linux (Ubuntu 11.04)
+
+Make sure you have rubygems installed and configured:
+
+    $ sudo apt-get install rubygems1.8
+    $ echo 'PATH=$PATH:/var/lib/gems/1.8/bin' | sudo tee /etc/profile.d/rubygems1.8.sh >/dev/null
+
+<span></span>
+
+    $ sudo gem install spotify-to-mp3
+
+### Windows (not tested)
+
+[Install Ruby](http://rubyinstaller.org/)
+
+    > gem install spotify-to-mp3
+
 ## Usage
 
-1. Drag Spotify songs to a file (eg, songs.txt). It will look like this:
+1. Drag Spotify songs to a file (eg, songs.txt). Plain song names are also 
+   accepted. It may look like this:
 
         http://open.spotify.com/track/1JqTcOjOn7gEpeC0JcRVPa
-        http://open.spotify.com/track/4pQIl2gJyRDKiwIhEOc1gW
-        http://open.spotify.com/track/2rREB1sRvcb5i6AZRhOhey
-        http://open.spotify.com/track/6UOvd5f3oyfIGW3GA8dn89
+        spotify:track:1fE3ddAlmjJ99IIfLgZjTy
+        The Drums - Money
 
 2. Download songs. Errors will appear in red (eg, when a song is not found)
 
         $ spotify-to-mp3 songs.txt
 
+## Changelog
+
+2011-09-26
+
+- Both Spotify URLs and plain song names are accepted
+
 ## TODO
 
 - Consider multiple artists songs
-- Show download progress
 - Estimated download time
   - Per song
   - Total
+- Distinguish internal errors from user errors
+- Filter Grooveshark results by artist, title and length
+- Split code in multiple files
+- --sync option to add/remove \*.mp3 files to match songs file

data/bin/spotify-to-mp3

@@ -6,39 +6,154 @@ require 'open-uri'
 require 'colorize'
 require 'cgi'
 
-class SpotifyToMp3
-  def initialize(log)
-    @grooveshark = Grooveshark.new
-    @spotify = Spotify.new
-    @log = log
+class App
+  def initialize
+    @context = {
+      :grooveshark => Grooveshark.new,
+      :spotify => Spotify.new
+    }
   end
 
-  def download_song(spotify_uri)
-    log("Getting song info for #{spotify_uri} from Spotify")
-    track = @spotify.track(spotify_uri)
-    filename = File.basename("#{track.artist()} - #{track.name()}.mp3".tr('/', '-'))
-    if (File.exists?(filename))
-      log("File #{filename} already exists, skipping")
-      return
-    end
-    log("Getting download URL for \"#{track.artist()} - #{track.name()}\" from Grooveshark")
-    url = @grooveshark.song_url(track.artist(), track.name())
-    log("Downloading song")
-    download_url(url, filename)
-    log("Song downloaded to #{filename}")
+  def run
+    begin
+      file = ARGV.first
+      raise "No songs file specified. Usage: #{$0} file" if file.nil?
+      
+      File.open(file).each_line{|song_id|
+        song_id.strip!
+        next if song_id.empty?
+        begin
+          song = UnresolvedSong.new(@context, song_id)
+          print "Resolving \"#{song}\" "
+          song = song.resolve
+          print "-> Searching \"#{song}\" on Grooveshark "
+          song = song.from_grooveshark
+          print "-> Downloading \"#{song}\" "
+          if song.downloaded
+            puts "Already exists, skipping".green
+          else
+            song.download
+            puts "Done".green
+          end
+        rescue
+          puts "#{$!}".red
+        end
+      }
+    rescue
+      puts "#{$!}".red
+    end
   end
 
   private
 
-  def log(message)
-    @log.call(message)
+  class UnresolvedSong
+    def initialize(context, id)
+      @context = context
+      @id = id
+    end
+
+    def resolve
+      if @id.start_with?('http://open.spotify.com/track/', 'spotify:track:')
+        track = @context[:spotify].track(@id)
+        source = SpotifySource.new(@context, track)
+      else
+        source = PlainSource.new(@context, @id)
+      end
+      ResolvedSong.new(@context, source)
+    end
+
+    def to_s
+      @id
+    end
+  end
+
+  class Source
+    def grooveshark_query
+      raise "Not implemented"
+    end
+
+    def to_s
+      raise "Not implemented"
+    end
+  end
+
+  class SpotifySource < Source
+    def initialize(context, track)
+      @context = context
+      @track = track
+    end
+
+    def grooveshark_query
+      "artist:\"#{@track.artist}\" title:\"#{@track.name}\""
+    end
+
+    def to_s
+      "#{@track.artist} - #{@track.name}"
+    end
+  end
+
+  class PlainSource < Source
+    attr_reader :grooveshark_query, :to_s
+
+    def initialize(context, id)
+      parts = id.split(' - ', 2)
+      if parts.length < 2
+        @grooveshark_query = id
+        @to_s = id
+      else
+        artist, name = parts
+        @grooveshark_query = "artist:\"#{artist}\" title:\"#{name}\""
+        @to_s = "#{artist} - #{name}"
+      end
+    end
+  end
+
+  class ResolvedSong
+    def initialize(context, source)
+      @context = context
+      @source = source
+    end
+
+    def from_grooveshark
+      GroovesharkSong.new(@context, @source.grooveshark_query)
+    end
+
+    def to_s
+      "#{@source}"
+    end
   end
 
-  def download_url(url, path)
-    content = open(url).read
-    file = open(path, 'wb')
-    file.write(content)
-    file.close
+  class GroovesharkSong
+    def initialize(context, query)
+      @context = context
+      @raw_grooveshark_song = @context[:grooveshark].song(query)
+    end
+
+    def downloaded
+      File.exists?(filename)
+    end
+
+    def download
+      download_url(@context[:grooveshark].song_url(@raw_grooveshark_song))
+    end
+
+    def to_s
+      "#{@raw_grooveshark_song.artist} - #{@raw_grooveshark_song.name}"
+    end
+
+    private
+
+    def filename
+      "#{@raw_grooveshark_song.artist} - #{@raw_grooveshark_song.name}.mp3"
+        .tr('/', '-') # / is not allowed in file names
+    end
+
+    def download_url(url)
+      content = open(url).read
+      file = open(filename, 'wb')
+      file.write(content)
+      file.close
+    end
   end
 
   class Grooveshark
@@ -46,11 +161,15 @@ class SpotifyToMp3
       @client = ::Grooveshark::Client.new
     end
 
-    def song_url(artist, title)
-      song = @client.search_songs("artist:\"#{artist}\" title:\"#{title}\"").first
-      raise "Song not found" if song.nil?
+    def song_url(song)
       @client.get_song_url(song)
     end
+
+    def song(query)
+      song = @client.search_songs(query).first
+      raise "Song not found" if song.nil?
+      song
+    end
   end
 
   class Spotify
@@ -61,36 +180,14 @@ class SpotifyToMp3
     end
 
     class Track
-      def initialize(json)
-        @json = json
-      end
+      attr_reader :name, :artist
 
-      def name
-        @json['track']['name']
-      end
-
-      def artist
-        @json['track']['artists'].first['name']
+      def initialize(json)
+        @name = json['track']['name']
+        @artist = json['track']['artists'].first['name']
       end
     end
   end
 end
 
-begin
-  spotifyToMp3 = SpotifyToMp3.new(lambda { |message| puts message })
-  
-  file = ARGV.first
-  raise "No songs file specified. Usage: #{$0} file" if file.nil?
-  
-  File.open(file).each_line{|spotify_uri|
-    spotify_uri.strip!
-    next if spotify_uri.empty?
-    begin
-      spotifyToMp3.download_song(spotify_uri)
-    rescue
-      puts "ERROR: #{$!}".red
-    end
-  }
-rescue
-  puts "ERROR: #{$!}".red
-end
+App.new.run

data/spotify-to-mp3.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name = 'spotify-to-mp3'
   s.summary = 'Spotify to MP3'
   s.description = 'Download MP3 files of Spotify tracks'
-  s.version = '0.3.1'
+  s.version = '0.4'
   s.author = 'Francesc Rosàs'
   s.email = 'francescrosasbosque@gmail.com'
   s.homepage = 'https://github.com/frosas/spotify-to-mp3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotify-to-mp3
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
+date: 2011-10-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grooveshark
-  requirement: &70186426570380 !ruby/object:Gem::Requirement
+  requirement: &70201790964320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186426570380
+  version_requirements: *70201790964320
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70186426569600 !ruby/object:Gem::Requirement
+  requirement: &70201790963620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186426569600
+  version_requirements: *70201790963620
 description: Download MP3 files of Spotify tracks
 email: francescrosasbosque@gmail.com
 executables: