alexandria-book-collection-manager 0.7.2 → 0.7.3

data/lib/alexandria/ui/dialogs/preferences_dialog.rb

@@ -1,23 +1,10 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011, 2016 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# Alexandria is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
+require 'alexandria/ui/builder_base'
 require 'alexandria/scanners/cuecat'
 require 'alexandria/scanners/keyboard'
 
@@ -30,9 +17,10 @@ end
 
 module Alexandria
   module UI
-    class ProviderPreferencesBaseDialog < Gtk::Dialog
-      def initialize(*args)
-        super(*args)
+    class ProviderPreferencesBaseDialog < SimpleDelegator
+      def initialize(title:, parent:, flags:, buttons:)
+        dialog = Gtk::Dialog.new(title: title, parent: parent, flags: flags, buttons: buttons)
+        super(dialog)
 
         self.resizable = false
         child.border_width = 12
@@ -118,7 +106,9 @@ module Alexandria
         child.pack_start(table)
 
         signal_connect('destroy') { sync_variables }
+      end
 
+      def acquire
         show_all
         run
         destroy
@@ -130,18 +120,18 @@ module Alexandria
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
       def initialize(parent)
-        super(_('New Provider'),
-              parent,
-              Gtk::Dialog::MODAL,
-              [Gtk::Stock::CANCEL, :cancel])
+        super(title: _('New Provider'),
+              parent: parent,
+              flags: :modal,
+              buttons: [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL]])
         @add_button = add_button(Gtk::Stock::ADD,
-                                 :accept)
+                                 Gtk::ResponseType::ACCEPT)
 
         instances = BookProviders.abstract_classes.map(&:new)
         @selected_instance = nil
 
         @table = Gtk::Table.new(2, 2)
-        vbox.pack_start(@table)
+        child.pack_start(@table)
 
         # Name.
 
@@ -162,7 +152,7 @@ module Alexandria
         label_type.xalign = 0
         @table.attach_defaults(label_type, 0, 1, 1, 2)
 
-        combo_type = Gtk::ComboBox.new
+        combo_type = Gtk::ComboBoxText.new
         instances.each do |instance|
           combo_type.append_text(instance.name)
         end
@@ -176,9 +166,11 @@ module Alexandria
         combo_type.active = 0
         label_type.mnemonic_widget = combo_type
         @table.attach_defaults(combo_type, 1, 2, 1, 2)
+      end
 
+      def acquire
         show_all
-        if run == :accept
+        if run == Gtk::ResponseType::ACCEPT
           @selected_instance.reinitialize(entry_name.text)
           sync_variables
         else
@@ -407,7 +399,9 @@ module Alexandria
 
       def on_provider_setup
         provider = selected_provider
-        ProviderPreferencesDialog.new(@preferences_dialog, provider) unless prefs_empty(provider.prefs)
+        unless prefs_empty(provider.prefs)
+          ProviderPreferencesDialog.new(@preferences_dialog, provider).acquire
+        end
       end
 
       def on_provider_up
@@ -436,7 +430,7 @@ module Alexandria
       end
 
       def on_provider_add
-        dialog = NewProviderDialog.new(@preferences_dialog)
+        dialog = NewProviderDialog.new(@preferences_dialog).acquire
         if dialog.instance
           BookProviders.update_priority
           reload_providers
@@ -464,15 +458,15 @@ module Alexandria
                                    "'%s'?") % provider.fullname,
                                  Gtk::Stock::DIALOG_QUESTION,
                                  [[Gtk::Stock::CANCEL,
-                                   :cancel],
+                                   Gtk::ResponseType::CANCEL],
                                   [Gtk::Stock::DELETE,
-                                   :ok]],
+                                   Gtk::ResponseType::OK]],
                                  _('If you continue, the provider and ' \
                                    'all of its preferences will be ' \
                                    'permanently deleted.'))
         dialog.default_response = Gtk::ResponseType::CANCEL
         dialog.show_all
-        if dialog.run == :ok
+        if dialog.run == Gtk::ResponseType::OK
           provider.remove
           BookProviders.update_priority
           reload_providers
@@ -482,6 +476,7 @@ module Alexandria
 
       def on_column_toggled(checkbutton)
         raise if @cols[checkbutton].nil?
+
         Preferences.instance.send("#{@cols[checkbutton]}=",
                                   checkbutton.active?)
 

data/lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb

@@ -32,15 +32,17 @@ module Alexandria
         self.title = _("Properties for '%s'") % smart_library.name
         # FIXME: Should accept just :cancel
         self.default_response = Gtk::ResponseType::CANCEL
+      end
 
