groove-dl 0.2.0 → 0.3.0

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

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+module GrooveDl
+  # Widgets components
+  module Widgets
+    # Search section
+    class Search < Events
+      attr_accessor :data, :store
+
+      TYPE_PLAYLISTS,
+      TYPE_SONGS,
+      TYPE_PLAYLIST_ID = *(0..2).to_a
+
+      COLUMN_CHECKBOX,
+      COLUMN_ID,
+      COLUMN_NAME,
+      COLUMN_AUTHOR,
+      COLUMN_SONG = *(0..4).to_a
+
+      def on_search_entry_activate
+        @app.get_object('search_button').signal_emit('clicked')
+      end
+
+      def on_search_button_clicked
+        type = @app.get_object('search_type').active_id.to_i
+        query = @app.get_object('search_entry').text
+        return if query.empty?
+
+        case type
+        when TYPE_PLAYLISTS
+          results = @client.search('Playlists', query)
+        when TYPE_SONGS
+          results = @client.search('Songs', query)
+        when TYPE_PLAYLIST_ID
+          playlist = Grooveshark::Playlist.new(@client, 'playlist_id' => query)
+          results = playlist.load_songs
+        end
+
+        @data = {}
+        @store = @app.get_object('search_list_store')
+        @store.clear
+        results.each do |element|
+          iter = @store.append
+          iter[COLUMN_CHECKBOX] = false
+          if element.is_a?(Grooveshark::Song)
+            @data[element.id.to_i] = element
+            iter[COLUMN_ID] = element.id.to_i
+            iter[COLUMN_NAME] = element.name
+            iter[COLUMN_AUTHOR] = element.artist
+            iter[COLUMN_SONG] = element.album
+          else
+            @data[element.id.to_i] = element
+            iter[COLUMN_ID] = element.id.to_i.to_i
+            iter[COLUMN_NAME] = element.name
+            iter[COLUMN_AUTHOR] = element.username
+            iter[COLUMN_SONG] = element.num_songs.to_s
+          end
+        end
+      end
+
+      def on_search_list_toggle_toggled(_cell, path_str)
+        path = Gtk::TreePath.new(path_str)
+        iter = @store.get_iter(path)
+        fixed = iter[COLUMN_CHECKBOX]
+        fixed ^= 1
+        iter[COLUMN_CHECKBOX] = fixed
+      end
+
+      def on_search_list_selected_clicked
+        @store.each do |_model, _path, iter|
+          fixed = iter[COLUMN_CHECKBOX]
+          fixed ^= 1
+          iter[COLUMN_CHECKBOX] = fixed
+        end
+      end
+    end
+  end
+end

data/spec/groove-dl/displayer_spec.rb

@@ -42,16 +42,17 @@ module GrooveDl
     end
 
     it 'should render songs' do
-      playlist = { 'playlist_id' => 1,
-                   'name' => 'Someting',
-                   'f_name' => 'GoT',
-                   'num_songs' => 1 }
+      playlist = Grooveshark::Playlist.new(double,
+                                           'playlist_id' => 1,
+                                           'name' => 'Someting',
+                                           'f_name' => 'GoT',
+                                           'num_songs' => 1)
       displayer = Displayer.new([playlist], 'Playlists')
 
       str = '+----+----------+--------+----------+
 |             Playlists             |
 +----+----------+--------+----------+
-| Id | Nam      | Author | NumSongs |
+| Id | Name     | Author | NumSongs |
 +----+----------+--------+----------+
 | 1  | Someting | GoT    | 1        |
 +----+----------+--------+----------+'

data/spec/groove-dl/downloader_spec.rb

@@ -104,9 +104,9 @@ module GrooveDl
 
     it 'should process response in gui mode' do
       Dir.mkdir('/tmp')
-      stub_const('Widgets::Download::List::Queue::COLUMN_PATH', 0)
-      stub_const('Widgets::Download::List::Queue::COLUMN_PGBAR_VALUE', 1)
-      stub_const('Widgets::Download::List::Queue::COLUMN_PGBAR_TEXT', 2)
+      stub_const('Widgets::Download::QUEUE_COLUMN_PATH', 0)
+      stub_const('Widgets::Download::QUEUE_COLUMN_PGBAR_VALUE', 1)
+      stub_const('Widgets::Download::QUEUE_COLUMN_PGBAR_TEXT', 2)
       iter = []
       iter[0] = '/tmp/got-test.mp3'
       response = double
@@ -128,9 +128,9 @@ module GrooveDl
 
     it 'should process response in gui mode and does not download twice' do
       Dir.mkdir('/tmp')
-      stub_const('Widgets::Download::List::Queue::COLUMN_PATH', 0)
-      stub_const('Widgets::Download::List::Queue::COLUMN_PGBAR_VALUE', 1)
-      stub_const('Widgets::Download::List::Queue::COLUMN_PGBAR_TEXT', 2)
+      stub_const('Widgets::Download::QUEUE_COLUMN_PATH', 0)
+      stub_const('Widgets::Download::QUEUE_COLUMN_PGBAR_VALUE', 1)
+      stub_const('Widgets::Download::QUEUE_COLUMN_PGBAR_TEXT', 2)
       iter = []
       iter[0] = '/tmp/got-test.mp3'
       response = double
