alexandria-book-collection-manager 0.7.3 → 0.7.4

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

@@ -4,21 +4,23 @@
 #
 # See the file README.md for authorship and licensing information.
 
+require "alexandria/ui/alert_dialog"
+
 module Alexandria
   module UI
     class KeepBadISBNDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, book)
         title = _("Invalid ISBN '%s'") % book.isbn
         message = _("The book titled '%s' has an invalid ISBN, but still " \
-                    'exists in the providers libraries.  Do you want to ' \
-                    'keep the book but change the ISBN or cancel the addition?') % book.title
+                    "exists in the providers libraries.  Do you want to " \
+                    "keep the book but change the ISBN or cancel the addition?") % book.title
         super(parent, title,
               Gtk::Stock::DIALOG_QUESTION,
               [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
-               [_('_Keep'), Gtk::ResponseType::OK]], message)
+               [_("_Keep"), Gtk::ResponseType::OK]], message)
         self.default_response = Gtk::ResponseType::OK
       end
 

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,10 +33,6 @@ 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
@@ -44,10 +40,10 @@ module Alexandria
         iter[1] = library_name
         iter[2] = false
       end
-      model.append[1] = '-'
+      model.append[1] = "-"
       iter = model.append
       iter[0] = Alexandria::UI::Icons::LIBRARY_SMALL
-      iter[1] = _('New Library')
+      iter[1] = _("New Library")
       iter[2] = true
       renderer = Gtk::CellRendererPixbuf.new
       pack_start(renderer, false)
@@ -55,6 +51,10 @@ module Alexandria
       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

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
@@ -84,8 +84,8 @@ module Alexandria
 
       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 +96,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,7 +127,7 @@ module Alexandria
       def setup_check_column(title, iterid)
         renderer = CellRendererToggle.new
         renderer.activatable = true
-        renderer.signal_connect('toggled') do |_rndrr, path|
+        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)
@@ -159,24 +159,24 @@ module Alexandria
               end
 
             end
-          rescue StandardError => e
-            log.error { "toggle failed for path #{path} #{e}\n" + e.backtrace.join("\n") }
+          rescue StandardError => ex
+            log.error { "toggle failed for path #{path} #{ex}\n" + e.backtrace.join("\n") }
           end
         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)
+        column.add_attribute(renderer, "inconsistent", Columns::OWN) if iterid == Columns::WANT
 
         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 +187,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,
@@ -204,9 +204,9 @@ module Alexandria
         ]
         cols = @listview.columns[1..-1] # skip "Title"
         cols.each_index do |i|
-          cols[i].visible = cols_visibility[i]
+          cols[i].visible = !!cols_visibility[i]
         end
-        log.debug { 'Columns visibility: ' + cols.map { |col| "#{col.title} #{col.visible?}" }.join(', ') }
+        log.debug { "Columns visibility: " + cols.map { |col| "#{col.title} #{col.visible?}" }.join(", ") }
       end
 
       # Sets the width of each column based on any respective
@@ -227,10 +227,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,34 +19,32 @@
 # 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
@@ -55,7 +53,7 @@ module Alexandria
       attr_accessor :main_app, :libraries, :actiongroup, :appbar, :prefs
       attr_accessor :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

@@ -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
@@ -110,7 +110,7 @@ module Alexandria
 
       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 +122,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
@@ -48,12 +49,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 +68,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 +87,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).
@@ -145,12 +146,12 @@ module Alexandria
       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 +161,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 +169,8 @@ module Alexandria
                 end
               end
             end
-          rescue StandardError => e
-            @image_error = e.message
+          rescue StandardError => ex
+            @image_error = ex.message
           end
         end
 
@@ -186,15 +187,15 @@ module Alexandria
                 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)
+                    raise format("Iter is invalid! %s", iter)
                   end
 
                   iter[2] = pixbuf # I bet you this is it!
                 end
 
                 @images.delete(key)
-              rescue StandardError => e
-                image_error_dialog(e.message).display
+              rescue StandardError => ex
+                image_error_dialog(ex.message).display
               end
             end
           end
@@ -211,7 +212,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 +224,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 +245,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 +262,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
@@ -302,13 +303,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
@@ -318,11 +319,11 @@ module Alexandria
 
       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 = 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
+          entry.text = "Bad scan result" if entry.text.count("^ -~") > 0
         end
       end
 
@@ -337,8 +338,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
@@ -357,14 +358,14 @@ module Alexandria
 
                 puts "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 +386,7 @@ module Alexandria
 
             isbn = book.isbn
             if isbn.nil? || isbn.empty?
-              puts 'noisbn'
+              puts "noisbn"
               book.isbn = book.saved_ident = nil
               books_to_add << [book, cover]
               next
@@ -431,7 +432,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 +465,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
@@ -558,7 +559,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
@@ -570,7 +571,7 @@ module Alexandria
 
         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;'))
+                                               isbn, library.name, book.title.sub("&", "&amp;"))
         end
       end
     end