alexandria-book-collection-manager 0.7.3 → 0.7.8

data/lib/alexandria/ui/libraries_combo.rb

@@ -24,7 +24,7 @@ module Alexandria
   module ComboBoxOverrides
     include GetText
     extend GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     def populate_with_libraries(libraries, selected_library)
       libraries_names = libraries.map(&:name)
@@ -33,28 +33,22 @@ module Alexandria
         libraries_names.unshift selected_library.name
       end
       clear
-      set_row_separator_func do |model, iter|
-        # TODO: Replace with iter[1] if possible
-        model.get_value(iter, 1) == '-'
-      end
       self.model = Gtk::ListStore.new(GdkPixbuf::Pixbuf, String, TrueClass)
       libraries_names.each do |library_name|
-        iter = model.append
-        iter[0] = Alexandria::UI::Icons::LIBRARY_SMALL
-        iter[1] = library_name
-        iter[2] = false
+        append_entry(Alexandria::UI::Icons::LIBRARY_SMALL, library_name, false)
       end
-      model.append[1] = '-'
-      iter = model.append
-      iter[0] = Alexandria::UI::Icons::LIBRARY_SMALL
-      iter[1] = _('New Library')
-      iter[2] = true
+      append_entry(nil, "-", nil)
+      append_entry(Alexandria::UI::Icons::LIBRARY_SMALL, _("New Library"), true)
       renderer = Gtk::CellRendererPixbuf.new
       pack_start(renderer, false)
       set_attributes(renderer, pixbuf: 0)
       renderer = Gtk::CellRendererText.new
       pack_start(renderer, true)
       set_attributes(renderer, text: 1)
+      set_row_separator_func do |model, iter|
+        # TODO: Replace with iter[1] if possible
+        model.get_value(iter, 1) == "-"
+      end
       self.active = 0
       # self.sensitive = libraries.length > 1
       # This prohibits us from adding a "New Library" from this combo
@@ -79,6 +73,13 @@ module Alexandria
 
       [library, is_new]
     end
+
+    def append_entry(icon, label, is_new)
+      iter = model.append
+      iter[0] = icon
+      iter[1] = label
+      iter[2] = is_new
+    end
   end
 end
 

data/lib/alexandria/ui/listview.rb

@@ -4,18 +4,18 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'alexandria/ui/columns'
+require "alexandria/ui/columns"
 
 module Alexandria
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
     class ListViewManager
       include Logging
       include GetText
       include DragAndDropable
-      BOOKS_TARGET_TABLE = [['ALEXANDRIA_BOOKS', :same_app, 0]].freeze
+      BOOKS_TARGET_TABLE = [["ALEXANDRIA_BOOKS", :same_app, 0]].freeze
 
       def initialize(_listview, parent)
         @parent = parent
@@ -29,18 +29,18 @@ module Alexandria
       end
 
       def setup_title_column
-        title = _('Title')
-        log.debug { format('Create listview column for %s', title) }
+        title = _("Title")
+        log.debug { format("Create listview column for %s", title) }
         column = Gtk::TreeViewColumn.new(title)
 
         renderer = Gtk::CellRendererPixbuf.new
         column.pack_start(renderer, false)
-        column.add_attribute(renderer, 'pixbuf', Columns::COVER_LIST)
+        column.add_attribute(renderer, "pixbuf", Columns::COVER_LIST)
 
         renderer = Gtk::CellRendererText.new
         renderer.ellipsize = :end
         column.pack_start(renderer, true)
-        column.add_attribute(renderer, 'text', Columns::TITLE)
+        column.add_attribute(renderer, "text", Columns::TITLE)
 
         column.sort_column_id = Columns::TITLE
         column.resizable = true
