spotify-to-mp3 0.4.1 → 0.4.2

data/{README.markdown → README.md}

@@ -42,6 +42,10 @@ Make sure you have rubygems installed and configured:
 
 ## Changelog
 
+2012-01-11
+
+- Touch already downloaded songs. This way songs no more in the download list can be spotted easily.
+
 2011-10-03
 
 - Make it work on ruby 1.8.7 (Snow Leopard)
@@ -53,11 +57,7 @@ Make sure you have rubygems installed and configured:
 ## TODO
 
 - Consider multiple artists songs
-- 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
 - It seems Grooveshark API fails after hundreds of calls

data/bin/spotify-to-mp3

@@ -1,193 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'grooveshark'
-require 'open-uri'
-require 'colorize'
-require 'cgi'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-class App
-  def initialize
-    @context = {
-      :grooveshark => Grooveshark.new,
-      :spotify => Spotify.new
-    }
-  end
+require 'spotify_to_mp3'
 
-  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
-
-  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
-
-  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
-      name = "#{@raw_grooveshark_song.artist} - #{@raw_grooveshark_song.name}.mp3"
-      name.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
-    def initialize
-      @client = ::Grooveshark::Client.new
-    end
-
-    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
-    def track(uri)
-      content = open('http://ws.spotify.com/lookup/1/.json?uri=' + CGI.escape(uri))
-      json = JSON.parse(content.string)
-      Track.new(json)
-    end
-
-    class Track
-      attr_reader :name, :artist
-
-      def initialize(json)
-        @name = json['track']['name']
-        @artist = json['track']['artists'].first['name']
-      end
-    end
-  end
-end
-
-App.new.run
+SpotifyToMp3::App.new.run

data/lib/spotify_to_mp3.rb

@@ -0,0 +1,58 @@
+require 'rubygems'
+require 'grooveshark'
+require 'open-uri'
+require 'colorize'
+require 'rest-client'
+require 'fileutils'
+
+require 'spotify_to_mp3/services'
+require 'spotify_to_mp3/songs'
+require 'spotify_to_mp3/sources'
+
+module SpotifyToMp3
+
+  class App
+
+    def initialize
+      @context = {
+        :grooveshark => Grooveshark.new,
+        :spotify => Spotify.new
+      }
+    end
+
+    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 File.exists? song.filename
+              FileUtils.touch song.filename # To know about songs no longer in download list
+              puts "Already exists, skipping".green
+            else
+              begin
+                song.download
+                puts "Done".green
+              rescue Exception => exception
+                puts exception.message.red
+              end
+            end
+          rescue
+            puts "#{$!}".red
+          end
+        }
+      rescue
+        puts "#{$!}".red
+      end
+    end
+  end
+end

data/lib/spotify_to_mp3/services.rb

@@ -0,0 +1,40 @@
+require 'cgi'
+
+module SpotifyToMp3
+
+  class Grooveshark
+
+    def initialize
+      @client = ::Grooveshark::Client.new
+    end
+
+    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
+      
+    def track(uri)
+      content = open('http://ws.spotify.com/lookup/1/.json?uri=' + CGI.escape(uri))
+      json = JSON.parse(content.string)
+      Track.new(json)
+    end
+
+    class Track
+      
+      attr_reader :name, :artist
+
+      def initialize(json)
+        @name = json['track']['name']
+        @artist = json['track']['artists'].first['name']
+      end
+    end
+  end
+end

data/lib/spotify_to_mp3/songs.rb

@@ -0,0 +1,65 @@
+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 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
+
+class GroovesharkSong
+    
+  def initialize(context, query)
+    @context = context
+    @raw_grooveshark_song = @context[:grooveshark].song(query)
+  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
+
+  def filename
+    name = "#{@raw_grooveshark_song.artist} - #{@raw_grooveshark_song.name}.mp3"
+    name.tr('/', '-') # / is not allowed in file names
+  end
+
+  private
+
+  def download_url(url)
+    file = RestClient::Request.execute(:method => :post, :url => url, :raw_response => true).file
+    FileUtils.mv(file.path, filename)
+  end
+end

data/lib/spotify_to_mp3/sources.rb

@@ -0,0 +1,43 @@
+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

data/spotify-to-mp3.gemspec

@@ -2,13 +2,14 @@ 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.4.1'
+  s.version = '0.4.2'
   s.author = 'Francesc Rosàs'
   s.email = 'francescrosasbosque@gmail.com'
   s.homepage = 'https://github.com/frosas/spotify-to-mp3'
 
   s.add_dependency 'grooveshark'
   s.add_dependency 'colorize'
+  s.add_dependency 'rest-client'
 
   s.files = `git ls-files`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}

metadata

@@ -1,96 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spotify-to-mp3
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
 platform: ruby
-authors: 
-- "Francesc Ros\xC3\xA0s"
+authors:
+- Francesc Rosàs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: grooveshark
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Download MP3 files of Spotify tracks
 email: francescrosasbosque@gmail.com
-executables: 
+executables:
 - spotify-to-mp3
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - Gemfile.lock
-- README.markdown
+- README.md
 - bin/spotify-to-mp3
+- lib/spotify_to_mp3.rb
+- lib/spotify_to_mp3/services.rb
+- lib/spotify_to_mp3/songs.rb
+- lib/spotify_to_mp3/sources.rb
 - spotify-to-mp3.gemspec
 homepage: https://github.com/frosas/spotify-to-mp3
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - .
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Spotify to MP3
 test_files: []
-