+      def acquire
         show_all
         smart_library.rules.each { |x| insert_new_rule(x) }
         update_rules_header_box(smart_library.predicate_operator_rule)
 
-        while (response = run) != :cancel
-          if response == :help
+        while (response = run) != Gtk::ResponseType::CANCEL
+          if response == Gtk::ResponseType::HELP
             Alexandria::UI.display_help(self, 'edit-smart-library')
-          elsif response == :ok
+          elsif response == Gtk::ResponseType::OK
             if user_confirms_possible_weirdnesses_before_saving?
               smart_library.rules = smart_library_rules
               smart_library.predicate_operator_rule =

data/lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb

@@ -20,7 +20,7 @@
 
 module Alexandria
   module UI
-    class SmartLibraryPropertiesDialogBase < Gtk::Dialog
+    class SmartLibraryPropertiesDialogBase < SimpleDelegator
       include Logging
       include GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
@@ -28,10 +28,11 @@ module Alexandria
       attr_reader :predicate_operator_rule
 
       def initialize(parent)
-        super(title: '',
-              parent: parent,
-              flags: :modal,
-              buttons: [[Gtk::Stock::HELP, :help]])
+        @dialog = Gtk::Dialog.new(title: '',
+                                  parent: parent,
+                                  flags: :modal,
+                                  buttons: [[Gtk::Stock::HELP, :help]])
+        super(@dialog)
 
         self.window_position = :center
         self.resizable = true
@@ -81,19 +82,20 @@ module Alexandria
 
       def user_confirms_possible_weirdnesses_before_saving?
         return true unless has_weirdnesses?
+
         dialog = AlertDialog.new(
-          self,
+          @dialog,
           _('Empty or conflictive condition'),
           Gtk::Stock::DIALOG_QUESTION,
-          [[Gtk::Stock::CANCEL, :cancel],
-           [_('_Save However'), :yes]],
+          [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
+           [_('_Save However'), Gtk::ResponseType::YES]],
           _('This smart library contains one or more conditions ' \
             'which are empty or conflict with each other. This is ' \
             'likely to result in never matching a book. Are you ' \
             'sure you want to save this library?'))
         dialog.default_response = Gtk::ResponseType::CANCEL
         dialog.show_all
-        confirmed = dialog.run == :yes
+        confirmed = dialog.run == Gtk::ResponseType::YES
         dialog.destroy
         confirmed
       end
@@ -169,6 +171,7 @@ module Alexandria
         remove_button.signal_connect('clicked') do |_button|
           idx = @rules_box.children.index(rule_box)
           raise if idx.nil?
+
           @smart_library_rules.delete_at(idx)
           @rules_box.remove(rule_box)
           sensitize_remove_rule_buttons
@@ -283,7 +286,7 @@ module Alexandria
           elsif date.visible?
             begin
               value = parse_date(date.text)
-            rescue => ex
+            rescue StandardError => ex
               trace = ex.backtrace.join("\n > ")
               log.warn { "Possibly invalid date entered #{ex.message}" }
               log.warn { "Date widget returned #{date.text} / #{trace}" }
@@ -307,7 +310,7 @@ module Alexandria
         @calendar_popup.skip_pager_hint = true
         @calendar_popup.events = [:focus_change_mask]
 
-        @calendar_popup.set_transient_for(self)
+        @calendar_popup.set_transient_for(@dialog)
         @calendar_popup.set_type_hint(:dialog)
         @calendar_popup.name = 'calendar-popup'
         @calendar_popup.resizable = false
@@ -407,7 +410,7 @@ module Alexandria
         begin
           d = Date.strptime(datestring, date_format)
           Time.gm(d.year, d.month, d.day)
-        rescue
+        rescue StandardError
           nil
         end
       end

data/lib/alexandria/ui/icons.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2014-2016 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# Alexandria is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
 class GdkPixbuf::Pixbuf
   def tag(tag_pixbuf)
@@ -56,6 +42,8 @@ end
 module Alexandria
   module UI
     module Icons
+      include Logging
+
       ICONS_DIR = File.join(Alexandria::Config::DATA_DIR, 'icons')
       def self.init
         load_icon_images
@@ -66,6 +54,7 @@ module Alexandria
       def self.load_icon_images
         Dir.entries(ICONS_DIR).each do |file|
           next unless file =~ /\.png$/ # skip non '.png' files
+
           # Don't use upcase and use tr instead
           # For example in Turkish the upper case of 'i' is still 'i'.
           name = File.basename(file, '.png').tr('a-z', 'A-Z')
@@ -76,13 +65,13 @@ module Alexandria
       def self.cover(library, book)
         begin
           return BOOK_ICON if library.nil?