@@ -48,21 +48,21 @@ module Alexandria
       end
 
       TEXT_COLUMNS = [
-        [_('Authors'), Columns::AUTHORS],
-        [_('ISBN'), Columns::ISBN],
-        [_('Publisher'), Columns::PUBLISHER],
-        [_('Publish Year'), Columns::PUBLISH_DATE],
-        [_('Binding'), Columns::EDITION],
-        [_('Loaned To'), Columns::LOANED_TO]
+        [_("Authors"), Columns::AUTHORS],
+        [_("ISBN"), Columns::ISBN],
+        [_("Publisher"), Columns::PUBLISHER],
+        [_("Publish Year"), Columns::PUBLISH_DATE],
+        [_("Binding"), Columns::EDITION],
+        [_("Loaned To"), Columns::LOANED_TO]
       ].freeze
       CHECK_COLUMNS = [
-        [_('Read'), Columns::REDD],
-        [_('Own'), Columns::OWN],
-        [_('Want'), Columns::WANT]
+        [_("Read"), Columns::REDD],
+        [_("Own"), Columns::OWN],
+        [_("Want"), Columns::WANT]
       ].freeze
 
       def setup_books_listview
-        log.debug { 'setup_books_listview' }
+        log.debug { "setup_books_listview" }
         @listview.model = @listview_model
         setup_title_column
         TEXT_COLUMNS.each do |title, iterid|
@@ -73,8 +73,8 @@ module Alexandria
         end
         setup_rating_column
         @listview.selection.mode = :multiple
-        @listview.selection.signal_connect('changed') do
-          log.debug { 'changed' }
+        @listview.selection.signal_connect("changed") do
+          log.debug { "changed" }
           @parent.on_books_selection_changed
         end
         setup_tags_column
@@ -83,9 +83,8 @@ module Alexandria
       end
 
       def setup_tags_column
