alexandria-book-collection-manager 0.6.9 → 0.7.0

data/lib/alexandria/scanners.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2006 Christopher Cyll
-# Copyright (C) 2014, 2015 Matijs van Zuijlen
+# Copyright (C) 2014-2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -22,22 +22,26 @@
 
 module Alexandria
   module Scanners
-    REGISTRY = []
+    def self.registry
+      @registry ||= []
+    end
 
     def self.register(scanner)
-      REGISTRY.push(scanner)
+      registry.push(scanner)
     end
 
     def self.default_scanner
-      REGISTRY.first
+      registry.first
     end
 
     def self.find_scanner(name)
-      REGISTRY.find { |scanner| scanner.name == name }
+      registry.find { |scanner| scanner.name == name }
     end
 
     def self.each_scanner
-      REGISTRY.each { |scanner| yield scanner }
+      registry.each { |scanner| yield scanner }
     end
+
+    private_class_method :registry
   end
 end

data/lib/alexandria/scanners/cuecat.rb

@@ -87,7 +87,7 @@ module Alexandria
 
       def calc(values)
         result = ''
-        while values.length > 0
+        until values.empty?
           num = ((values[0] << 6 | values[1]) << 6 | values[2]) << 6 | values[3]
           result += ((num >> 16) ^ 67).chr
           result += ((num >> 8 & 255) ^ 67).chr
@@ -101,7 +101,7 @@ module Alexandria
       def pad(array)
         length = array.length % 4
 
-        if length != 0
+        if length.nonzero?
           raise 'Error parsing CueCat input' if length == 1
 
           length = 4 - length

data/lib/alexandria/smart_library.rb

@@ -32,11 +32,11 @@ module Alexandria
     attr_accessor :rules, :predicate_operator_rule, :deleted_books
 
     DIR = File.join(ENV['HOME'], '.alexandria', '.smart_libraries')
-    EXT = '.yaml'
+    EXT = '.yaml'.freeze
 
     def initialize(name, rules, predicate_operator_rule)
       super()
-      raise if name.nil? or rules.nil? or predicate_operator_rule.nil?
+      raise if name.nil? || rules.nil? || predicate_operator_rule.nil?
       @name = name
       @rules = rules
       @predicate_operator_rule = predicate_operator_rule
@@ -162,7 +162,7 @@ module Alexandria
       raise 'need libraries' if @libraries.nil?
       raise 'no libraries' if @libraries.empty?
       raise 'need predicate operator' if @predicate_operator_rule.nil?
-      raise 'need rule' if @rules.nil? or @rules.empty?
+      raise 'need rule' if @rules.nil? || @rules.empty?
 
       filters = @rules.map(&:filter_proc)
       selector = @predicate_operator_rule == ALL_RULES ? :all? : :any?
@@ -177,7 +177,7 @@ module Alexandria
         filtered_library.each { |x| @cache[x] = library }
         concat(filtered_library)
       end
-      @n_rated = count { |x| !x.rating.nil? and x.rating > 0 }
+      @n_rated = count { |x| !x.rating.nil? && x.rating > 0 }
     end
 
     def cover(book)
@@ -196,7 +196,7 @@ module Alexandria
       if book
         @cache[book].save(book)
       else
-        FileUtils.mkdir_p(DIR)
+        FileUtils.mkdir_p(DIR) unless File.exist? DIR
         File.open(yaml, 'w') { |io| io.puts to_hash.to_yaml }
       end
     end
@@ -281,7 +281,7 @@ module Alexandria
       attr_accessor :operand, :operation, :value
 
       def initialize(operand, operation, value)
-        raise if operand.nil? or operation.nil? # value can be nil
+        raise if operand.nil? || operation.nil? # value can be nil
         @operand = operand
         @operation = operation
         @value = value