+
           filename = library.cover(book)
           return GdkPixbuf::Pixbuf.new(file: filename) if File.exist?(filename)
-        rescue => err
-          # report load error; FIX should go to a Logger...
-          puts err.message
-          puts err.backtrace.join("\n> ")
-          puts "Failed to load GdkPixbuf::Pixbuf, please ensure that from #{filename} is a valid image file"
+        rescue GdkPixbuf::PixbufError
+          log.error do
+            "Failed to load GdkPixbuf::Pixbuf, please ensure that #{filename} is a valid image file"
+          end
         end
         BOOK_ICON
       end
@@ -90,7 +79,7 @@ module Alexandria
       def self.blank?(filename)
         pixbuf = GdkPixbuf::Pixbuf.new(file: filename)
         (pixbuf.width == 1) && (pixbuf.height == 1)
-      rescue => err
+      rescue StandardError => err
         puts err.message
         puts err.backtrace.join("\n> ")
         true

data/lib/alexandria/ui/init.rb

@@ -72,16 +72,16 @@ end
 
 module Alexandria
   module UI
-    def self.display_help(parent = nil, section = nil)
+    def self.display_help(parent, section = nil)
       section_index = ''
       section_index = "##{section}" if section
       exec("gnome-help ghelp:alexandria#{section_index}") if fork.nil?
-    rescue
+    rescue StandardError
       log.error(self) { 'Unable to load help browser' }
       ErrorDialog.new(parent, _('Unable to launch the help browser'),
                       _('Could not display help for Alexandria. ' \
                         'There was an error launching the system ' \
-                        'help browser.'))
+                        'help browser.')).display
     end
   end
 end

data/lib/alexandria/ui/libraries_combo.rb

@@ -76,6 +76,7 @@ module Alexandria
         end
       end
       raise unless library
+
       [library, is_new]
     end
   end

data/lib/alexandria/ui/listview.rb

@@ -1,24 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2008 Joseph Method
-# Copyright (C) 2010 Cathal Mc Ginley
-# Copyright (C) 2011, 2016 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# Alexandria is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License aso
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
 require 'alexandria/ui/columns'
 
@@ -132,8 +116,7 @@ module Alexandria
           column.pack_start(renderer, false)
           column.set_cell_data_func(renderer) do |_tree_column, cell, _tree_model, iter|
             rating = (iter[Columns::RATING] - Book::MAX_RATING_STARS).abs
-            cell.pixbuf = rating >= i.succ ?
-              Icons::STAR_SET : Icons::STAR_UNSET
+            cell.pixbuf = rating >= i.succ ? Icons::STAR_SET : Icons::STAR_UNSET
           end
         end
         column.sort_column_id = Columns::RATING
@@ -176,7 +159,7 @@ module Alexandria
               end
 
             end
-          rescue => e
+          rescue StandardError => e
             log.error { "toggle failed for path #{path} #{e}\n" + e.backtrace.join("\n") }
           end
         end
@@ -238,6 +221,7 @@ module Alexandria
               log.debug { "#{c.title} : #{cols_width[c.title]}" }
               width = cols_width[c.title]
               next if width.zero?
+
               c.sizing = :fixed
               c.fixed_width = width
             end

data/lib/alexandria/ui/multi_drag_treeview.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011, 2016 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# Alexandria is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
 module Alexandria
   module EventOverrides
@@ -28,22 +14,23 @@ module Alexandria
   module TreeViewOverrides
     # include Alexandria::Logging
 
-    class Context < Struct.new(:pressed_button,
-                               :x,
-                               :y,
-                               :cell_x,
-                               :cell_y,
-                               :button_press_handler,
-                               :motion_notify_handler,
-                               :button_release_handler,
-                               :drag_data_get_handler,
-                               :events,
-                               :source_start_button_mask,
-                               :source_targets,
-                               :source_actions,
-                               :pending_event,
-                               :drag_context)
-
+    Context = Struct.new(:pressed_button,
+                         :x,
+                         :y,
+                         :cell_x,
+                         :cell_y,
+                         :button_press_handler,
+                         :motion_notify_handler,
+                         :button_release_handler,
+                         :drag_data_get_handler,
+                         :events,
+                         :source_start_button_mask,
+                         :source_targets,
+                         :source_actions,
+                         :pending_event,
+                         :drag_context)
+
+    class Context
       def initialize(*ary)
         super
         self.events ||= []
@@ -76,6 +63,7 @@ module Alexandria
 
     def stop_drag_check
       raise if @context.nil?
+
       @context.events.clear
       @context.pending_event = false
       signal_handler_disconnect(@context.motion_notify_handler)