groove-dl 0.2.0 → 0.3.0

data/groove-dl.gemspec

@@ -7,15 +7,15 @@ Gem::Specification.new do |s|
   s.authors = ['Pierre Rambaud']
   s.email = 'pierre.rambaud86@gmail.com'
   s.license = 'GPL-3.0'
-  s.summary = 'Download grooveshark songs.'
+  s.summary = 'Grooveshark songs downloader.'
   s.homepage = 'http://github.com/PierreRambaud/groove-dl'
-  s.description = 'Grooveshark downloader allow you to choose' \
-                  'songs and download them.'
+  s.description = 'Grooveshark downloader allow you to search, choose ' \
+                  'playlists and songs and download them.'
   s.executables = ['groove-dl', 'groove-dl-cli']
 
   s.files = File.read(File.expand_path('../MANIFEST', __FILE__)).split("\n")
 
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 1.9.3'
 
   s.add_dependency 'slop', '~>3.6'
   s.add_dependency 'grooveshark', '~>0.2.12'

data/lib/groove-dl/app.rb

@@ -1,55 +1,28 @@
 # -*- coding: utf-8 -*-
 module GrooveDl
   # Bootstraper for the application
-  class App < Gtk::Window
-    def initialize
-      Gtk::Settings.default.gtk_button_images = true
-      super
-
-      client = Grooveshark::Client.new
-      box = Gtk::Box.new(:vertical)
-
-      search_bar = Widgets::Search::Bar.new(:vertical, 6)
-      search_bar.load(client, self)
+  class App < Gtk::Builder
+    attr_accessor :signals_list
 
-      search_list = Widgets::Search::List.new(:vertical, 6)
-      search_list.load(client, self)
+    def initialize(path)
+      super()
 
-      download_bar = Widgets::Download::Bar.new(:vertical, 6)
-      download_bar.load(client, self)
-
-      download_book = Widgets::Download::Book.new
-      download_book.load(client, self)
-
-      box.pack_start(search_bar, expand: false, fill: true, padding: 10)
-      box.pack_start(search_list, expand: true, fill: true, padding: 5)
-      box.pack_start(download_bar, expand: false, fill: true, padding: 10)
-      box.pack_start(download_book, expand: true, fill: true, padding: 5)
+      Gtk::Settings.default.gtk_button_images = true
+      add_from_file(path)
 
-      add(box)
+      @signals_list = {}
+      @main_window = get_object('main_window')
+      @main_window.set_window_position(Gtk::Window::Position::CENTER)
+      @main_window.signal_connect('destroy') { Gtk.main_quit }
+      @main_window.show_all
 
-      init_default
-    end
+      client = Grooveshark::Client.new
+      search_list = Widgets::Search.new(client, self)
+      Widgets::Download.new(client, self, search_list)
 
-    def init_default
-      signal_connect('destroy') do
-        Gtk.main_quit
+      connect_signals do |handler|
+        @signals_list[handler] if @signals_list.key?(handler)
       end
-
-      set_title('Grooveshark Downloader')
-      set_default_size(1024, 768)
-      set_window_position(:center)
-      show_all
-    end
-
-    def find_by_name(element = self, name)
-      return element if element.name == name
-      element.children.each do |child|
-        result = find_by_name(child, name)
-        return result unless result.nil?
-      end if element.respond_to?(:children)
-
-      nil
     end
   end
 end

data/lib/groove-dl/cli/search.rb

@@ -16,13 +16,7 @@ GrooveDl::CLI.options.command 'search' do
     query = opts[:s] if opts[:s]
     query = opts[:p] if opts[:p]
 
-    results = client.request('getResultsFromSearch',
-                             type: type,
-                             query: query)['result']
-    results.map! do |data|
-      next Grooveshark::Song.new data if type == 'Songs'
-      data
-    end
+    results = client.search(type, query)
 
     displayer = GrooveDl::Displayer.new(results, type)
     displayer.render

data/lib/groove-dl/displayer.rb

@@ -7,8 +7,8 @@ module GrooveDl
     ##
     # Initialize Displayer
     #
-    # @params [Array] result The result from the search
-    # @params [String] type The search type
+    # @param [Array] result The result from the search
+    # @param [String] type The search type
     #
     # @return [Nil]
     #
@@ -31,22 +31,22 @@ module GrooveDl
 
     def headers
       return %w(Id Album Artist Song) if @type == 'Songs'
-      return %w(Id Nam Author NumSongs) if @type == 'Playlists'
+      return %w(Id Name Author NumSongs) if @type == 'Playlists'
     end
 
     ##
     # Add row into table
     #
-    # @params [Terminal::Table] table Table in which row will be added
-    # @params [Array] result The result from the search
+    # @param [Terminal::Table] table Table in which row will be added
+    # @param [Array] result The result from the search
     #
     # @return [Nil]
     #
     def add_row(table, data)