@@ -395,15 +395,15 @@ module Alexandria
                                     proc { |x, y| x < y })
         IS_AFTER = Operator.new(:is_after,
                                 _('is after'),
-                                proc { |x, y| x.to_i > y.to_i and !x.nil? })
+                                proc { |x, y| x.to_i > y.to_i && !x.nil? })
         IS_BEFORE = Operator.new(:is_before,
                                  _('is before'),
-                                 proc { |x, y| x.to_i < y.to_i and !x.nil? })
+                                 proc { |x, y| x.to_i < y.to_i && !x.nil? })
         IS_IN_LAST = Operator.new(:is_in_last_days,
                                   _('is in last'),
                                   proc { |x, y|
                                     begin
-                                      if x.nil? or x.empty?
+                                      if x.nil? || x.empty?
                                         false
                                       else
                                         log.debug { "Given Date: #{x.inspect} #{x.class}" }
@@ -422,7 +422,7 @@ module Alexandria
                                       _('is not in last'),
                                       proc { |x, y|
                                         begin
-                                          if x.nil? or x.empty?
+                                          if x.nil? || x.empty?
                                             false
                                           else
                                             log.debug { "Given Date: #{x.inspect} #{x.class}" }
@@ -491,8 +491,8 @@ module Alexandria
           BOOLEAN_OPERATORS.map { |x| [x, nil] }
         when 'Time'
           TIME_OPERATORS.map do |x|
-            if x == Operators::IS_IN_LAST or
-                x == Operators::IS_NOT_IN_LAST
+            if (x == Operators::IS_IN_LAST) ||
+                (x == Operators::IS_NOT_IN_LAST)
 
               [x, Operands::DAYS]
             else

data/lib/alexandria/ui.rb

@@ -16,8 +16,8 @@
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
 require 'gdk_pixbuf2'
+require 'gtk3'
 
-require 'alexandria/ui/gtk_thread_help'
 require 'alexandria/ui/icons'
 require 'alexandria/ui/builder_base'
 require 'alexandria/ui/completion_models'
@@ -32,18 +32,21 @@ module Alexandria
       log.info { 'Initializing Icons...' }
       Icons.init
     end
+
     def self.start_main_app
       puts '==========================' if $DEBUG
       log.info { 'Starting MainApp...' }
       puts '==========================' if $DEBUG
       MainApp.instance
     end
+
     def self.start_gtk
       puts '====================================' if $DEBUG
       log.info { 'Starting Gtk...' }
       puts '====================================' if $DEBUG
-      Gtk.main_with_queue
+      Gtk.main
     end
+
     def self.main
       init_icons
       start_main_app

data/lib/alexandria/ui/callbacks.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
-# Copyright (C) 2011, 2014 Matijs van Zuijlen
+# Copyright (C) 2011, 2014, 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -22,7 +22,7 @@ module Alexandria
     module Callbacks
       include Logging
 
-      def on_new(_widget, _event)
+      def on_new(*)
         name = Library.generate_new_name(@libraries.all_libraries)
         library = Library.load(name)
         @libraries.add_library(library)
@@ -31,7 +31,7 @@ module Alexandria
         library.add_observer(self)
       end
 
-      def on_new_smart(_widget, _event)
+      def on_new_smart(*)
         NewSmartLibraryDialog.new(@main_app) do |smart_library|
           smart_library.refilter
           @libraries.add_library(smart_library)
@@ -40,7 +40,7 @@ module Alexandria
         end
       end
 
-      def on_add_book(_widget, _event)
+      def on_add_book(*)
         log.info { 'on_add_book' }
         NewBookDialog.new(@main_app, selected_library) do |_books, library, is_new|
           if is_new
@@ -52,14 +52,14 @@ module Alexandria
         end
       end
 
-      def on_add_book_manual(_widget, _event)
+      def on_add_book_manual(*)
         library = selected_library
         NewBookDialogManual.new(@main_app, library) { |_book|
           refresh_books
         }
       end
 
-      def on_import(_widget, _event)
+      def on_import(*)
         ImportDialog.new(@main_app) do |library, bad_isbns, failed_isbns|
           unless bad_isbns.empty?
             log.debug { 'bad_isbn' }
@@ -82,7 +82,7 @@ module Alexandria
       def on_window_state_event(_window, event)
         log.debug { 'window-state-event' }
         if event.is_a?(Gdk::EventWindowState)
-          @maximized = event.new_window_state == Gdk::EventWindowState::MAXIMIZED
+          @maximized = event.new_window_state == :maximized
         end
         log.debug { 'end window-state-event' }
       end
@@ -120,8 +120,9 @@ module Alexandria
         @iconview.unfreeze
       end
 
-      def on_export(_widget, _event)
+      def on_export(*)
         ExportDialog.new(@main_app, selected_library, library_sort_order)
+        # FIXME: Remove this hack and fix the underlying problem.
       rescue => ex
         log.error { "problem with immediate export #{ex} try again" }
         ErrorDialog.new(@main_app, _('Export failed'),
@@ -129,7 +130,7 @@ module Alexandria
                           'completely before exporting.'))
       end
 
-      def on_acquire(_widget, _event)
+      def on_acquire(*)
         AcquireDialog.new(@main_app,
                           selected_library) do |_books, library, is_new|
                             if is_new
@@ -141,8 +142,8 @@ module Alexandria
                           end
       end
 
-      def on_properties(_widget, _event)
-        if @library_listview.focus? or selected_books.empty?
+      def on_properties(*)
+        if @library_listview.focus? || selected_books.empty?
           library = selected_library
           if library.is_a?(SmartLibrary)
             SmartLibraryPropertiesDialog.new(@main_app, library) do
@@ -161,7 +162,7 @@ module Alexandria
         end
       end
 
-      def on_quit(_widget, _event)
+      def on_quit(*)
         save_preferences
         Gtk.main_quit
         # @libraries.really_save_all_books
@@ -169,15 +170,15 @@ module Alexandria
         @libraries.all_regular_libraries.each(&:really_delete_deleted_books)
       end
 
-      def on_undo(_widget, _event)
+      def on_undo(*)
         UndoManager.instance.undo!
       end
 
-      def on_redo(_widget, _event)
+      def on_redo(*)
         UndoManager.instance.redo!
       end
 
-      def on_select_all(_widget, _event)
+      def on_select_all(*)
         log.debug { 'on_select_all' }
         case @notebook.page
         when 0
@@ -187,7 +188,7 @@ module Alexandria
         end
       end
 
-      def on_deselect_all(_widget, _event)
+      def on_deselect_all(*)
         log.debug { 'on_deselect_all' }
         case @notebook.page
         when 0
@@ -211,21 +212,21 @@ module Alexandria
         end
       end
 
-      def on_rename(_widget, _event)
+      def on_rename(*)
         iter = @library_listview.selection.selected
         @library_listview.set_cursor(iter.path,
                                      @library_listview.get_column(0),
                                      true)
       end
 
-      def on_delete(_widget, _event)
+      def on_delete(*)
         library = selected_library
 
-        if selected_books.empty?
-          books = nil
-        else
-          books = selected_books
-        end
+        books = if selected_books.empty?
+                  nil
+                else
+                  selected_books
+                end
         # books = @library_listview.focus? ? nil : selected_books
         is_smart = library.is_a?(SmartLibrary)
         last_library = (@libraries.all_regular_libraries.length == 1)
@@ -233,39 +234,39 @@ module Alexandria
           log.warn { 'Attempted to delete last library, fix GUI' }
           return
         end
-        if library.empty? or ReallyDeleteDialog.new(@main_app,
+        if library.empty? || ReallyDeleteDialog.new(@main_app,
                                                     library,
                                                     books).ok?
           undoable_delete(library, books)
         end
       end
 
-      def on_clear_search_results(_widget, _event)
+      def on_clear_search_results(*)
         @filter_entry.text = ''
         @iconview.freeze
         @filtered_model.refilter
         @iconview.unfreeze
       end
 
-      def on_search(_widget, _event)
+      def on_search(*)
         @filter_entry.grab_focus
       end
 
-      def on_preferences(_widget, _event)
+      def on_preferences(*)
         PreferencesDialog.new(@main_app) do
           @listview_manager.setup_listview_columns_visibility
         end
       end
 
-      def on_submit_bug_report(_widget, _event)
+      def on_submit_bug_report(*)
         open_web_browser(BUGREPORT_URL)
       end
 
-      def on_help(_widget, _event)
+      def on_help(*)
         Alexandria::UI.display_help(@main_app)
       end
 
-      def on_about(_widget, _event)
+      def on_about(*)
         ad = AboutDialog.new(@main_app)
         ad.signal_connect('response') do
           log.debug { 'destroy about' }
@@ -274,6 +275,28 @@ module Alexandria
         ad.show
       end
 
+      def on_view_sidepane(action)
+        log.debug { 'on_view_sidepane' }
+        @paned.child1.visible = action.active?
+      end
+
+      def on_view_toolbar(action)
+        log.debug { 'on_view_toolbar' }
+        @toolbar.visible = action.active?
+      end
+
+      def on_view_statusbar(action)
+        log.debug { 'on_view_statusbar' }
+        @appbar.visible = action.active?
+      end
+
+      def on_reverse_order(action)
+        log.debug { 'on_reverse_order' }
+        Preferences.instance.reverse_icons = action.active?
+        Preferences.instance.save!
+        setup_books_iconview_sorting
+      end
+
       def connect_signals
         standard_actions = [
           ['LibraryMenu', nil, _('_Library')],
@@ -314,37 +337,11 @@ module Alexandria
           ['About', Gtk::Stock::ABOUT, _('_About'), nil, _('Show information about Alexandria'), method(:on_about)],
         ]
 
-        on_view_sidepane = proc do |_actiongroup, action|
-          log.debug { 'on_view_sidepane' }
-          @paned.child1.visible = action.active?
-        end
-
-        on_view_toolbar = proc do |_actiongroup, action|
-          log.debug { 'on_view_toolbar' }
-          @toolbar.parent.visible = action.active?
-        end
-
-        on_view_statusbar = proc do |_actiongroup, action|
-          log.debug { 'on_view_statusbar' }
-          @appbar.visible = action.active?
-        end
-
-        on_reverse_order = proc do |_actiongroup, action|
-          log.debug { 'on_reverse_order' }
-          Preferences.instance.reverse_icons = action.active?
-          Preferences.instance.save!
-          setup_books_iconview_sorting
-        end
-
         toggle_actions = [
-          ['Sidepane', nil, _('Side _Pane'), 'F9', nil,
-           on_view_sidepane, true],
-          ['Toolbar', nil, _('_Toolbar'), nil, nil,
-           on_view_toolbar, true],
-          ['Statusbar', nil, _('_Statusbar'), nil, nil,
-           on_view_statusbar, true],
-          ['ReversedOrder', nil, _('Re_versed Order'), nil, nil,
-           on_reverse_order],
+          ['Sidepane', nil, _('Side _Pane'), 'F9', nil, method(:on_view_sidepane), true],
+          ['Toolbar', nil, _('_Toolbar'), nil, nil, method(:on_view_toolbar), true],
+          ['Statusbar', nil, _('_Statusbar'), nil, nil, method(:on_view_statusbar), true],
+          ['ReversedOrder', nil, _('Re_versed Order'), nil, nil, method(:on_reverse_order)],
         ]
 
         view_as_actions = [
@@ -369,17 +366,61 @@ module Alexandria
         log.debug { 'Adding actions to @actiongroup' }
 
         @actiongroup = Gtk::ActionGroup.new('actions')
-        @actiongroup.add_actions(standard_actions)
-        @actiongroup.add_actions(providers_actions)
-        @actiongroup.add_toggle_actions(toggle_actions)
-        @actiongroup.add_radio_actions(view_as_actions) do |_action, current|
+
+        standard_actions.each do |name, stock_id, label, accelerator, tooltip, callback|
+          action = Gtk::Action.new(name, label: label, tooltip: tooltip, stock_id: stock_id)
+          @actiongroup.add_action_with_accel(action, accelerator)
+          if callback
+            action.signal_connect('activate', &callback)
+          end
+        end
+
+        providers_actions.each do |name, stock_id, label, accelerator, tooltip, callback|
+          action = Gtk::Action.new(name, label: label, tooltip: tooltip, stock_id: stock_id)
+          @actiongroup.add_action_with_accel(action, accelerator)
+          if callback
+            action.signal_connect('activate', &callback)
+          end
+        end
+
+        toggle_actions.each do |name, stock_id, label, accelerator, tooltip, callback, is_active|
+          action = Gtk::ToggleAction.new(name, label: label, tooltip: tooltip, stock_id: stock_id)
+          action.set_active is_active
+          @actiongroup.add_action_with_accel(action, accelerator)
+          if callback
+            action.signal_connect('toggled', &callback)
+          end
+        end
+
+        group = nil
+        first_action = nil
+        view_as_actions.each do |name, stock_id, label, accelerator, tooltip, value|
+          action = Gtk::RadioAction.new(name, value, label: label, tooltip: tooltip, stock_id: stock_id)
+          first_action = action unless group
+          action.set_group group
+          group = action.group
+          @actiongroup.add_action_with_accel(action, accelerator)
+        end
+
+        first_action.signal_connect 'changed' do |_action, current, _user_data|
           @notebook.page = current.current_value
           hid = @toolbar_view_as_signal_hid
           @toolbar_view_as.signal_handler_block(hid) do
             @toolbar_view_as.active = current.current_value
           end
         end
-        @actiongroup.add_radio_actions(arrange_icons_actions) do |_action, current|
+
+        group = nil
+        first_action = nil
+        arrange_icons_actions.each do |name, stock_id, label, accelerator, tooltip, value|
+          action = Gtk::RadioAction.new(name, value, label: label, tooltip: tooltip, stock_id: stock_id)
+          first_action = action unless group
+          action.set_group group
+          group = action.group
+          @actiongroup.add_action_with_accel(action, accelerator)
+        end
+
+        first_action.signal_connect 'changed' do |_action, current, _user_data|
           @prefs.arrange_icons_mode = current.current_value
           setup_books_iconview_sorting
         end