groove-dl 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5f1cc467445d9a7c2926f69fadbcf5f1ddfcd22
-  data.tar.gz: b30745ec05b108fa8c7255545c4d2e1ccc2946c0
+  metadata.gz: 5028c609beb9b031385ea3eb3a68241a291e3267
+  data.tar.gz: 093121e998733df06134ac4de8bbcb91ea576a3f
 SHA512:
-  metadata.gz: 35dcb71a4e8de94f7cb94ade9c7150eb8a6964d3578950f604436f5c33a4d54826037f6dc079c7f9a04641fdeb1a09419528bba47a5cd2b4279f7fd90dd45bcb
-  data.tar.gz: a74c931a9db535e0c209d220a8626ca327f76b05d1bce47ea48808348893461861c9cf2176d960a8102ffe2a52bd3be9dd76009b5cbccccb0d9c3fc586d6b4e3
+  metadata.gz: 197f460fe260071fe4e11a4a8722eddfce7ea5aa269e164d115b457f91cb96333b197d994e9034e8750b5e4a259ca32118e9b1599eba0d16097cf58231820b5c
+  data.tar.gz: bad6b3830e84dd377831990aec0f505bae9d3cf7c937a78054a025ab9148697a1e51668902318363d6099a145cea3de86cd8172e9e19d9f976af4a97ac248fd5

data/.gitignore

@@ -2,3 +2,4 @@
 coverage
 Gemfile.lock
 .ruby-version
+groove-dl-*.gem

data/MANIFEST

@@ -23,6 +23,7 @@ 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
 spec/groove-dl/cli_spec.rb

data/README.md