-      table.add_row([data['playlist_id'],
-                     data['name'],
-                     data['f_name'],
-                     data['num_songs']]) if @type == 'Playlists'
+      table.add_row([data.id,
+                     data.name,
+                     data.username,
+                     data.num_songs]) if @type == 'Playlists'
       table.add_row([data.id,
                      data.album,
                      data.artist,

data/lib/groove-dl/downloader.rb

@@ -25,7 +25,7 @@ module GrooveDl
     ##
     # Download song
     #
-    # @params [String] song_id Song id
+    # @param [String] song_id Song id
     #
     # @return [Array]
     #
@@ -39,7 +39,7 @@ module GrooveDl
     ##
     # Download playlist
     #
-    # @params [String] playlist_id Playlist id
+    # @param [String] playlist_id Playlist id
     #
     # @return [Array]
     #
@@ -96,11 +96,11 @@ module GrooveDl
     # @param [Grooveshark::Song] song Song
     #
     def build_path(output_directory, song)
-      sprintf('%s/%s/%s/%s.mp3',
-              output_directory,
-              song.artist,
-              song.album,
-              song.name)
+      format('%s/%s/%s/%s.mp3',
+             output_directory,
+             song.artist,
+             song.album,
+             song.name)
     end
 
     ##
@@ -146,11 +146,11 @@ module GrooveDl
     #
     def process_gui_response(object)
       proc do |response|
-        pgbar_value = Widgets::Download::List::Queue::COLUMN_PGBAR_VALUE
-        pgbar_text = Widgets::Download::List::Queue::COLUMN_PGBAR_TEXT
+        pgbar_value = Widgets::Download::QUEUE_COLUMN_PGBAR_VALUE
+        pgbar_text = Widgets::Download::QUEUE_COLUMN_PGBAR_TEXT
 
         total_size = response['content-length'].to_i
-        path = object[Widgets::Download::List::Queue::COLUMN_PATH]
+        path = object[Widgets::Download::QUEUE_COLUMN_PATH]
         if File.exist?(path) &&
            File.size?(path) == total_size
           object[pgbar_value] = 100

data/lib/groove-dl/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # GrooveDl version
 module GrooveDl
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/groove-dl/widgets/download.rb

@@ -0,0 +1,231 @@
+# -*- coding: utf-8 -*-
+module GrooveDl
+  # Widgets components
+  module Widgets
+    # Download bar section
+    class Download < Events
+      attr_accessor :search_list, :songs, :downloader
+      attr_accessor :failed, :success, :queue
+
+      RIGHT_CLICK = 3
+
+      SUCCESS_COLUMN_PATH,
+      SUCCESS_COLUMN_SIZE = *(0..1).to_a
+
+      FAILED_COLUMN_PATH,
+      FAILED_COLUMN_REASON = *(0..1).to_a
+
+      QUEUE_COLUMN_PATH,
+      QUEUE_COLUMN_PGBAR_VALUE,
+      QUEUE_COLUMN_PGBAR_TEXT = *(0..2).to_a
+
+      ##
+      # Initialize download list and download button
+      #
+      # @param [Grooveshark::Client] client Grooveshark client
+      # @param [Gtk::Builder] app Application created by Gtk builder
+      # @param [Search] search_list Search class for getting list
+      #
+      # @return [Download]
+      #
+      def initialize(client, app, search_list)
+        super(client, app)
+        @songs = {}
+        @queue = 0
+        @success = 0
+        @failed = 0
+        @search_list = search_list
+        @downloader = GrooveDl::Downloader.new(@client)
+        @downloader.type = 'gui'
+        @app.get_object('directory_chooser').filename = Dir.tmpdir
+      end
+
+      ##
+      # Event when button download is clicked
+      #
+      def on_btn_download_clicked
+        return if @queue.zero?
+        @app.get_object('btn_clear_queue').sensitive = false
+        @app.get_object('btn_add_to_queue').sensitive = false
+
+        download_songs
+      end
+
+      ##
+      # Event when button clear queue is clicked
+      #
+      def on_btn_clear_queue_clicked
+        @app.get_object('download_queue_list_store').clear
+      end
+
+      ##
+      # Event when button add to queue is clicked
+      #
+      def on_btn_add_to_queue_clicked
+        selected = {}
+        column_id = GrooveDl::Widgets::Search::COLUMN_ID
+        column_checkbox = GrooveDl::Widgets::Search::COLUMN_CHECKBOX
+        search_list_store = @app.get_object('search_list_store')
+        search_list_store.each do |_model, _path, iter|
+          next unless iter[column_checkbox]
+          selected[iter[column_id]] = @search_list.data[iter[column_id]]
+        end
+
+        @queue_store = @app.get_object('download_queue_list_store')
+        @failed_store = @app.get_object('download_failed_list_store')
+        @success_store = @app.get_object('download_success_list_store')
+        create_queue_item(selected)
+
+        @queue = @songs.count
+        @app.get_object('download_label_queue')
+          .set_text(format('Queue (%d)', @queue))
+      end
+
+      ##
+      # Append row in queue list store
+      #
+      # @param [Hash] data Data parsed
+      #
+      def create_queue_item(data)
+        data.each do |id, element|
+          if element.is_a?(Grooveshark::Song)
+            iter = @queue_store.append
+            iter[QUEUE_COLUMN_PATH] =
+              @downloader.build_path(@app.get_object('directory_chooser')
+                                       .filename,
+                                     element)
+            iter[QUEUE_COLUMN_PGBAR_VALUE] = 0
+            iter[QUEUE_COLUMN_PGBAR_TEXT] = nil
+            @songs[element.id] = { iter: iter, song: element }
+          else
+            playlist = Grooveshark::Playlist.new(@client,
+                                                 'playlist_id' => id)
+            result = {}
+            playlist.load_songs.each do |song|
+              result[song.id] = song
+            end
+
+            create_queue_item(result)
+          end
+        end
+
+        return if @songs.empty?
+      end
+
+      ##
+      # Append row in failed list store
+      #
+      # @param [Gtk::TreeIter] i Iterable element
+      # @param [String] reason Why this download have failed
+      #
+      def create_failed_item(i, reason)
+        iter = @failed_store.append
+        path = i[FAILED_COLUMN_PATH]
+        iter[FAILED_COLUMN_PATH] = path
+        iter[FAILED_COLUMN_REASON] = reason
+      end
+
+      ##
+      # Append row in the success list store
+      #
+      # @param [Gtk::TreeIter] i Iterable element
+      #
+      def create_success_item(i)
+        iter = @success_store.append
+        path = i[SUCCESS_COLUMN_PATH]
+        iter[SUCCESS_COLUMN_PATH] = path
+        size = (File.size?(path).to_f / (1024 * 1024)).round(2)
+        iter[SUCCESS_COLUMN_SIZE] = "#{size} MB"
+      end
+
+      ##
+      # Download songs in queue
+      #
+      def download_songs
+        concurrency = @app.get_object('concurrency_entry').text.to_i
+        concurrency = 5 if concurrency.zero?
+        Thread.abort_on_exception = true
+        Thread.new do
+          nb = 0
+          @songs.each do |_id, s|
+            nb += 1
+            Thread.new do
+              download_file(s)
+              nb -= 1
+            end
+            sleep(0.5) until nb < concurrency
+          end
+        end
+      end
+
+      ##
+      # Download song
+      #
+      # @param [Grooveshark::Song] song Song to download
+      #
+      def download_file(song)
+        begin
+          @downloader.download(song[:song], song[:iter])
+          notify_success(song)
+        rescue Errors::AlreadyDownloaded => e
+          GrooveDl.configuration.logger.info(e.message)
+          notify_success(song)
+        rescue Grooveshark::GeneralError => e
+          GrooveDl.configuration.logger.error(e)
+          notify_error(song, e)
+        end
+        @app.get_object('download_label_queue')
+          .set_text(format('Queue (%d)', @queue -= 1))
+        @queue_store.remove(song[:iter])
+      end
+
+      ##
+      # Notify success
+      #
+      # @param [Grooveshark::Song] song Song displayed in success page
+      #
+      def notify_success(song)
+        create_success_item(song[:iter])
+        @app.get_object('download_label_success')
+          .set_text(format('Success (%d)', @success += 1))
+      end
+
+      ##
+      # Notify erro
+      #
+      # @param [Grooveshark::Song] song Song displayed in failed page
+      # @param [StandardError] e Exception to retrieve message
+      #
+      def notify_error(song, e)
+        create_failed_item(song[:iter], e.message)
+        @app.get_object('download_label_failed')
+          .set_text(format('Failed (%d)', @failed += 1))
+      end
+
+      ##
+      # Open downloaded song
+      #
+      def on_menu_open_activate
+        treeview = @app.get_object('download_success')
+        iter = treeview.selection.selected
+        Thread.new do
+          path = iter[Download::QUEUE_COLUMN_PATH]
+          system("xdg-open #{Shellwords.escape(path)}")
+        end
+      end
+
+      ##
+      # Open menu on right click
+      #
+      def on_download_success_button_press_event(widget, event)
+        return unless event.is_a?(Gdk::EventButton) &&
+                      event.button == RIGHT_CLICK
+
+        path, _model = widget.get_path_at_pos(event.x, event.y)
+        widget.selection.select_path(path)
+        @app.get_object('success_menu')
+          .popup(nil, nil, event.button, event.time)
+      end
+    end
+  end
+end

data/lib/groove-dl/widgets/events.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+module GrooveDl
+  # Widgets components
+  module Widgets
+    # Search section
+    class Events
+      attr_reader :client, :app
+
+      ##
+      # Initialize events for signals
+      #
+      def initialize(client, app)
+        @client = client
+        @app = app
+
+        methods.each do |name|
+          next unless name.match(/^on_/)
+          @app.signals_list[name.to_s] = method(name)
+        end
+      end
+    end
+  end
+end