alexandria-book-collection-manager 0.7.3 → 0.7.4

data/lib/alexandria/ui/builder_base.rb

@@ -8,7 +8,7 @@ module Alexandria
   module UI
     class BuilderBase
       def initialize(filename, widget_names)
-        file = File.join(Alexandria::Config::DATA_DIR, 'glade', filename)
+        file = File.join(Alexandria::Config::DATA_DIR, "glade", filename)
         builder = Gtk::Builder.new
         # TODO: This emits the warning 'GtkDialog mapped without a transient
         # parent. This is discouraged.'

data/lib/alexandria/ui/callbacks.rb

@@ -4,6 +4,8 @@
 #
 # See the file README.md for authorship and licensing information.
 
+require "alexandria/ui/really_delete_dialog"
+
 module Alexandria
   module UI
     module Callbacks
@@ -28,7 +30,7 @@ module Alexandria
       end
 
       def on_add_book(*)
-        log.info { 'on_add_book' }
+        log.info { "on_add_book" }
         NewBookDialog.new(@main_app, selected_library) do |_books, library, is_new|
           if is_new
             append_library(library, true)
@@ -41,24 +43,24 @@ module Alexandria
 
       def on_add_book_manual(*)
         library = selected_library
-        NewBookDialogManual.new(@main_app, library) { |_book|
+        NewBookDialogManual.new(@main_app, library) do |_book|
           refresh_books
-        }
+        end
       end
 
       def on_import(*)
         ImportDialog.new(@main_app).acquire do |library, bad_isbns, failed_isbns|
           unless bad_isbns.empty?
-            log.debug { 'bad_isbn' }
-            message = _('The following lines are not valid ISBNs and were not imported:')
+            log.debug { "bad_isbn" }
+            message = _("The following lines are not valid ISBNs and were not imported:")
             bad_isbn_warn = BadIsbnsDialog.new(@main_app, message, bad_isbns)
-            bad_isbn_warn.signal_connect('response') { bad_isbn_warn.destroy }
+            bad_isbn_warn.signal_connect("response") { bad_isbn_warn.destroy }
           end
           unless failed_isbns.nil? || failed_isbns.empty?
             log.debug { "failed lookup of #{failed_isbns.size} ISBNs" }
-            message = _('Books could not be found for the following ISBNs:')
+            message = _("Books could not be found for the following ISBNs:")
             failed_lookup = BadIsbnsDialog.new(@main_app, message, failed_isbns)
-            failed_lookup.signal_connect('response') { failed_lookup.destroy }
+            failed_lookup.signal_connect("response") { failed_lookup.destroy }
           end
           @libraries.add_library(library)
           append_library(library, true)
@@ -67,29 +69,29 @@ module Alexandria
       end
 
       def on_window_state_event(_window, event)
-        log.debug { 'window-state-event' }
+        log.debug { "window-state-event" }
         @maximized = event.new_window_state == :maximized if event.is_a?(Gdk::EventWindowState)
-        log.debug { 'end window-state-event' }
+        log.debug { "end window-state-event" }
       end
 
       def on_toolbar_view_as_changed(cb)
-        log.debug { 'changed' }
+        log.debug { "changed" }
         action = case cb.active
                  when 0
-                   @actiongroup['AsIcons']
+                   @actiongroup["AsIcons"]
                  when 1
-                   @actiongroup['AsList']
+                   @actiongroup["AsList"]
                  end
         action.active = true
       end
 
       def on_window_destroy(_window)
-        log.debug { 'destroy' }
-        @actiongroup['Quit'].activate
+        log.debug { "destroy" }
+        @actiongroup["Quit"].activate
       end
 
       def on_toolbar_filter_entry_changed(_entry)
-        log.debug { 'changed' }
+        log.debug { "changed" }
         @filter_entry.text.strip!
         @iconview.freeze
         @filtered_model.refilter
@@ -97,7 +99,7 @@ module Alexandria
       end
 
       def on_criterion_combobox_changed(cb)
-        log.debug { 'changed' }
+        log.debug { "changed" }
         @filter_books_mode = cb.active
         @filter_entry.text.strip!
         @iconview.freeze
@@ -158,7 +160,7 @@ module Alexandria
       end
 
       def on_select_all(*)
-        log.debug { 'on_select_all' }
+        log.debug { "on_select_all" }
         case @notebook.page
         when 0
           @iconview.select_all
@@ -168,7 +170,7 @@ module Alexandria
       end
 
       def on_deselect_all(*)
-        log.debug { 'on_deselect_all' }
+        log.debug { "on_deselect_all" }
         case @notebook.page
         when 0
           @iconview.unselect_all
@@ -210,7 +212,7 @@ module Alexandria
         is_smart = library.is_a?(SmartLibrary)
         last_library = (@libraries.all_regular_libraries.length == 1)
         if books.nil? && !is_smart && last_library
-          log.warn { 'Attempted to delete last library, fix GUI' }
+          log.warn { "Attempted to delete last library, fix GUI" }
           return
         end
         if library.empty? || ReallyDeleteDialog.new(@main_app,
@@ -221,7 +223,7 @@ module Alexandria
       end
 
       def on_clear_search_results(*)
-        @filter_entry.text = ''
+        @filter_entry.text = ""
         @iconview.freeze
         @filtered_model.refilter
         @iconview.unfreeze
@@ -250,129 +252,130 @@ module Alexandria
       end
 
       def on_view_sidepane(action)
-        log.debug { 'on_view_sidepane' }
+        log.debug { "on_view_sidepane" }
         @paned.child1.visible = action.active?
       end
 
       def on_view_toolbar(action)
-        log.debug { 'on_view_toolbar' }
+        log.debug { "on_view_toolbar" }
         @toolbar.visible = action.active?
       end
 
       def on_view_statusbar(action)
-        log.debug { 'on_view_statusbar' }
+        log.debug { "on_view_statusbar" }
         @appbar.visible = action.active?
       end
 
       def on_reverse_order(action)
-        log.debug { 'on_reverse_order' }
+        log.debug { "on_reverse_order" }
         Preferences.instance.reverse_icons = action.active?
         Preferences.instance.save!
         setup_books_iconview_sorting
       end
 
       def connect_signals
-        # rubocop:disable LineLength
+        # rubocop:disable Metrics/LineLength
         standard_actions = [
-          ['LibraryMenu', nil, _('_Library')],
-          ['New', Gtk::Stock::NEW, _('_New Library'), '<control>L', _('Create a new library'), method(:on_new)],
-          ['NewSmart', nil, _('New _Smart Library...'), '<control><shift>L', _('Create a new smart library'), method(:on_new_smart)],
-          ['AddBook', Gtk::Stock::ADD, _('_Add Book...'), '<control>N', _('Add a new book from the Internet'), method(:on_add_book)],
-          ['AddBookManual', nil, _('Add Book _Manually...'), '<control><shift>N', _('Add a new book manually'), method(:on_add_book_manual)],
-          ['Import', nil, _('_Import...'), '<control>I', _('Import a library'), method(:on_import)],
-          ['Export', nil, _('_Export...'), '<control><shift>E', _('Export the selected library'), method(:on_export)],
-          ['Acquire', nil, _('A_cquire from Scanner...'), '<control><shift>S', _('Acquire books from a scanner'), method(:on_acquire)],
-          ['Properties', Gtk::Stock::PROPERTIES, _('_Properties'), nil, _('Edit the properties of the selected book'), method(:on_properties)],
-          ['Quit', Gtk::Stock::QUIT, _('_Quit'), '<control>Q', _('Quit the program'), method(:on_quit)],
-          ['EditMenu', nil, _('_Edit')],
-          ['Undo', Gtk::Stock::UNDO, _('_Undo'), '<control>Z', _('Undo the last action'), method(:on_undo)],
-          ['Redo', Gtk::Stock::REDO, _('_Redo'), '<control><shift>Z', _('Redo the undone action'), method(:on_redo)],
-          ['SelectAll', nil, _('_Select All'), '<control>A', _('Select all visible books'), method(:on_select_all)],
-          ['DeselectAll', nil, _('Dese_lect All'), '<control><shift>A', _('Deselect everything'), method(:on_deselect_all)],
-          ['SetRating', nil, _('My _Rating')],
-          ['SetRating0', nil, _('None'), nil, nil, proc { on_set_rating[0].call }],
-          ['SetRating1', nil, _('One Star'), nil, nil, proc { on_set_rating[1].call }],
-          ['SetRating2', nil, _('Two Stars'), nil, nil, proc { on_set_rating[2].call }],
-          ['SetRating3', nil, _('Three Stars'), nil, nil, proc { on_set_rating[3].call }],
-          ['SetRating4', nil, _('Four Stars'), nil, nil, proc { on_set_rating[4].call }],
-          ['SetRating5', nil, _('Five Stars'), nil, nil, proc { on_set_rating[5].call }],
-          ['Move', nil, _('_Move')],
-          ['Rename', nil, _('_Rename'), nil, nil, method(:on_rename)],
-          ['Delete', Gtk::Stock::DELETE, _('_Delete'), 'Delete', _('Delete the selected books or library'), method(:on_delete)],
-          ['Search', Gtk::Stock::FIND, _('_Search'), '<control>F', _('Filter books'), method(:on_search)],
-          ['ClearSearchResult', Gtk::Stock::CLEAR, _('_Clear Results'), '<control><alt>B', _('Clear the search results'), method(:on_clear_search_results)],
-          ['Preferences', Gtk::Stock::PREFERENCES, _('_Preferences'), '<control>O', _("Change Alexandria's settings"), method(:on_preferences)],
-          ['ViewMenu', nil, _('_View')],
-          ['ArrangeIcons', nil, _('Arran_ge Icons')],
-          ['OnlineInformation', nil, _('Display Online _Information')],
-
-          ['HelpMenu', nil, _('_Help')],
-          ['SubmitBugReport', Gtk::Stock::EDIT, _('Submit _Bug Report'), nil, _('Submit a bug report to the developers'), method(:on_submit_bug_report)],
-          ['Help', Gtk::Stock::HELP, _('Contents'), 'F1', _("View Alexandria's manual"), method(:on_help)],
-          ['About', Gtk::Stock::ABOUT, _('_About'), nil, _('Show information about Alexandria'), method(:on_about)],
+          ["LibraryMenu", nil, _("_Library")],
+          ["New", Gtk::Stock::NEW, _("_New Library"), "<control>L", _("Create a new library"), method(:on_new)],
+          ["NewSmart", nil, _("New _Smart Library..."), "<control><shift>L", _("Create a new smart library"), method(:on_new_smart)],
+          ["AddBook", Gtk::Stock::ADD, _("_Add Book..."), "<control>N", _("Add a new book from the Internet"), method(:on_add_book)],
+          ["AddBookManual", nil, _("Add Book _Manually..."), "<control><shift>N", _("Add a new book manually"), method(:on_add_book_manual)],
+          ["Import", nil, _("_Import..."), "<control>I", _("Import a library"), method(:on_import)],
+          ["Export", nil, _("_Export..."), "<control><shift>E", _("Export the selected library"), method(:on_export)],
+          ["Acquire", nil, _("A_cquire from Scanner..."), "<control><shift>S", _("Acquire books from a scanner"), method(:on_acquire)],
+          ["Properties", Gtk::Stock::PROPERTIES, _("_Properties"), nil, _("Edit the properties of the selected book"), method(:on_properties)],
+          ["Quit", Gtk::Stock::QUIT, _("_Quit"), "<control>Q", _("Quit the program"), method(:on_quit)],
+          ["EditMenu", nil, _("_Edit")],
+          ["Undo", Gtk::Stock::UNDO, _("_Undo"), "<control>Z", _("Undo the last action"), method(:on_undo)],
+          ["Redo", Gtk::Stock::REDO, _("_Redo"), "<control><shift>Z", _("Redo the undone action"), method(:on_redo)],
+          ["SelectAll", nil, _("_Select All"), "<control>A", _("Select all visible books"), method(:on_select_all)],
+          ["DeselectAll", nil, _("Dese_lect All"), "<control><shift>A", _("Deselect everything"), method(:on_deselect_all)],
+          ["SetRating", nil, _("My _Rating")],
+          ["SetRating0", nil, _("None"), nil, nil, proc { on_set_rating[0].call }],
+          ["SetRating1", nil, _("One Star"), nil, nil, proc { on_set_rating[1].call }],
+          ["SetRating2", nil, _("Two Stars"), nil, nil, proc { on_set_rating[2].call }],
+          ["SetRating3", nil, _("Three Stars"), nil, nil, proc { on_set_rating[3].call }],
+          ["SetRating4", nil, _("Four Stars"), nil, nil, proc { on_set_rating[4].call }],
+          ["SetRating5", nil, _("Five Stars"), nil, nil, proc { on_set_rating[5].call }],
+          ["Move", nil, _("_Move")],
+          ["Rename", nil, _("_Rename"), nil, nil, method(:on_rename)],
+          ["Delete", Gtk::Stock::DELETE, _("_Delete"), "Delete", _("Delete the selected books or library"), method(:on_delete)],
+          ["Search", Gtk::Stock::FIND, _("_Search"), "<control>F", _("Filter books"), method(:on_search)],
+          ["ClearSearchResult", Gtk::Stock::CLEAR, _("_Clear Results"), "<control><alt>B", _("Clear the search results"), method(:on_clear_search_results)],
+          ["Preferences", Gtk::Stock::PREFERENCES, _("_Preferences"), "<control>O", _("Change Alexandria's settings"), method(:on_preferences)],
+          ["ViewMenu", nil, _("_View")],
+          ["ArrangeIcons", nil, _("Arran_ge Icons")],
+          ["OnlineInformation", nil, _("Display Online _Information")],
+
+          ["HelpMenu", nil, _("_Help")],
+          ["SubmitBugReport", Gtk::Stock::EDIT, _("Submit _Bug Report"), nil, _("Submit a bug report to the developers"), method(:on_submit_bug_report)],
+          ["Help", Gtk::Stock::HELP, _("Contents"), "F1", _("View Alexandria's manual"), method(:on_help)],
+          ["About", Gtk::Stock::ABOUT, _("_About"), nil, _("Show information about Alexandria"), method(:on_about)],
         ]
-        # rubocop:enable LineLength
+        # rubocop:enable Metrics/LineLength
 
         toggle_actions = [
-          ['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), false],
+          ["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), false],
         ]
 
         view_as_actions = [
-          ['AsIcons', nil, _('View as _Icons'), nil, nil, 0],
-          ['AsList', nil, _('View as _List'), nil, nil, 1]
+          ["AsIcons", nil, _("View as _Icons"), nil, nil, 0],
+          ["AsList", nil, _("View as _List"), nil, nil, 1]
         ]
 
         arrange_icons_actions = [
-          ['ByTitle', nil, _('By _Title'), nil, nil, 0],
-          ['ByAuthors', nil, _('By _Authors'), nil, nil, 1],
-          ['ByISBN', nil, _('By _ISBN'), nil, nil, 2],
-          ['ByPublisher', nil, _('By _Publisher'), nil, nil, 3],
-          ['ByEdition', nil, _('By _Binding'), nil, nil, 4],
-          ['ByRating', nil, _('By _Rating'), nil, nil, 5]
+          ["ByTitle", nil, _("By _Title"), nil, nil, 0],
+          ["ByAuthors", nil, _("By _Authors"), nil, nil, 1],
+          ["ByISBN", nil, _("By _ISBN"), nil, nil, 2],
+          ["ByPublisher", nil, _("By _Publisher"), nil, nil, 3],
+          ["ByEdition", nil, _("By _Binding"), nil, nil, 4],
+          ["ByRating", nil, _("By _Rating"), nil, nil, 5]
         ]
         providers_actions = BookProviders.map do |provider|
           [provider.action_name, Gtk::Stock::JUMP_TO,
-           _('At _%s') % provider.fullname, nil, nil,
+           _("At _%s") % provider.fullname, nil, nil,
            proc { open_web_browser(provider.url(selected_books.first)) }]
         end
 
-        log.debug { 'Adding actions to @actiongroup' }
+        log.debug { "Adding actions to @actiongroup" }
 
-        @actiongroup = Gtk::ActionGroup.new('actions')
+        @actiongroup = Gtk::ActionGroup.new("actions")
 
         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)
-          action.signal_connect('activate', &callback) if callback
+          action.signal_connect("activate", &callback) if callback
         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)
-          action.signal_connect('activate', &callback) if callback
+          action.signal_connect("activate", &callback) if callback
         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)
-          action.signal_connect('toggled', &callback) if callback
+          action.signal_connect("toggled", &callback) if callback
         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
+          if first_action
+            action.join_group first_action
+          else
+            first_action = action
+          end
           @actiongroup.add_action_with_accel(action, accelerator)
         end
 
-        first_action.signal_connect 'changed' do |_action, current, _user_data|
+        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
@@ -380,17 +383,18 @@ module Alexandria
           end
         end
 
-        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
+          if first_action
+            action.join_group first_action
+          else
+            first_action = action
+          end
           @actiongroup.add_action_with_accel(action, accelerator)
         end
 
-        first_action.signal_connect 'changed' do |_action, current, _user_data|
+        first_action.signal_connect "changed" do |_action, current, _user_data|
           @prefs.arrange_icons_mode = current.current_value
           setup_books_iconview_sorting
         end

data/lib/alexandria/ui/completion_models.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2005-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 EntryOverrides
@@ -44,21 +30,21 @@ module Alexandria
       complete(Alexandria::UI::CompletionModels::TAG)
       # min = self.completion.minimum_key_length
       min = 2
-      completion.signal_connect('match-selected') do |c, model, iter|
+      completion.signal_connect("match-selected") do |c, model, iter|
         cur_text = c.entry.text
         # TODO: Replace with iter[0] if possible
         new_tag = model.get_value(iter, 0)
-        cur_text_split = cur_text.split(',')
+        cur_text_split = cur_text.split(",")
         cur_text_split.delete_at(-1)
         cur_text_split << new_tag
-        c.entry.text = cur_text_split.join(',')
+        c.entry.text = cur_text_split.join(",")
         true
       end
       completion.set_match_func do |_comp, key, iter|
-        cur_tag = key.split(',').last.strip
+        cur_tag = key.split(",").last.strip
         if cur_tag.size >= min
           begin
-            if iter[0] =~ /^#{cur_tag}/
+            if /^#{cur_tag}/.match?(iter[0])
               true
             else
               false

data/lib/alexandria/ui/confirm_erase_dialog.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/alert_dialog"
+
+module Alexandria
+  module UI
+    class ConfirmEraseDialog < AlertDialog
+      include GetText
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
+
+      def initialize(parent, filename)
+        super(parent, _("File already exists"),
+              Gtk::Stock::DIALOG_QUESTION,
+              [[Gtk::Stock::CANCEL, :cancel],
+               [_("_Replace"), :ok]],
+              _("A file named '%s' already exists.  Do you want " \
+                "to replace it with the one you are generating?") % filename)
+        # FIXME: Should accept just :cancel
+        self.default_response = Gtk::ResponseType::CANCEL
+      end
+
+      def erase?
+        show_all && (@response = run)
+        destroy
+        @response == Gtk::ResponseType::OK
+      end
+    end
+  end
+end

data/lib/alexandria/ui/conflict_while_copying_dialog.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/alert_dialog"
+
+module Alexandria
+  module UI
+    class ConflictWhileCopyingDialog < AlertDialog
+      include GetText
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
+
+      def initialize(parent, library, book)
+        super(parent,
+              format(_("The book '%s' already exists in '%s'. Would you like " \
+                "to replace it?"), book.title, library.name),
+              Gtk::Stock::DIALOG_QUESTION,
+              [[_("_Skip"), Gtk::ResponseType::CANCEL],
+               [_("_Replace"), Gtk::ResponseType::OK]],
+              _("If you replace the existing book, its contents will " \
+                "be overwritten."))
+        self.default_response = Gtk::ResponseType::CANCEL
+      end
+
+      def replace?
+        show_all && (@response = run)
+        destroy
+        @response == Gtk::ResponseType::OK
+      end
+    end
+  end
+end