@@ -159,9 +159,9 @@ module GrooveDl
     it 'should download in gui mode' do
       @downloader.type = 'gui'
       Dir.mkdir('/tmp')
-      stub_const('Widgets::Download::List::Queue::COLUMN_PATH', 0)
-      stub_const('Widgets::Download::List::Queue::COLUMN_PGBAR_VALUE', 1)
-      stub_const('Widgets::Download::List::Queue::COLUMN_PGBAR_TEXT', 2)
+      stub_const('Widgets::Download::QUEUE_COLUMN_PATH', 0)
+      stub_const('Widgets::Download::QUEUE_COLUMN_PGBAR_VALUE', 1)
+      stub_const('Widgets::Download::QUEUE_COLUMN_PGBAR_TEXT', 2)
       iter = []
       iter[0] = '/tmp/got-test.mp3'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groove-dl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -164,7 +164,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.25'
-description: Grooveshark downloader allow you to choosesongs and download them.
+description: Grooveshark downloader allow you to search, choose playlists and songs
+  and download them.
 email: pierre.rambaud86@gmail.com
 executables:
 - groove-dl
@@ -182,6 +183,7 @@ files:
 - Rakefile
 - bin/groove-dl
 - bin/groove-dl-cli
+- glade/groove-dl.glade
 - groove-dl.gemspec
 - lib/groove-dl.rb
 - lib/groove-dl/app.rb
@@ -192,14 +194,9 @@ files:
 - lib/groove-dl/downloader.rb
 - lib/groove-dl/errors.rb
 - lib/groove-dl/version.rb
-- lib/groove-dl/widgets/download/bar.rb
-- lib/groove-dl/widgets/download/book.rb
-- lib/groove-dl/widgets/download/list/failed.rb
-- lib/groove-dl/widgets/download/list/queue.rb
-- lib/groove-dl/widgets/download/list/success.rb
-- lib/groove-dl/widgets/menu/success.rb
-- lib/groove-dl/widgets/search/bar.rb
-- lib/groove-dl/widgets/search/list.rb
+- lib/groove-dl/widgets/download.rb
+- lib/groove-dl/widgets/events.rb
+- lib/groove-dl/widgets/search.rb
 - spec/groove-dl/cli_spec.rb
 - spec/groove-dl/displayer_spec.rb
 - spec/groove-dl/downloader_spec.rb
@@ -219,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -230,6 +227,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Download grooveshark songs.
+summary: Grooveshark songs downloader.
 test_files: []
-has_rdoc: 

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

@@ -1,96 +0,0 @@
-# -*- coding: utf-8 -*-
-module GrooveDl
-  # Widgets components
-  module Widgets
-    # Download section
-    module Download
-      # Download bar
-      class Bar < Gtk::Box
-        attr_reader :type, :query
-
-        ##
-        # Initialize widgets
-        #
-        # @param [Grooveshark::Client] client Grooveshark client
-        # @param [Gtk::Window] window Gtk app
-        #
-        def load(_client, window)
-          set_name('download_bar')
-
-          download_box = Gtk::Box.new(:horizontal, 6)
-
-          add_button = Gtk::Button.new(stock_id: Gtk::Stock::ADD)
-
-          add_button.signal_connect('released') do
-            l = window.find_by_name('download_list')
-            l.store.clear
-            search_list = window.find_by_name('search_list')
-            selected = {}
-            column_id = GrooveDl::Widgets::Search::List::COLUMN_ID
-            column_checkbox = GrooveDl::Widgets::Search::List::COLUMN_CHECKBOX
-            search_list.store.each do |_model, _path, iter|
-              next unless iter[column_checkbox]
-              selected[iter[column_id]] = search_list.data[iter[column_id]]
-            end
-
-            l.create_model(selected)
-          end
-
-          download_box.pack_start(add_button,
-                                  expand: false,
-                                  fill: true,
-                                  padding: 5)
-
-          directory_chooser =
-            Gtk::FileChooserButton.new('Select directory',
-                                       Gtk::FileChooser::Action::SELECT_FOLDER)
-          directory_chooser.filename = Dir.tmpdir
-          directory_chooser.set_name('directory_chooser')
-          download_box.pack_start(directory_chooser,
-                                  expand: true,
-                                  fill: true,
-                                  padding: 5)
-
-          concurrency_entry = Gtk::Entry.new
-          concurrency_entry.set_name('concurrency_entry')
-          concurrency_entry.text = '5'
-
-          concurrency_label = Gtk::Label.new('Concurrency', true)
-          concurrency_label.mnemonic_widget = concurrency_entry
-
-          download_box.pack_start(concurrency_label,
-                                  expand: false,
-                                  fill: false,
-                                  padding: 5)
-          download_box.pack_start(concurrency_entry,
-                                  expand: false,
-                                  fill: false,
-                                  padding: 5)
-
-          concurrency_entry.signal_connect('changed') do
-            value = concurrency_entry.text.to_i
-            concurrency_entry.text = value.to_s unless value == 0
-          end
-
-          download_button = Gtk::Button.new(stock_id: Gtk::Stock::SAVE)
-
-          download_button.signal_connect('released') do
-            download_list = window.find_by_name('download_list')
-            next if download_list.queue.zero?
-            download_button.sensitive = false
-            download_list.download
-          end
-
-          download_box.pack_start(download_button,
-                                  expand: false,
-                                  fill: true,
-                                  padding: 5)
-
-          pack_start(download_box,
-                     expand: false,
-                     padding: 10)
-        end
-      end
-    end
-  end
-end

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

