alexandria-book-collection-manager 0.7.2 → 0.7.3

data/lib/alexandria/ui/dialogs/new_book_dialog.rb

@@ -1,52 +1,18 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011, 2015, 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.
 
 require 'gdk_pixbuf2'
+require 'alexandria/ui/builder_base'
+require 'alexandria/ui/dialogs/keep_bad_isbn_dialog'
 
 module Alexandria
   class DuplicateBookException < NameError
   end
 
   module UI
-    class KeepBadISBNDialog < AlertDialog
-      include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-
-      def initialize(parent, book)
-        super(parent, _("Invalid ISBN '%s'") % book.isbn,
-              Gtk::Stock::DIALOG_QUESTION,
-              [[Gtk::Stock::CANCEL, :cancel],
-               [_('_Keep'), :ok]],
-              _("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)
-        self.default_response = Gtk::ResponseType::OK
-        show_all && (@response = run)
-        destroy
-      end
-
-      def keep?
-        @response == :ok
-      end
-    end
-
     class NewBookDialog < BuilderBase
       include Logging
       include GetText
@@ -66,25 +32,22 @@ module Alexandria
       end
 
       def widget_names
-        [:liststore1, :liststore2, :new_book_dialog, :dialog_vbox1,
-         :dialog_action_area1, :button_help, :button_cancel,
-         :button_add, :table1, :keep_open, :combo_libraries,
-         :cellrenderertext1, :eventbox_entry_isbn, :entry_isbn,
-         :label3, :hbox2, :eventbox_combo_search, :combo_search,
-         :cellrenderertext2, :eventbox_entry_search, :entry_search,
-         :button_find, :scrolledwindow, :treeview_results,
-         :title_radiobutton, :isbn_radiobutton, :progressbar]
+        [:new_book_dialog, :button_add, :button_cancel, :button_find,
+         :button_help, :combo_libraries, :combo_search, :entry_isbn,
+         :entry_search, :eventbox_combo_search, :eventbox_entry_isbn,
+         :eventbox_entry_search, :isbn_radiobutton, :keep_open, :progressbar,
+         :scrolledwindow, :title_radiobutton, :treeview_results]
       end
 
       def setup_dialog_gui
-        libraries = Libraries.instance.all_regular_libraries
+        libraries = LibraryCollection.instance.all_regular_libraries
         @selected_library = libraries.first if @selected_library.is_a?(SmartLibrary)
         @combo_libraries.populate_with_libraries(libraries,
                                                  @selected_library)
 
         @treeview_results.model = Gtk::ListStore.new(String, String,
                                                      GdkPixbuf::Pixbuf)
-        @treeview_results.selection.mode = Gtk::SELECTION_MULTIPLE
+        @treeview_results.selection.mode = :multiple
         @treeview_results.selection.signal_connect('changed') do
           @button_add.sensitive = true
         end
@@ -205,14 +168,14 @@ module Alexandria
                 end
               end
             end
-          rescue => e
+          rescue StandardError => e
             @image_error = e.message
           end
         end
 
         GLib::Timeout.add(100) do
           if @image_error
-            image_error_dialog(@image_error)
+            image_error_dialog(@image_error).display
           else
             @images.each_pair do |key, value|
               begin
@@ -225,12 +188,13 @@ module Alexandria
                   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!
                 end
 
                 @images.delete(key)
-              rescue => e
-                image_error_dialog(e.message)
+              rescue StandardError => e
+                image_error_dialog(e.message).display
               end
             end
           end
@@ -257,16 +221,6 @@ module Alexandria
                  BookProviders::SEARCH_BY_KEYWORD
                end
 
-        # @progressbar.show
-        # progress_pulsing = GLib::Timeout.add(100) do
-        #  if @destroyed
-        #    false
-        #  else
-        #    @progressbar.pulse
-        #    true
-        #  end
-        # end
-
         criterion = @entry_search.text.strip
         @treeview_results.model.clear
         log.info {
@@ -290,7 +244,7 @@ module Alexandria
               @results = Alexandria::BookProviders.search(criterion, mode)
 
               log.info { "got #{@results.length} results" }
-            rescue => e
+            rescue StandardError => e
               @find_error = e.message
             ensure
               Alexandria::BookProviders.instance.delete_observer(self)
@@ -306,25 +260,13 @@ module Alexandria
 
           # Err... continue == false if @find_error
           continue = if @find_error
-                       ErrorDialog.new(@parent,
+                       ErrorDialog.new(@new_book_dialog,
                                        _('Unable to find matches for your search'),
-                                       @find_error)
+                                       @find_error).display
                        false
                      elsif @results
                        log.info { "Got results: #{@results[0]}..." }
-                       @results.each_key do |book|
-                         s = format(_('%s, by %s'), book.title, book.authors.join(', '))
-                         similar_books = @results.find { |book2, _cover2|
-                           (book.title == book2.title) &&
-                             (book.authors == book2.authors)
-                         }
-                         s += " (#{book.edition}, #{book.publisher})" if similar_books.length > 1
-                         log.info { format('Copying %s into tree view.', book.title) }
-                         iter = @treeview_results.model.append
-                         iter[0] = s
-                         iter[1] = book.ident
-                         iter[2] = Icons::BOOK
-                       end
+                       copy_results_to_treeview_model(@results, @treeview_results.model)
 
                        # Kick off the image download thread.
                        if @find_thread.alive?
@@ -358,6 +300,22 @@ module Alexandria
         end
       end
 
+      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|
+            (book.title == book2.title) &&
+              (book.authors == book2.authors)
+          }
+          s += " (#{book.edition}, #{book.publisher})" if similar_books.length > 1
+          log.info { format('Copying %s into tree view.', book.title) }
+          iter = model.append
+          iter[0] = s
+          iter[1] = book.ident
+          iter[2] = Icons::BOOK
+        end
+      end
+
       def decode_cuecat?(entry) # srsly?
         if entry.text =~ /^\..*?\..*?\.(.*?)\.$/
           tmp = Regexp.last_match[1].tr('a-zA-Z0-9+-', ' -_')
@@ -377,7 +335,7 @@ module Alexandria
         # Perform the ISBN search via the providers.
         isbn = begin
                  Library.canonicalise_isbn(@entry_isbn.text)
-               rescue
+               rescue StandardError
                  raise _("Couldn't validate the EAN/ISBN you " \
                          'provided.  Make sure it is written ' \
                          'correctly, and try again.')
@@ -392,9 +350,6 @@ module Alexandria
               # MAJOR HACK, add this again...
               Alexandria::BookProviders.instance.add_observer(self)
               book, cover_url = Alexandria::BookProviders.isbn_search(isbn)
-              # prov = FakeBookProviders.new()
-              # prov.add_observer(self)
-              # book, cover_url = prov.isbn_search(isbn)
 
               notify_end_add_by_isbn
 
@@ -424,22 +379,28 @@ module Alexandria
 
       def add_selected_books(library, _is_new)
         books_to_add = []
-        @treeview_results.selection.selected_each do |_model, _path, iter|
+        @treeview_results.selection.each do |_model, _path, iter|
           @results.each do |book, cover|
             next unless book.ident == iter[1]
-            begin
-              next unless assert_not_exist(library, book.isbn)
-            rescue Alexandria::Library::NoISBNError
+
+            isbn = book.isbn
+            if isbn.nil? || isbn.empty?
               puts 'noisbn'
               book.isbn = book.saved_ident = nil
               books_to_add << [book, cover]
               next
-            rescue Alexandria::Library::InvalidISBNError
+            end
+
+            isbn = Library.canonicalise_ean(isbn)
+            unless isbn
               puts "invalidisbn #{book.isbn}"
-              next unless
-              KeepBadISBNDialog.new(@parent, book).keep?
+              next unless KeepBadISBNDialog.new(@new_book_dialog, book).keep?
+
               book.isbn = book.saved_ident = nil
             end
+
+            book.isbn = isbn
+            assert_not_exist(library, isbn)
             books_to_add << [book, cover]
           end
         end
@@ -483,11 +444,12 @@ module Alexandria
 
       def on_add
         return unless @button_add.sensitive?
+
         @find_thread&.kill
         @image_thread&.kill
 
         begin
-          libraries = Libraries.instance.all_libraries
+          libraries = LibraryCollection.instance.all_libraries
           library, is_new_library =
             @combo_libraries.selection_from_libraries(libraries)
 
@@ -502,8 +464,9 @@ module Alexandria
 
           # Do not destroy if there is no addition.
           #          return unless book_was_added
-        rescue => e
-          ErrorDialog.new(@parent, _("Couldn't add the book"), e.message)
+        rescue StandardError => e
+          # FIXME: Message containing <> should be displayed correctly.
+          ErrorDialog.new(@new_book_dialog, _("Couldn't add the book"), e.message).display
         end
         # books_to_add
       end
@@ -603,12 +566,12 @@ module Alexandria
       def assert_not_exist(library, isbn)
         # Check that the book doesn't already exist in the library.
         isbn13 = Library.canonicalise_ean(isbn)
-        puts isbn13
+        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
-        true
       end
     end
   end

data/lib/alexandria/ui/dialogs/new_book_dialog_manual.rb

@@ -1,22 +1,10 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011, 2014 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.
+
+require 'tmpdir'
 
 module Alexandria
   module UI
@@ -33,17 +21,17 @@ module Alexandria
         @on_add_cb = on_add_cb
         FileUtils.rm_f(TMP_COVER_FILE)
 
-        cancel_button = Gtk::Button.new(Gtk::Stock::CANCEL)
+        cancel_button = Gtk::Button.new(stock_id: Gtk::Stock::CANCEL)
         cancel_button.signal_connect('clicked') { on_cancel }
         cancel_button.show
         @button_box << cancel_button
 
-        add_button = Gtk::Button.new(Gtk::Stock::ADD)
+        add_button = Gtk::Button.new(stock_id: Gtk::Stock::ADD)
         add_button.signal_connect('clicked') { on_add }
         add_button.show
         @button_box << add_button
 
-        help_button = Gtk::Button.new(Gtk::Stock::HELP)
+        help_button = Gtk::Button.new(stock_id: Gtk::Stock::HELP)
         help_button.signal_connect('clicked') { on_help }
         help_button.show
         @button_box << help_button
@@ -57,15 +45,11 @@ module Alexandria
 
       def on_title_changed
         title = @entry_title.text.strip
-        begin
-          @book_properties_dialog.title = if title.empty?
-                                            _('Adding a Book')
-                                          else
-                                            _("Adding '%s'") % title
-                                          end
-        rescue
-          raise "There's a problem with a book somewhere"
-        end
+        @book_properties_dialog.title = if title.empty?
+                                          _('Adding a Book')
+                                        else
+                                          _("Adding '%s'") % title
+                                        end
       end
 
       private
@@ -81,29 +65,27 @@ module Alexandria
         if (title = @entry_title.text.strip).empty?
           raise AddError, _('A title must be provided.')
         end
+
         isbn = nil
         if @entry_isbn.text != ''
-          ary = @library.select { |book|
-            book.ident == @entry_isbn.text
-          }
+          isbn = Library.canonicalise_ean(@entry_isbn.text)
+          unless isbn
+            raise AddError, _("Couldn't validate the EAN/ISBN you provided.  Make " \
+                              'sure it is written correcty, and try again.')
+          end
+          ary = @library.select { |book| book.ident == isbn }
           raise AddError, _('The EAN/ISBN you provided is already used in this library.') unless ary.empty?
-          isbn = begin
-                   Library.canonicalise_isbn(@entry_isbn.text)
-                 rescue Alexandria::Library::InvalidISBNError
-                   raise AddError, _("Couldn't validate the " \
-                                        'EAN/ISBN you provided.  Make ' \
-                                        'sure it is written correcty, ' \
-                                        'and try again.')
-                 end
         end
         if (publisher = @entry_publisher.text.strip).empty?
           raise AddError, _('A publisher must be provided.')
         end
+
         publishing_year = @entry_publish_date.text.to_i
         # TODO: Get rid of this silly requirement
         if (edition = @entry_edition.text.strip).empty?
           raise AddError, _('A binding must be provided.')
         end
+
         authors = []
         @treeview_authors.model.each { |_m, _p, i| authors << i[0] }
         if authors.empty?
@@ -131,8 +113,8 @@ module Alexandria
         @on_add_cb.call(book)
         @book_properties_dialog.destroy
       rescue AddError => e
-        ErrorDialog.new(@parent, _("Couldn't add the book"),
-                        e.message)
+        ErrorDialog.new(@book_properties_dialog, _("Couldn't add the book"),
+                        e.message).display
       end
 
       # COPIED from book_properties_dialog_base
@@ -141,7 +123,7 @@ module Alexandria
         begin
           d = Date.strptime(datestring, date_format)
           Time.gm(d.year, d.month, d.day)
-        rescue
+        rescue StandardError
           nil
         end
       end

data/lib/alexandria/ui/dialogs/new_smart_library_dialog.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2015, 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 UI
@@ -33,21 +19,23 @@ module Alexandria
         self.title = _('New Smart Library')
         # FIXME: Should accept just :cancel
         self.default_response = Gtk::ResponseType::CANCEL
+      end
 
+      def acquire
         show_all
         insert_new_rule
 
-        while ((response = run) != :cancel) &&
-            (response != :delete_event)
+        while ((response = run) != Gtk::ResponseType::CANCEL) &&
+            (response != Gtk::ResponseType::DELETE_EVENT)
 
-          if response == :help
+          if response == Gtk::ResponseType::HELP
             Alexandria::UI.display_help(self, 'new-smart-library')
-          elsif response == :ok
+          elsif response == Gtk::ResponseType::OK
             if user_confirms_possible_weirdnesses_before_saving?
               rules = smart_library_rules
               basename = smart_library_base_name(rules) || _('Smart Library')
               name = Library.generate_new_name(
-                Libraries.instance.all_libraries,
+                LibraryCollection.instance.all_libraries,
                 basename)
               library = SmartLibrary.new(name,
                                          rules,