lib/spotify_to_mp3/app.rb in spotify-to-mp3-0.6.1 vs lib/spotify_to_mp3/app.rb in spotify-to-mp3-0.7.0

@@ -1,39 +1,82 @@
-require 'colorize'
 require 'fileutils'
-require 'spotify_to_mp3/app/stream_track_ids'
+require 'spotify_to_mp3/app/stream_queries'
+require 'spotify_to_mp3/app/download_progress_bar'
 
 module SpotifyToMp3
   class App
-    def initialize(track_id_resolver, grooveshark)
-      @track_id_resolver = track_id_resolver
+    def initialize(query_resolver, grooveshark, logger)
+      @query_resolver = query_resolver
       @grooveshark = grooveshark
+      @logger = logger
     end
 
     def run
-      StreamTrackIds.new(ARGF).each do |track_id|
-        begin
-          puts "Resolving \"#{track_id}\""
-          track = @track_id_resolver.resolve(track_id)
+      tracks_to_download = []
 
-          puts "Searching \"#{track}\" on Grooveshark"
-          grooveshark_track = @grooveshark.get_track(track.grooveshark_query)
+      StreamQueries.new(ARGF).each do |query|
+        @logger.info "Resolving \"#{query}\""
+        tracks = @query_resolver.resolve(query)
 
-          if File.exists?(grooveshark_track.filename)
-            # To know about songs no longer in download list
-            FileUtils.touch grooveshark_track.filename
+        tracks.each do |track|
+          begin
+            @logger.info "Searching \"#{track}\" on Grooveshark"
+            grooveshark_track = @grooveshark.get_track(track.grooveshark_query)
 
-            puts "Skipping \"#{grooveshark_track}\", it already exists"
-          else
-            puts "Downloading \"#{grooveshark_track}\""
-            @grooveshark.download(grooveshark_track)
+            if File.exists?(grooveshark_track.filename)
+              # To know about songs no longer in download list
+              FileUtils.touch grooveshark_track.filename
+
+              @logger.info "Skipping \"#{grooveshark_track}\", it already exists"
+            else
+              @logger.info "\"#{grooveshark_track}\" will be downloaded"
+              tracks_to_download << grooveshark_track
+            end
+          rescue Exception => exception # For some reason without the "Exception" it is ignored
+            @logger.error "\"#{track}\" won't be downloaded - #{exception.message}"
+            # Continue with the next track
           end
-        rescue Exception => exception # For some reason without the "Exception" it is ignored
-          puts exception.message.red
-          # Continue with the next track
         end
       end
+      
+      @logger.info("\n")
+
+      download tracks_to_download
     rescue
-      puts "#{$!}".red
+      @logger.error "#{$!}"
     end
+    
+    private
+    
+    def download(tracks)
+      if tracks.empty?
+        @logger.info "Nothing to download"
+        return
+      end
+      
+      @logger.info "Downloading tracks..."
+      tracks.each_with_index do |track, i|
+        begin
+          progress_bar = nil
+          @grooveshark.download(
+            track: track,
+            on_response: Proc.new { |response|
+              progress_bar = DownloadProgressBar.new(
+                track: track,
+                track_number: i.next,
+                track_size: response['content-length'].to_i,
+                total_tracks: tracks.length
+              )                
+            },
+            on_body_chunk: Proc.new { |chunk|
+              progress_bar.progress += chunk.length
+            }
+          )
+          progress_bar.finish
+        rescue Exception => exception
+          @logger.error exception.message
+        end
+      end
+      @logger.success "Download complete"
+    end      
   end
 end