@@ -1,6 +1,7 @@
 #Grooveshark song downloader
 
 [![Build Status](https://travis-ci.org/PierreRambaud/groove-dl.png?branch=master)](https://travis-ci.org/PierreRambaud/groove-dl)
+[![Gem Version](https://badge.fury.io/rb/groove-dl.svg)](http://badge.fury.io/rb/groove-dl)
 
 ##Requirements
 

data/bin/groove-dl

@@ -4,7 +4,9 @@
 require File.expand_path('../../lib/groove-dl', __FILE__)
 
 require 'gtk3'
+require 'shellwords'
 require 'groove-dl/app'
+require 'groove-dl/widgets/menu/success'
 require 'groove-dl/widgets/download/bar'
 require 'groove-dl/widgets/download/list/queue'
 require 'groove-dl/widgets/download/list/failed'

data/lib/groove-dl/app.rb

@@ -3,6 +3,7 @@ module GrooveDl
   # Bootstraper for the application
   class App < Gtk::Window
     def initialize
+      Gtk::Settings.default.gtk_button_images = true
       super
 
       client = Grooveshark::Client.new

data/lib/groove-dl/version.rb

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

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

@@ -19,13 +19,21 @@ module GrooveDl
 
           download_box = Gtk::Box.new(:horizontal, 6)
 
-          add_button = Gtk::Button.new(label: 'Add to queue',
-                                       stock_id: Gtk::Stock::SAVE)
+          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
-            l.create_model(window.find_by_name('search_list').selection)
+            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,
@@ -64,12 +72,13 @@ module GrooveDl
             concurrency_entry.text = value.to_s unless value == 0
           end
 
-          download_button = Gtk::Button.new(label: 'Download',
-                                            stock_id: Gtk::Stock::SAVE)
+          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
-            window.find_by_name('download_list').download
+            download_list.download
           end
 
           download_box.pack_start(download_button,

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

@@ -32,11 +32,15 @@ module GrooveDl
           @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)
+          download_success_list.load(client, window, menu_success)
 
           @download_success_label = Gtk::Label.new(SUCCESS % 0)
           @download_success_label.set_name('download_success_label')

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

@@ -11,7 +11,7 @@ module GrooveDl
           attr_reader :store, :data
 
           COLUMN_PATH,
-          COLUMN_REASON = *(0..2).to_a
+          COLUMN_REASON = *(0..1).to_a
 
           ##
           # Initialize widgets

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

@@ -8,10 +8,11 @@ module GrooveDl
       module List
         # Success tree
         class Success < Gtk::Box
-          attr_reader :store, :data
+          attr_reader :store, :data, :treeview
 
           COLUMN_PATH,
           COLUMN_SIZE = *(0..1).to_a
+          RIGHT_CLICK = 3
 
           ##
           # Initialize widgets
@@ -19,7 +20,7 @@ module GrooveDl
           # @param [Grooveshark::Client] client Grooveshark client
           # @param [Gtk::Window] window Gtk app
           #
-          def load(_client, _window)
+          def load(_client, _window, menu)
             @data = {}
             sw = Gtk::ScrolledWindow.new
             sw.shadow_type = Gtk::ShadowType::ETCHED_IN
@@ -28,12 +29,20 @@ module GrooveDl
             pack_start(sw, expand: true, fill: true, padding: 0)
 
             @store = Gtk::ListStore.new(String, String)
-            treeview = Gtk::TreeView.new(@store)
-            treeview.rules_hint = true
+            @treeview = Gtk::TreeView.new(@store)
+            @treeview.rules_hint = true
 
-            sw.add(treeview)
+            @treeview.signal_connect('button_press_event') do |widget, event|
+              if 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)
+                menu.popup(nil, nil, event.button, event.time)
+              end
+            end
 
-            add_columns(treeview)
+            sw.add(@treeview)
+
+            add_columns
           end
 
           ##
@@ -52,22 +61,20 @@ module GrooveDl
           ##
           # Add columns on the treeview element
           #
-          # @param [Gtk::Treeview] treeview Treeview
-          #
-          def add_columns(treeview)
+          def add_columns
             renderer = Gtk::CellRendererText.new
             column = Gtk::TreeViewColumn.new('Path',
                                              renderer,
                                              'text' => COLUMN_PATH)
             column.fixed_width = 650
-            treeview.append_column(column)
+            @treeview.append_column(column)
 
             renderer = Gtk::CellRendererText.new
             column = Gtk::TreeViewColumn.new('Size',
                                              renderer,
                                              'text' => COLUMN_SIZE)
             column.fixed_width = 100
-            treeview.append_column(column)
+            @treeview.append_column(column)
           end
         end
       end

data/lib/groove-dl/widgets/menu/success.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+module GrooveDl
+  # Widgets components
+  module Widgets
+    # Download section
+    module Menu
+      # Success menu
+      class Success < Gtk::Menu
+        ##
+        # Initialize widgets
+        #
+        # @param [Grooveshark::Client] client Grooveshark client
+        # @param [Gtk::Window] window Gtk app
+        #
+        def load(_client, window)
+          item = Gtk::ImageMenuItem.new(stock_id: Gtk::Stock::OPEN)
+          item.signal_connect('activate') do
+            treeview = window.find_by_name('download_success_list').treeview
+            iter = treeview.selection.selected
+            Thread.new do
+              path = iter[Download::List::Queue::COLUMN_PATH]
+              system("gnome-open #{Shellwords.escape(path)}")
+            end
+          end
+
+          append(item)
+          show_all
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,8 @@ module GrooveDl
 
           search_bar = Gtk::Entry.new
           search_bar.set_name('search_bar')
-          search_bar.text = 'CruciAGoT'
+          search_bar.set_placeholder_text('Search...')
+
           search_box.pack_start(search_bar,
                                 expand: true,
                                 fill: true,
@@ -36,7 +37,18 @@ module GrooveDl
                                 fill: true,
                                 padding: 5)
 
-          button = Gtk::Button.new(label: 'Search', stock_id: Gtk::Stock::FIND)
+          button = Gtk::Button.new(stock_id: Gtk::Stock::FIND)
+          button.set_name('search_button')
+          search_box.pack_start(button,
+                                expand: false,
+                                fill: false,
+                                padding: 10)
+
+          pack_start(search_box,
+                     expand: false,
+                     padding: 10)
+
+          # Signals
           button.signal_connect('released') do
             @type = search_type.active_text
             @query = search_bar.text
@@ -52,14 +64,9 @@ module GrooveDl
             window.find_by_name('search_list').create_model(results)
           end
 
-          search_box.pack_start(button,
-                                expand: false,
-                                fill: false,
-                                padding: 10)
-
-          pack_start(search_box,
-                     expand: false,
-                     padding: 10)
+          search_bar.signal_connect('activate') do
+            button.signal_emit('released')
+          end
         end
       end
     end

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

@@ -8,13 +8,12 @@ module GrooveDl
       class List < Gtk::Box
         attr_reader :data
         attr_reader :store
-        attr_reader :selection
 
-        COLUMN_FIXED,
+        COLUMN_CHECKBOX,
         COLUMN_ID,
         COLUMN_NAME,
         COLUMN_AUTHOR,
-        COLUMN_SONG = *(0..5).to_a
+        COLUMN_SONG = *(0..4).to_a
 
         ##
         # Initialize widgets
@@ -25,7 +24,6 @@ module GrooveDl
         def load(_client, _window)
           set_name('search_list')
 
-          @selection = {}
           sw = Gtk::ScrolledWindow.new
           sw.shadow_type = Gtk::ShadowType::ETCHED_IN
           sw.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC)
@@ -56,7 +54,7 @@ module GrooveDl
           @data = {}
           data.each do |element|
             iter = @store.append
-            iter[COLUMN_FIXED] = false
+            iter[COLUMN_CHECKBOX] = false
             if element.is_a?(Grooveshark::Song)
               @data[element.id.to_i] = element
               iter[COLUMN_ID] = element.id.to_i
@@ -86,9 +84,18 @@ module GrooveDl
 
           column = Gtk::TreeViewColumn.new('X',
                                            renderer,
-                                           'active' => COLUMN_FIXED)
+                                           'active' => COLUMN_CHECKBOX)
           column.sizing = Gtk::TreeViewColumn::Sizing::FIXED
           column.fixed_width = 30
+          column.set_clickable(true)
+          column.signal_connect('clicked') do
+            @store.each do |_model, _path, iter|
+              fixed = iter[COLUMN_CHECKBOX]
+              fixed ^= 1
+              iter[COLUMN_CHECKBOX] = fixed
+            end
+          end
+
           treeview.append_column(column)
 
           renderer = Gtk::CellRendererText.new
@@ -134,11 +141,9 @@ module GrooveDl
         def fixed_toggled(model, path_str)
           path = Gtk::TreePath.new(path_str)
           iter = model.get_iter(path)
-          fixed = iter[COLUMN_FIXED]
+          fixed = iter[COLUMN_CHECKBOX]
           fixed ^= 1
-          iter[COLUMN_FIXED] = fixed
-          @selection[iter[COLUMN_ID]] = @data[iter[COLUMN_ID]] if fixed
-          @selection.delete(iter[COLUMN_ID]) unless fixed
+          iter[COLUMN_CHECKBOX] = fixed
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groove-dl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -197,6 +197,7 @@ files:
 - 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
 - spec/groove-dl/cli_spec.rb
@@ -231,3 +232,4 @@ signing_key:
 specification_version: 4
 summary: Download grooveshark songs.
 test_files: []
+has_rdoc: