alexandria-book-collection-manager 0.7.5 → 0.7.6

data/lib/alexandria/ui/callbacks.rb

@@ -13,7 +13,7 @@ module Alexandria
 
       def on_new(*)
         name = Library.generate_new_name(@libraries.all_libraries)
-        library = Library.load(name)
+        library = @libraries.library_store.load_library(name)
         @libraries.add_library(library)
         append_library(library, true)
         setup_move_actions
@@ -21,17 +21,17 @@ module Alexandria
       end
 
       def on_new_smart(*)
-        NewSmartLibraryDialog.new(@main_app).acquire do |smart_library|
-          smart_library.refilter
-          @libraries.add_library(smart_library)
-          append_library(smart_library, true)
-          smart_library.save
-        end
+        smart_library = NewSmartLibraryDialog.new(@main_app).acquire or return
+
+        smart_library.refilter
+        @libraries.add_library(smart_library)
+        append_library(smart_library, true)
+        smart_library.save
       end
 
       def on_add_book(*)
         log.info { "on_add_book" }
-        NewBookDialog.new(@main_app, selected_library) do |_books, library, is_new|
+        dialog = NewBookDialog.new(@main_app, selected_library) do |_books, library, is_new|
           if is_new
             append_library(library, true)
             setup_move_actions
@@ -39,13 +39,15 @@ module Alexandria
             select_library(library)
           end
         end
+        dialog.show
       end
 
       def on_add_book_manual(*)
         library = selected_library
-        NewBookDialogManual.new(@main_app, library) do |_book|
+        dialog = NewBookDialogManual.new(@main_app, library) do |_book|
           refresh_books
         end
+        dialog.show
       end
 
       def on_import(*)
@@ -53,14 +55,12 @@ module Alexandria
           unless bad_isbns.empty?
             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 }
+            BadIsbnsDialog.new(@main_app, message, bad_isbns).show
           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:")
-            failed_lookup = BadIsbnsDialog.new(@main_app, message, failed_isbns)
-            failed_lookup.signal_connect("response") { failed_lookup.destroy }
+            BadIsbnsDialog.new(@main_app, message, failed_isbns).show
           end
           @libraries.add_library(library)
           append_library(library, true)
@@ -76,9 +76,9 @@ module Alexandria
         log.debug { "end window-state-event" }
       end
 
-      def on_toolbar_view_as_changed(cb)
+      def on_toolbar_view_as_changed(widget)
         log.debug { "changed" }
-        action = case cb.active
+        action = case widget.active
                  when 0
                    @actiongroup["AsIcons"]
                  when 1
@@ -100,9 +100,9 @@ module Alexandria
         @iconview.unfreeze
       end
 
-      def on_criterion_combobox_changed(cb)
+      def on_criterion_combobox_changed(widget)
         log.debug { "changed" }
-        @filter_books_mode = cb.active
+        @filter_books_mode = widget.active
         @filter_entry.text.strip!
         @iconview.freeze
         @filtered_model.refilter
@@ -114,22 +114,25 @@ module Alexandria
       end
 
       def on_acquire(*)
-        AcquireDialog.new(@main_app,
-                          selected_library) do |_books, library, is_new|
-                            if is_new
-                              append_library(library, true)
-                              setup_move_actions
-                            elsif selected_library != library
-                              select_library(library)
-                            end
-                          end
+        dialog =
+          AcquireDialog.new(@main_app, selected_library) do |_books, library, is_new|
+            if is_new
+              append_library(library, true)
+              setup_move_actions
+            elsif selected_library != library
+              select_library(library)
+            end
+          end
+        dialog.show
       end
 
       def on_properties(*)
         if @library_listview.focus? || selected_books.empty?
           library = selected_library
           if library.is_a?(SmartLibrary)
-            SmartLibraryPropertiesDialog.new(@main_app, library).acquire do
+            success = SmartLibraryPropertiesDialog.new(@main_app, library).acquire
+
+            if success
               library.refilter
               refresh_books
             end
@@ -138,9 +141,10 @@ module Alexandria
           books = selected_books
           if books.length == 1
             book = books.first
-            BookPropertiesDialog.new(@main_app,
-                                     selected_library,
-                                     book) # { |modified_book| }
+            dialog = BookPropertiesDialog.new(@main_app,
+                                              selected_library,
+                                              book)
+            dialog.show
           end
         end
       end
@@ -236,9 +240,10 @@ module Alexandria
       end
 
       def on_preferences(*)
-        PreferencesDialog.new(@main_app) do
+        dialog = PreferencesDialog.new(@main_app) do
           @listview_manager.setup_listview_columns_visibility
         end
+        dialog.show
       end
 
       def on_submit_bug_report(*)
@@ -276,90 +281,36 @@ module Alexandria
       end
 
       def connect_signals
-        # rubocop:disable Layout/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)],
-        ]
-
-        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],
-        ]
-
-        view_as_actions = [
-          ["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]
-        ]
-        # rubocop:enable Layout/LineLength
-
-        providers_actions = BookProviders.map do |provider|
-          [provider.action_name, Gtk::Stock::JUMP_TO,
-           _("At _%s") % provider.fullname, nil, nil,
-           proc { open_web_browser(provider.url(selected_books.first)) }]
-        end
-
         log.debug { "Adding actions to @actiongroup" }
 
         @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
-        end
+        connect_standard_actions
+        connect_providers_actions
+        connect_toggle_actions
+        connect_view_actions
+        connect_arrange_icons_actions
+      end
+
+      private
+
+      def connect_standard_actions
+        connect_actions standard_actions
+      end
+
+      def connect_providers_actions
+        connect_actions providers_actions
+      end
 
-        providers_actions.each do |name, stock_id, label, accelerator, tooltip, callback|
+      def connect_actions(actions)
+        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
         end
+      end
 
+      def connect_toggle_actions
         toggle_actions
           .each do |name, stock_id, label, accelerator, tooltip, callback, is_active|
           action = Gtk::ToggleAction.new(name, label: label, tooltip: tooltip,
@@ -368,18 +319,10 @@ module Alexandria
           @actiongroup.add_action_with_accel(action, accelerator)
           action.signal_connect("toggled", &callback) if callback
         end
+      end
 
-        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)
-          if first_action
-            action.join_group first_action
-          else
-            first_action = action
-          end
-          @actiongroup.add_action_with_accel(action, accelerator)
-        end
+      def connect_view_actions
+        first_action = connect_radio_actions view_as_actions
 
         first_action.signal_connect "changed" do |_action, current, _user_data|
           @notebook.page = current.current_value
@@ -388,9 +331,20 @@ module Alexandria
             @toolbar_view_as.active = current.current_value
           end
         end
+      end
 
+      def connect_arrange_icons_actions
+        first_action = connect_radio_actions arrange_icons_actions
+
+        first_action.signal_connect "changed" do |_action, current, _user_data|
+          @prefs.arrange_icons_mode = current.current_value
+          setup_books_iconview_sorting
+        end
+      end
+
+      def connect_radio_actions(actions)
         first_action = nil
-        arrange_icons_actions.each do |name, stock_id, label, accelerator, tooltip, value|
+        actions.each do |name, stock_id, label, accelerator, tooltip, value|
           action = Gtk::RadioAction.new(name, value, label: label, tooltip: tooltip,
                                         stock_id: stock_id)
           if first_action
@@ -400,12 +354,79 @@ module Alexandria
           end
           @actiongroup.add_action_with_accel(action, accelerator)
         end
+        first_action
+      end
 
-        first_action.signal_connect "changed" do |_action, current, _user_data|
-          @prefs.arrange_icons_mode = current.current_value
-          setup_books_iconview_sorting
+      def standard_actions
+        # rubocop:disable Layout/LineLength
+        [["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 Layout/LineLength
+      end
+
+      def providers_actions
+        BookProviders.list.map do |provider|
+          [provider.action_name, Gtk::Stock::JUMP_TO,
+           _("At _%s") % provider.fullname, nil, nil,
+           proc { open_web_browser(provider.url(selected_books.first)) }]
         end
       end
+
+      def 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]]
+      end
+
+      def view_as_actions
+        [["AsIcons", nil, _("View as _Icons"), nil, nil, 0],
+         ["AsList", nil, _("View as _List"), nil, nil, 1]]
+      end
+
+      def 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]]
+      end
     end
   end
 end

data/lib/alexandria/ui/completion_models.rb

@@ -164,7 +164,7 @@ module Alexandria
             editions << book.edition
             borrowers << book.loaned_to
             # TODO: Ensure #tags is always an array
-            (book.tags || []).each { |tag| tags << tag }
+            tags.concat(book.tags) if book.tags
           end
         end
 

data/lib/alexandria/ui/confirm_erase_dialog.rb

@@ -20,7 +20,7 @@ module Alexandria
               _("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
+        dialog.default_response = Gtk::ResponseType::CANCEL
       end
 
       def erase?

data/lib/alexandria/ui/conflict_while_copying_dialog.rb

@@ -21,7 +21,7 @@ module Alexandria
                [_("_Replace"), Gtk::ResponseType::OK]],
               _("If you replace the existing book, its contents will " \
                 "be overwritten."))
-        self.default_response = Gtk::ResponseType::CANCEL
+        dialog.default_response = Gtk::ResponseType::CANCEL
       end
 
       def replace?

data/lib/alexandria/ui/error_dialog.rb

@@ -13,7 +13,7 @@ module Alexandria
         super(parent, title, Gtk::Stock::DIALOG_ERROR,
               [[Gtk::Stock::OK, :ok]], message)
         # FIXME: Should accept just :ok
-        self.default_response = Gtk::ResponseType::OK
+        dialog.default_response = Gtk::ResponseType::OK
       end
 
       def display

data/lib/alexandria/ui/export_dialog.rb

@@ -10,7 +10,7 @@ require "alexandria/ui/error_dialog"
 
 module Alexandria
   module UI
-    class ExportDialog < SimpleDelegator
+    class ExportDialog
       include GetText
       extend GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
@@ -19,16 +19,14 @@ module Alexandria
       THEMES = Alexandria::WebTheme.all
 
       def initialize(parent, library, sort_order)
-        @export_dialog = Gtk::FileChooserDialog.new(title: _("Export '%s'") % library.name,
-                                                    parent: parent,
-                                                    action: :save,
-                                                    buttons: [[Gtk::Stock::HELP, :help],
-                                                              [Gtk::Stock::CANCEL, :cancel],
-                                                              [_("_Export"), :accept]])
-        super(@export_dialog)
-
-        self.current_name = library.name
-        signal_connect("destroy") { hide }
+        @dialog = Gtk::FileChooserDialog.new(title: _("Export '%s'") % library.name,
+                                             parent: parent,
+                                             action: :save,
+                                             buttons: [[Gtk::Stock::HELP, :help],
+                                                       [Gtk::Stock::CANCEL, :cancel],
+                                                       [_("_Export"), :accept]])
+        @dialog.current_name = library.name
+        @dialog.signal_connect("destroy") { @dialog.hide }
 
         @parent = parent
         @library = library
@@ -84,7 +82,7 @@ module Alexandria
         grid.attach theme_label, 0, 1, 1, 1
         grid.attach @theme_combo, 1, 1, 1, 1
         grid.attach preview_image, 2, 0, 1, 3
-        set_extra_widget grid
+        @dialog.set_extra_widget grid
       end
 
       def perform
@@ -98,7 +96,7 @@ module Alexandria
               break if on_export(FORMATS[@types_combo.active],
                                  THEMES[@theme_combo.active])
             rescue StandardError => ex
-              ErrorDialog.new(@export_dialog, _("Export failed"), ex.message).display
+              ErrorDialog.new(@dialog, _("Export failed"), ex.message).display
             end
           end
         end
@@ -112,7 +110,7 @@ module Alexandria
         if format.ext
           filename += "." + format.ext if File.extname(filename).empty?
           if File.exist?(filename)
-            dialog = ConfirmEraseDialog.new(@export_dialog, filename)
+            dialog = ConfirmEraseDialog.new(@dialog, filename)
             return unless dialog.erase?
 
             FileUtils.rm(filename)
@@ -125,7 +123,7 @@ module Alexandria
                       "file.  A directory is needed for this " \
                       "operation.  Please select a directory and " \
                       "try again.") % filename
-              ErrorDialog.new(@export_dialog, _("Not a directory"), msg).display
+              ErrorDialog.new(@dialog, _("Not a directory"), msg).display
               return
             end
           else