-        # adding tags column...
-        title = _('Tags')
-        log.debug { 'Create listview column for tags...' }
+        title = _("Tags")
+        log.debug { "Create listview column for tags" }
         renderer = Gtk::CellRendererText.new
         renderer.ellipsize = :end
         column = Gtk::TreeViewColumn.new(title, renderer,
@@ -96,16 +95,16 @@ module Alexandria
       end
 
       def setup_row_activation
-        @listview.signal_connect('row-activated') do
-          log.debug { 'row-activated' }
-          @actiongroup['Properties'].activate
+        @listview.signal_connect("row-activated") do
+          log.debug { "row-activated" }
+          @actiongroup["Properties"].activate
           false
         end
       end
 
       def setup_rating_column
-        title = _('Rating')
-        log.debug { format('Create listview column for %s...', title) }
+        title = _("Rating")
+        log.debug { format("Create listview column for %s", title) }
         column = Gtk::TreeViewColumn.new(title)
         column.sizing = :fixed
         width = (Icons::STAR_SET.width + 1) * Book::MAX_RATING_STARS
@@ -127,56 +126,56 @@ module Alexandria
       def setup_check_column(title, iterid)
         renderer = CellRendererToggle.new
         renderer.activatable = true
-        renderer.signal_connect('toggled') do |_rndrr, path|
-          begin
-            tree_path = Gtk::TreePath.new(path)
-            child_path = @listview_model.convert_path_to_child_path(tree_path)
-            if child_path
-              unfiltered_path = @filtered_model.convert_path_to_child_path(child_path)
-              # FIX this sometimes returns a nil path for iconview...
-              if unfiltered_path
-                iter = @model.get_iter(unfiltered_path)
-                if iter
-                  book = @parent.book_from_iter(@parent.selected_library, iter)
-                  toggle_state = case iterid
-                                 when Columns::REDD then book.redd
-                                 when Columns::OWN then book.own
-                                 when Columns::WANT then book.want
-                                 end
-                  # invert toggle_state
-                  unless iterid == Columns::WANT && book.own
-                    toggle_state = !toggle_state
-                    case iterid
-                    when Columns::REDD then book.redd = toggle_state
-                    when Columns::OWN then book.own = toggle_state
-                    when Columns::WANT then book.want = toggle_state
-                    end
-                    iter[iterid] = toggle_state
-                    lib = @parent.selected_library
-                    lib.save(book)
+        renderer.signal_connect("toggled") do |_rndrr, path|
+          tree_path = Gtk::TreePath.new(path)
+          child_path = @listview_model.convert_path_to_child_path(tree_path)
+          if child_path
+            unfiltered_path = @filtered_model.convert_path_to_child_path(child_path)
+            # FIX this sometimes returns a nil path for iconview...
+            if unfiltered_path
+              iter = @model.get_iter(unfiltered_path)
+              if iter
+                book = @parent.book_from_iter(@parent.selected_library, iter)
+                toggle_state = case iterid
+                               when Columns::REDD then book.redd
+                               when Columns::OWN then book.own
+                               when Columns::WANT then book.want
+                               end
+                # invert toggle_state
+                unless iterid == Columns::WANT && book.own
+                  toggle_state = !toggle_state
+                  case iterid
+                  when Columns::REDD then book.redd = toggle_state
+                  when Columns::OWN then book.own = toggle_state
+                  when Columns::WANT then book.want = toggle_state
                   end
+                  iter[iterid] = toggle_state
+                  lib = @parent.selected_library
+                  lib.save(book)
                 end
               end
-
             end
-          rescue StandardError => e
-            log.error { "toggle failed for path #{path} #{e}\n" + e.backtrace.join("\n") }
+
           end
+        rescue StandardError => ex
+          log.error { "toggle failed for path #{path} #{ex}\n" + e.backtrace.join("\n") }
         end
         column = Gtk::TreeViewColumn.new(title, renderer, text: iterid)
         column.sort_column_id = iterid
         column.resizable = true
-        log.debug { format('Create listview column for %s...', title) }
+        log.debug { format("Create listview column for %s", title) }
 
-        column.add_attribute(renderer, 'active', iterid)
-        column.add_attribute(renderer, 'inconsistent', Columns::OWN) if iterid == Columns::WANT
+        column.add_attribute(renderer, "active", iterid)
+        if iterid == Columns::WANT
+          column.add_attribute(renderer, "inconsistent", Columns::OWN)
+        end
 
         log.debug { "append_column #{column}" }
         @listview.append_column(column)
       end
 
       def setup_text_column(title, iterid)
-        log.debug { format('Create listview column for %s...', title) }
+        log.debug { format("Create listview column for %s", title) }
         renderer = Gtk::CellRendererText.new
         renderer.ellipsize = :end
         column = Gtk::TreeViewColumn.new(title, renderer,
@@ -187,7 +186,7 @@ module Alexandria
       end
 
       def setup_listview_columns_visibility
-        log.debug { 'setup_listview_columns_visibility' }
+        log.debug { "setup_listview_columns_visibility" }
         # Show or hide list view columns according to the preferences.
         cols_visibility = [
           @prefs.col_authors_visible,
@@ -206,7 +205,10 @@ module Alexandria
         cols.each_index do |i|
           cols[i].visible = cols_visibility[i]
         end
-        log.debug { 'Columns visibility: ' + cols.map { |col| "#{col.title} #{col.visible?}" }.join(', ') }
+        log.debug do
+          "Columns visibility: " +
+            cols.map { |col| "#{col.title} #{col.visible?}" }.join(", ")
+        end
       end
 
       # Sets the width of each column based on any respective
@@ -227,10 +229,10 @@ module Alexandria
             end
           end
         end
-        log.debug {
-          'Columns width: ' +
-            @listview.columns.map { |col| "#{col.title} #{col.width}" }.join(', ')
-        }
+        log.debug do
+          "Columns width: " +
+            @listview.columns.map { |col| "#{col.title} #{col.width}" }.join(", ")
+        end
       end
     end
   end

data/lib/alexandria/ui/main_app.rb

@@ -19,43 +19,41 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'alexandria/ui/dialogs/alert_dialog'
-# misc_dialogs depends on alert_dialog
-require 'alexandria/ui/dialogs/misc_dialogs'
-require 'alexandria/ui/dialogs/about_dialog'
-require 'alexandria/ui/dialogs/book_properties_dialog_base'
-require 'alexandria/ui/dialogs/book_properties_dialog'
-require 'alexandria/ui/dialogs/new_book_dialog_manual'
-require 'alexandria/ui/dialogs/new_book_dialog'
-require 'alexandria/ui/dialogs/preferences_dialog'
-require 'alexandria/ui/dialogs/export_dialog'
-require 'alexandria/ui/dialogs/import_dialog'
-require 'alexandria/ui/dialogs/acquire_dialog'
-require 'alexandria/ui/dialogs/smart_library_properties_dialog_base'
-require 'alexandria/ui/dialogs/smart_library_properties_dialog'
-require 'alexandria/ui/dialogs/new_smart_library_dialog'
-require 'alexandria/ui/dialogs/bad_isbns_dialog'
-require 'alexandria/ui/dndable'
-require 'alexandria/ui/init'
-require 'alexandria/ui/ui_manager'
-require 'alexandria/ui/listview'
-require 'alexandria/ui/iconview'
-require 'alexandria/ui/sidepane'
+require "alexandria/ui/alert_dialog"
+require "alexandria/ui/about_dialog"
+require "alexandria/ui/book_properties_dialog_base"
+require "alexandria/ui/book_properties_dialog"
+require "alexandria/ui/new_book_dialog_manual"
+require "alexandria/ui/new_book_dialog"
+require "alexandria/ui/preferences_dialog"
+require "alexandria/ui/export_dialog"
+require "alexandria/ui/import_dialog"
+require "alexandria/ui/acquire_dialog"
+require "alexandria/ui/smart_library_properties_dialog_base"
+require "alexandria/ui/smart_library_properties_dialog"
+require "alexandria/ui/new_smart_library_dialog"
+require "alexandria/ui/bad_isbns_dialog"
+require "alexandria/ui/dndable"
+require "alexandria/ui/init"
+require "alexandria/ui/ui_manager"
+require "alexandria/ui/listview"
+require "alexandria/ui/iconview"
+require "alexandria/ui/sidepane_manager"
 
 module Alexandria
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     class MainApp
       include Logging
       include GetText
       include Singleton
-      attr_accessor :main_app, :libraries, :actiongroup, :appbar, :prefs
-      attr_accessor :ui_manager
+      attr_accessor :main_app, :libraries, :actiongroup, :appbar, :prefs, :ui_manager
+
       def initialize
-        log.info { 'Starting MainApp' }
+        log.info { "Starting MainApp" }
         @ui_manager = UIManager.new self
         @actiongroup = @ui_manager.actiongroup
         @appbar = @ui_manager.appbar

data/lib/alexandria/ui/misc_dialogs.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+module Alexandria
+  module UI
+  end
+end

data/lib/alexandria/ui/multi_drag_treeview.rb

@@ -6,14 +6,14 @@
 
 module Alexandria
   module EventOverrides
-    def ==(obj)
-      obj.is_a?(self.class) && (time == obj.time) && (x == obj.x) && (y == obj.y) && (button == obj.button)
+    def ==(other)
+      other.is_a?(self.class) &&
+        (time == other.time) && (x == other.x) && (y == other.y) &&
+        (button == other.button)
     end
   end
 
   module TreeViewOverrides
-    # include Alexandria::Logging
-
     Context = Struct.new(:pressed_button,
                          :x,
                          :y,
@@ -50,7 +50,7 @@ module Alexandria
       @context.source_actions = actions
 
       @context.button_press_handler =
-        signal_connect('button_press_event') do |_widget, event, _data|
+        signal_connect("button_press_event") do |_widget, event, _data|
           button_press_event(event)
         end
     end
@@ -104,13 +104,12 @@ module Alexandria
       path, _, cell_x, cell_y = get_path_at_pos(event.x, event.y)
       return false if path.nil?
 
-      # call_parent = (event.state.control_mask? or event.state.shift_mask?) or !selected or event.button != 1
       (call_parent = !selection.path_is_selected?(path)) ||
         (event.button != 1)
 
       if call_parent
         signal_handler_block(@context.button_press_handler) do
-          signal_emit('button_press_event', event)
+          signal_emit("button_press_event", event)
         end
       end
 
@@ -122,11 +121,11 @@ module Alexandria
         @context.cell_x = cell_x
         @context.cell_y = cell_y
         @context.motion_notify_handler =
-          signal_connect('motion_notify_event') do |_widget, evnt, _data|
+          signal_connect("motion_notify_event") do |_widget, evnt, _data|
             motion_notify_event(evnt)
           end
         @context.button_release_handler =
-          signal_connect('button_release_event') do |_widget, evnt, _data|
+          signal_connect("button_release_event") do |_widget, evnt, _data|
             button_release_event(evnt)
           end
         @context.events << event unless call_parent

data/lib/alexandria/ui/{dialogs/new_book_dialog.rb → new_book_dialog.rb}

@@ -4,9 +4,10 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'gdk_pixbuf2'
-require 'alexandria/ui/builder_base'
-require 'alexandria/ui/dialogs/keep_bad_isbn_dialog'
+require "gdk_pixbuf2"
+require "alexandria/ui/builder_base"
+require "alexandria/ui/error_dialog"
+require "alexandria/ui/keep_bad_isbn_dialog"
 
 module Alexandria
   class DuplicateBookException < NameError
@@ -17,12 +18,12 @@ module Alexandria
       include Logging
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
       @@last_criterion_was_not_isbn = false
 
       def initialize(parent, selected_library = nil, &block)
-        super('new_book_dialog__builder.glade', widget_names)
-        log.info { 'New Book Dialog' }
+        super("new_book_dialog__builder.glade", widget_names)
+        log.info { "New Book Dialog" }
         @new_book_dialog.transient_for = @parent = parent
         @block = block
         @destroyed = false
@@ -31,6 +32,10 @@ module Alexandria
         @progressbar.hide
       end
 
+      def show
+        @new_book_dialog.show
+      end
+
       def widget_names
         [:new_book_dialog, :button_add, :button_cancel, :button_find,
          :button_help, :combo_libraries, :combo_search, :entry_isbn,
@@ -48,12 +53,12 @@ module Alexandria
         @treeview_results.model = Gtk::ListStore.new(String, String,
                                                      GdkPixbuf::Pixbuf)
         @treeview_results.selection.mode = :multiple
-        @treeview_results.selection.signal_connect('changed') do
+        @treeview_results.selection.signal_connect("changed") do
           @button_add.sensitive = true
         end
 
         renderer = Gtk::CellRendererPixbuf.new
-        col = Gtk::TreeViewColumn.new('', renderer)
+        col = Gtk::TreeViewColumn.new("", renderer)
         col.set_cell_data_func(renderer) do |_column, cell, _model, iter|
           pixbuf = iter[2]
           max_height = 25
@@ -67,7 +72,7 @@ module Alexandria
         end
         @treeview_results.append_column(col)
 
-        col = Gtk::TreeViewColumn.new('', Gtk::CellRendererText.new,
+        col = Gtk::TreeViewColumn.new("", Gtk::CellRendererText.new,
                                       text: 0)
         @treeview_results.append_column(col)
 
@@ -86,14 +91,14 @@ module Alexandria
         @find_thread = nil
         @image_thread = nil
 
-        @new_book_dialog.signal_connect('destroy') {
+        @new_book_dialog.signal_connect("destroy") do
           @new_book_dialog.destroy
           @destroyed = true
-        }
+        end
       end
 
       def on_criterion_toggled(item)
-        log.debug { 'on_criterion_toggled' }
+        log.debug { "on_criterion_toggled" }
         return unless item.active?
 
         # There used to be a strange effect here (pre SVN r1022).
@@ -138,19 +143,19 @@ module Alexandria
 
       def on_changed(entry)
         ok = !entry.text.strip.empty?
-        decode_cuecat?(@entry_isbn) if entry == @entry_isbn
+        decode_cuecat(@entry_isbn) if entry == @entry_isbn
         (entry == @entry_isbn ? @button_add : @button_find).sensitive = ok
       end
 
       def image_error_dialog(error)
         ErrorDialog.new(
           @parent,
-          _('A problem occurred while downloading images'),
+          _("A problem occurred while downloading images"),
           error)
       end
 
       def get_images_async
-        log.info { 'get_images_async' }
+        log.info { "get_images_async" }
         @images = {}
         @image_error = nil
         @image_thread = Thread.new do
@@ -160,7 +165,7 @@ module Alexandria
               uri = result[1]
               if uri
                 if URI.parse(uri).scheme.nil?
-                  File.open(uri, 'r') do |io|
+                  File.open(uri, "r") do |io|
                     @images[i] = io.read
                   end
                 else
@@ -168,8 +173,8 @@ module Alexandria
                 end
               end
             end
-          rescue StandardError => e
-            @image_error = e.message
+          rescue StandardError => ex
+            @image_error = ex.message
           end
         end
 
@@ -178,24 +183,22 @@ module Alexandria
             image_error_dialog(@image_error).display
           else
             @images.each_pair do |key, value|
-              begin
-                loader = GdkPixbuf::PixbufLoader.new
-                loader.last_write(value)
-                pixbuf = loader.pixbuf
-
-                if pixbuf.width > 1
-                  iter = @treeview_results.model.get_iter(key.to_s)
-                  unless @treeview_results.model.iter_is_valid?(iter)
-                    raise format('Iter is invalid! %s', iter)
-                  end
-
-                  iter[2] = pixbuf # I bet you this is it!
+              loader = GdkPixbuf::PixbufLoader.new
+              loader.last_write(value)
+              pixbuf = loader.pixbuf
+
+              if pixbuf.width > 1
+                iter = @treeview_results.model.get_iter(key.to_s)
+                unless @treeview_results.model.iter_is_valid?(iter)
+                  raise format(_("Iter is invalid! %s"), iter)
                 end
 
-                @images.delete(key)
-              rescue StandardError => e
-                image_error_dialog(e.message).display
+                iter[2] = pixbuf # I bet you this is it!
               end
+
+              @images.delete(key)
+            rescue StandardError => ex
+              image_error_dialog(ex.message).display
             end
           end
 
@@ -211,7 +214,7 @@ module Alexandria
       end
 
       def on_find
-        log.info { 'on_find' }
+        log.info { "on_find" }
         mode = case @combo_search.active
                when 0
                  BookProviders::SEARCH_BY_TITLE
@@ -223,11 +226,11 @@ module Alexandria
 
         criterion = @entry_search.text.strip
         @treeview_results.model.clear
-        log.info {
-          format('TreeStore Model: %s columns; ref_counts: %s',
+        log.info do
+          format("TreeStore Model: %s columns; ref_counts: %s",
                  @treeview_results.model.n_columns,
                  @treeview_results.model.ref_count)
-        }
+        end
 
         @find_error = nil
         @results = nil
@@ -244,8 +247,8 @@ module Alexandria
               @results = Alexandria::BookProviders.search(criterion, mode)
 
               log.info { "got #{@results.length} results" }
-            rescue StandardError => e
-              @find_error = e.message
+            rescue StandardError => ex
+              @find_error = ex.message
             ensure
               Alexandria::BookProviders.instance.delete_observer(self)
               # notify_end_add_by_isbn
@@ -261,7 +264,7 @@ module Alexandria
           # Err... continue == false if @find_error
           continue = if @find_error
                        ErrorDialog.new(@new_book_dialog,
-                                       _('Unable to find matches for your search'),
+                                       _("Unable to find matches for your search"),
                                        @find_error).display
                        false
                      elsif @results
@@ -285,15 +288,10 @@ module Alexandria
           # continue == false if @find_error OR if results are returned
           # timeout ends if continue is false!
 
-          unless continue
-            unless @find_thread.alive? # This happens after find_thread is done
-              unless @destroyed
-                # GLib::Source.remove(progress_pulsing)
-                # @progressbar.hide
-                notify_end_add_by_isbn
-                @button_add.sensitive = false
-              end
-            end
+          # @find_thread.alive? happens after find_thread is done
+          unless continue || @find_thread.alive? || @destroyed
+            notify_end_add_by_isbn
+            @button_add.sensitive = false
           end
 
           continue # timeout loop condition
@@ -302,13 +300,13 @@ module Alexandria
 
       def copy_results_to_treeview_model(results, model)
         results.each do |book, _cover_url|
-          s = format(_('%s, by %s'), book.title, book.authors.join(', '))
-          similar_books = results.find { |book2, _cover2|
+          s = format(_("%s, by %s"), book.title, book.authors.join(", "))
+          similar_books = results.find do |book2, _cover2|
             (book.title == book2.title) &&
               (book.authors == book2.authors)
-          }
+          end
           s += " (#{book.edition}, #{book.publisher})" if similar_books.length > 1
-          log.info { format('Copying %s into tree view.', book.title) }
+          log.info { format(_("Copying %s into tree view."), book.title) }
           iter = model.append
           iter[0] = s
           iter[1] = book.ident
@@ -316,14 +314,14 @@ module Alexandria
         end
       end
 
-      def decode_cuecat?(entry) # srsly?
-        if entry.text =~ /^\..*?\..*?\.(.*?)\.$/
-          tmp = Regexp.last_match[1].tr('a-zA-Z0-9+-', ' -_')
-          tmp = ((32 + tmp.length * 3 / 4).to_i.chr << tmp).unpack('u')[0]
-          tmp.chomp!("\000")
-          entry.text = tmp.gsub!(/./) { |c| (c[0] ^ 67).chr }
-          entry.text = 'Bad scan result' if entry.text.count('^ -~') > 0
-        end
+      def decode_cuecat(entry)
+        return unless entry.text =~ /^\..*?\..*?\.(.*?)\.$/
+
+        tmp = Regexp.last_match[1].tr("a-zA-Z0-9+-", " -_")
+        tmp = ((32 + tmp.length * 3 / 4).to_i.chr << tmp).unpack1("u")
+        tmp.chomp!("\000")
+        entry.text = tmp.gsub!(/./) { |c| (c[0] ^ 67).chr }
+        entry.text = "Bad scan result" if entry.text.count("^ -~") > 0
       end
 
       def on_results_button_press_event(_widget, event)
@@ -337,8 +335,8 @@ module Alexandria
                  Library.canonicalise_isbn(@entry_isbn.text)
                rescue StandardError
                  raise _("Couldn't validate the EAN/ISBN you " \
-                         'provided.  Make sure it is written ' \
-                         'correctly, and try again.')
+                         "provided.  Make sure it is written " \
+                         "correctly, and try again.")
                end
         assert_not_exist(library, @entry_isbn.text)
         @button_add.sensitive = false
@@ -354,17 +352,16 @@ module Alexandria
               notify_end_add_by_isbn
 
               if book
-
-                puts "adding book #{book} to library"
+                log.debug { "adding book #{book} to library" }
                 add_book_to_library(library, book, cover_url)
-                @entry_isbn.text = ''
+                @entry_isbn.text = ""
 
                 post_addition([book], library, is_new)
               else
                 post_addition([], library, is_new)
               end
-            rescue Alexandria::BookProviders::NoResultsError => e
-              @find_error = e.message
+            rescue Alexandria::BookProviders::NoResultsError => ex
+              @find_error = ex.message
               @button_add.sensitive = true
               notify_end_add_by_isbn
             ensure
@@ -385,7 +382,7 @@ module Alexandria
 
             isbn = book.isbn
             if isbn.nil? || isbn.empty?
-              puts 'noisbn'
+              log.debug { "noisbn" }
               book.isbn = book.saved_ident = nil
               books_to_add << [book, cover]
               next
@@ -393,7 +390,7 @@ module Alexandria
 
             isbn = Library.canonicalise_ean(isbn)
             unless isbn
-              puts "invalidisbn #{book.isbn}"
+              log.debug { "invalidisbn #{book.isbn}" }
               next unless KeepBadISBNDialog.new(@new_book_dialog, book).keep?
 
               book.isbn = book.saved_ident = nil
@@ -417,7 +414,7 @@ module Alexandria
       end
 
       def post_addition(books, library, is_new_library)
-        puts "post_addition #{books.size}"
+        log.debug { "post_addition #{books.size}" }
         return if books.empty?
 
         # books, a 1d array of Alexandria::Book
@@ -431,7 +428,7 @@ module Alexandria
             @entry_search.grab_focus
           else
             @button_add.sensitive = true #
-            @entry_isbn.text = '' # blank ISBN field
+            @entry_isbn.text = "" # blank ISBN field
             @entry_isbn.grab_focus
           end
 
@@ -464,9 +461,9 @@ module Alexandria
 
           # Do not destroy if there is no addition.
           #          return unless book_was_added
-        rescue StandardError => e
+        rescue StandardError => ex
           # FIXME: Message containing <> should be displayed correctly.
-          ErrorDialog.new(@new_book_dialog, _("Couldn't add the book"), e.message).display
+          ErrorDialog.new(@new_book_dialog, _("Couldn't add the book"), ex.message).display
         end
         # books_to_add
       end
@@ -492,10 +489,10 @@ module Alexandria
 
       def notify_end_add_by_isbn
         MainApp.instance.appbar.children.first.visible = false
-        if @progress_pulsing
-          GLib::Source.remove(@progress_pulsing)
-          @progress_pulsing = nil
-        end
+        return unless @progress_pulsing
+
+        GLib::Source.remove(@progress_pulsing)
+        @progress_pulsing = nil
       end
 
       def update(status, provider)
@@ -511,25 +508,26 @@ module Alexandria
       end
 
       def on_focus
-        if @isbn_radiobutton.active? && @entry_isbn.text.strip.empty?
-          clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
-          if (text = clipboard.wait_for_text)
-            if Library.valid_isbn?(text) || Library.valid_ean?(text) ||
-                Library.valid_upc?(text)
-              GLib::Idle.add do
-                @entry_isbn.text = text
-                @entry_isbn.grab_focus
-                @entry_isbn.select_region(0, -1) # select all...
-                # @button_add.grab_focus
-                false
-              end
-              log.debug { "Setting ISBN field to #{text}" }
-              puts text # required, strangely, to prevent GUI strangeness
-              # above last checked with ruby-gnome2 0.17.1 2009-12-09
-              # if this puts is commented out, the cursor disappears
-              # from the @entry_isbn box... weird, ne? - CathalMagus
-            end
+        return unless @isbn_radiobutton.active? && @entry_isbn.text.strip.empty?
+
+        clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
+        text = clipboard.wait_for_text or return
+
+        if Library.valid_isbn?(text) || Library.valid_ean?(text) ||
+            Library.valid_upc?(text)
+          GLib::Idle.add do
+            @entry_isbn.text = text
+            @entry_isbn.grab_focus
+            @entry_isbn.select_region(0, -1) # select all...
+            # @button_add.grab_focus
+            false
           end
+          log.debug { "Setting ISBN field to #{text}" }
+          # FIXME: Get rid of this puts!
+          puts text # required, strangely, to prevent GUI strangeness
+          # above last checked with ruby-gnome2 0.17.1 2009-12-09
+          # if this puts is commented out, the cursor disappears
+          # from the @entry_isbn box... weird, ne? - CathalMagus
         end
       end
 
@@ -537,19 +535,18 @@ module Alexandria
         if (event.event_type == :button_press) &&
             (event.button == 1)
 
-          radio, target_widget, box2, box3 = case widget
-                                             when @eventbox_entry_search
-                                               [@title_radiobutton, @entry_search,
-                                                @eventbox_combo_search, @eventbox_entry_isbn]
-
-                                             when @eventbox_combo_search
-                                               [@title_radiobutton, @combo_search,
-                                                @eventbox_entry_search, @eventbox_entry_isbn]
-
-                                             when @eventbox_entry_isbn
-                                               [@isbn_radiobutton, @entry_isbn,
-                                                @eventbox_entry_search, @eventbox_combo_search]
-                                             end
+          radio, target_widget, box2, box3 =
+            case widget
+            when @eventbox_entry_search
+              [@title_radiobutton, @entry_search,
+               @eventbox_combo_search, @eventbox_entry_isbn]
+            when @eventbox_combo_search
+              [@title_radiobutton, @combo_search,
+               @eventbox_entry_search, @eventbox_entry_isbn]
+            when @eventbox_entry_isbn
+              [@isbn_radiobutton, @entry_isbn,
+               @eventbox_entry_search, @eventbox_combo_search]
+            end
           radio.active = true
           target_widget.grab_focus
           widget.above_child = false
@@ -558,7 +555,7 @@ module Alexandria
       end
 
       def on_help
-        Alexandria::UI.display_help(@preferences_dialog, 'add-book-by-isbn')
+        Alexandria::UI.display_help(@preferences_dialog, "add-book-by-isbn")
       end
 
       private
@@ -568,10 +565,12 @@ module Alexandria
         isbn13 = Library.canonicalise_ean(isbn)
         return unless isbn13
 
-        if (book = library.find { |bk| bk.isbn == isbn13 })
-          raise DuplicateBookException, format(_("'%s' already exists in '%s' (titled '%s')."),
-                                               isbn, library.name, book.title.sub('&', '&amp;'))
-        end
+        book = library.find { |bk| bk.isbn == isbn13 }
+        return unless book
+
+        raise DuplicateBookException,
+              format(_("'%s' already exists in '%s' (titled '%s')."),
+                     isbn, library.name, book.title.sub("&", "&amp;"))
       end
     end
   end