@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-module GrooveDl
-  # Widgets components
-  module Widgets
-    # Download section
-    module Download
-      # Download book
-      class Book < Gtk::Notebook
-        attr_reader :window
-
-        QUEUE = 'Queue (%d)'
-        SUCCESS = 'Success (%d)'
-        FAILED = 'Failed (%d)'
-
-        ##
-        # Initialize widgets
-        #
-        # @param [Grooveshark::Client] client Grooveshark client
-        # @param [Gtk::Window] window Gtk app
-        #
-        def load(client, window)
-          @window = window
-          set_name('download_book')
-          set_tab_pos(Gtk::PositionType::TOP)
-
-          # Download list
-          download_list = Widgets::Download::List::Queue.new(:vertical, 6)
-          download_list.set_name('download_list')
-          download_list.load(client, window)
-
-          @download_label = Gtk::Label.new(QUEUE % 0)
-          @download_label.set_name('download_label')
-          append_page(download_list, @download_label)
-
-          # Success menu
-          menu_success = Widgets::Menu::Success.new
-          menu_success.load(client, window)
-
-          # Success list
-          download_success_list =
-            Widgets::Download::List::Success.new(:vertical, 6)
-          download_success_list.set_name('download_success_list')
-          download_success_list.load(client, window, menu_success)
-
-          @download_success_label = Gtk::Label.new(SUCCESS % 0)
-          @download_success_label.set_name('download_success_label')
-          append_page(download_success_list, @download_success_label)
-
-          # Failed list
-          download_failed_list =
-            Widgets::Download::List::Failed.new(:vertical, 6)
-          download_failed_list.set_name('download_failed_list')
-          download_failed_list.load(client, window)
-
-          @download_failed_label = Gtk::Label.new(FAILED % 0)
-          @download_failed_label.set_name('download_failed_label')
-          append_page(download_failed_list, @download_failed_label)
-        end
-
-        ##
-        # Set label for page in notebook element
-        #
-        # @param [String] type Page type
-        # @param [Integer] nb Number of element in this page
-        #
-        def set_label(type, nb)
-          element = @download_label if type == 'QUEUE'
-          element = @download_success_label if type == 'SUCCESS'
-          element = @download_failed_label if type == 'FAILED'
-
-          return if element.nil?
-          element.set_text(Book.const_get(type.upcase) % nb)
-        end
-      end
-    end
-  end
-end

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

@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-module GrooveDl
-  # Widgets components
-  module Widgets
-    # Download section
-    module Download
-      # List page
-      module List
-        # Failed tree
-        class Failed < Gtk::Box
-          attr_reader :store, :data
-
-          COLUMN_PATH,
-          COLUMN_REASON = *(0..1).to_a
-
-          ##
-          # Initialize widgets
-          #
-          # @param [Grooveshark::Client] client Grooveshark client
-          # @param [Gtk::Window] window Gtk app
-          #
-          def load(_client, _window)
-            @data = {}
-            sw = Gtk::ScrolledWindow.new
-            sw.shadow_type = Gtk::ShadowType::ETCHED_IN
-            sw.set_policy(Gtk::PolicyType::AUTOMATIC,
-                          Gtk::PolicyType::AUTOMATIC)
-            pack_start(sw, expand: true, fill: true, padding: 0)
-
-            @store = Gtk::ListStore.new(String, String)
-            treeview = Gtk::TreeView.new(@store)
-            treeview.rules_hint = true
-
-            sw.add(treeview)
-
-            add_columns(treeview)
-          end
-
-          ##
-          # Append row in list store
-          #
-          # @param [Gtk::TreeIter] i Iterable element
-          # @param [String] reason Why this download have failed
-          #
-          def create_model(i, reason)
-            iter = @store.append
-            path = i[COLUMN_PATH]
-            iter[COLUMN_PATH] = path
-            iter[COLUMN_REASON] = reason
-          end
-
-          ##
-          # Add columns on the treeview element
-          #
-          # @param [Gtk::Treeview] treeview Treeview
-          #
-          def add_columns(treeview)
-            renderer = Gtk::CellRendererText.new
-            column = Gtk::TreeViewColumn.new('Path',
-                                             renderer,
-                                             'text' => COLUMN_PATH)
-            column.fixed_width = 650
-            treeview.append_column(column)
-
-            renderer = Gtk::CellRendererText.new
-            column = Gtk::TreeViewColumn.new('Reason',
-                                             renderer,
-                                             'text' => COLUMN_REASON)
-            treeview.append_column(column)
-          end
-        end
-      end
-    end
-  end
-end