alexandria-book-collection-manager 0.7.2 → 0.7.3

data/lib/alexandria/ui/completion_models.rb

@@ -63,7 +63,7 @@ module Alexandria
             else
               false
             end
-          rescue
+          rescue StandardError
             false
           end
         else
@@ -200,6 +200,7 @@ module Alexandria
         iter = nil
         values.uniq.each do |value|
           next if value.nil?
+
           iter = iter ? model.insert_after(iter) : model.append
           iter[0] = value
         end

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

@@ -1,60 +1,48 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
+# 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
-    class AboutDialog < Gtk::AboutDialog
-      include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-
-      GPL = <<EOL
-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.
+    class AboutDialog
+      GPL = <<~EOL
+        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.
+        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.
-EOL
+        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.
+      EOL
 
       def initialize(parent)
-        super()
-        self.name = Alexandria::TITLE
-        self.version = Alexandria::DISPLAY_VERSION
-        self.copyright = Alexandria::COPYRIGHT
-        self.comments = Alexandria::DESCRIPTION
-        self.authors = Alexandria::AUTHORS
-        self.documenters = Alexandria::DOCUMENTERS
-        self.artists = Alexandria::ARTISTS
-        self.translator_credits = Alexandria::TRANSLATORS.join("\n")
-        self.logo = Icons::ALEXANDRIA
-        self.website = Alexandria::WEBSITE_URL
-        self.license = GPL
-        self.transient_for = parent
-        signal_connect('response') { destroy }
+        @dialog = Gtk::AboutDialog.new
+        @dialog.name = Alexandria::TITLE
+        @dialog.version = Alexandria::DISPLAY_VERSION
+        @dialog.copyright = Alexandria::COPYRIGHT
+        @dialog.comments = Alexandria::DESCRIPTION
+        @dialog.authors = Alexandria::AUTHORS
+        @dialog.documenters = Alexandria::DOCUMENTERS
+        @dialog.artists = Alexandria::ARTISTS
+        @dialog.translator_credits = Alexandria::TRANSLATORS.join("\n")
+        @dialog.logo = Icons::ALEXANDRIA
+        @dialog.website = Alexandria::WEBSITE_URL
+        @dialog.license = GPL
+        @dialog.transient_for = parent
+        @dialog.signal_connect('response') { @dialog.destroy }
+      end
+
+      def show
+        @dialog.show
       end
     end
   end

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

@@ -1,35 +1,19 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2007 Cathal Mc Ginley
-# 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.
 
-# require 'monitor'
+require 'monitor'
 require 'alexandria/scanners/cuecat'
 require 'alexandria/scanners/keyboard'
 
-require 'alexandria/ui/sound'
+require 'alexandria/ui/builder_base'
 require 'alexandria/ui/dialogs/barcode_animation'
+require 'alexandria/ui/sound'
 
 module Alexandria
   module UI
-    require 'monitor'
-
     # assists in turning on progress bar when searching
     # and turning it off when all search threads have completed...
     class SearchThreadCounter < Monitor
@@ -64,7 +48,7 @@ module Alexandria
         @acquire_dialog.transient_for = @parent = parent
         @block = block
 
-        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)
@@ -80,10 +64,8 @@ module Alexandria
       end
 
       def widget_names
-        [:acquire_dialog, :dialog_vbox1, :dialog_action_area1,
-         :help_button, :cancel_button, :add_button, :vbox1,
-         :barcode_label, :scan_area, :scan_frame, :scrolledwindow1,
-         :barcodes_treeview, :hbox1, :label1, :combo_libraries]
+        [:acquire_dialog, :add_button, :barcodes_treeview, :barcode_label,
+         :scan_area, :scan_frame, :combo_libraries]
       end
 
       def book_in_library(isbn10, library)
@@ -97,7 +79,7 @@ module Alexandria
         end
         # puts "book_in_library match #{match.inspect}"
         !match.nil?
-      rescue
+      rescue StandardError
         log.warn { "Failed to check for book #{isbn10} in library #{library}" }
         true
       end
@@ -105,7 +87,7 @@ module Alexandria
       def on_add
         model = @barcodes_treeview.model
 
-        libraries = Libraries.instance.all_libraries
+        libraries = LibraryCollection.instance.all_libraries
         library, is_new_library =
           @combo_libraries.selection_from_libraries(libraries)
 
@@ -223,7 +205,7 @@ module Alexandria
           title = n_("Couldn't add this book",
                      "Couldn't add these books",
                      isbn_duplicates.size)
-          ErrorDialog.new(@parent, title, message)
+          ErrorDialog.new(@acquire_dialog, title, message).display
         end
 
         @block.call(books, library, is_new_library)
@@ -421,7 +403,7 @@ module Alexandria
         @scanner_buffer = ''
         scanner_name = @prefs.barcode_scanner
 
-        @scanner = Alexandria::Scanners.find_scanner scanner_name ||
+        @scanner = Alexandria::Scanners.find_scanner(scanner_name) ||
           Alexandria::Scanners.default_scanner # CueCat is default
 
         log.debug { "Using #{@scanner.name} scanner" }
@@ -531,10 +513,12 @@ module Alexandria
         if effect == 'scanning'
           puts "Effect: #{effect}, playing: #{@prefs.play_scanning_sound}" if $DEBUG
           return unless @prefs.play_scanning_sound
+
           @sound_players['scanning'].play('scanning')
         else
           puts "Effect: #{effect}, playing: #{@prefs.play_scan_sound}" if $DEBUG
           return unless @prefs.play_scan_sound
+
           # sleep(0.5) # "scanning" effect lasts 0.5 seconds, wait for it to end
           @sound_players[effect].play(effect)
         end

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

@@ -1,28 +1,16 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
+# 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.
 
 # HIG compliant error dialog boxes
 module Alexandria
   module UI
-    class AlertDialog < Gtk::Dialog
+    class AlertDialog < SimpleDelegator
       def initialize(parent, title, stock_icon, buttons, message = nil)
-        super(title: '', parent: parent, flags: :destroy_with_parent, buttons: buttons)
+        dialog = Gtk::Dialog.new(title: '', parent: parent, flags: :destroy_with_parent, buttons: buttons)
+        super(dialog)
 
         self.border_width = 6
         self.resizable = false
@@ -64,6 +52,9 @@ module Alexandria
               [[Gtk::Stock::OK, :ok]], message)
         # FIXME: Should accept just :ok
         self.default_response = Gtk::ResponseType::OK
+      end
+
+      def display
         show_all && run
         destroy
       end

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

@@ -1,35 +1,21 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2007 Joseph Method
+# 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
     # Generalized Dialog for lists of bad isbns. Used for on_import. Can also
     # be used for on_load library conversions.
-    class BadIsbnsDialog < Gtk::MessageDialog
-      def initialize(parent, message = nil, list = nil)
-        message ||= _("There's a problem")
-
-        super(parent,
-              Gtk::Dialog::MODAL,
-              Gtk::MessageDialog::WARNING,
-              Gtk::MessageDialog::BUTTONS_CLOSE,
-              message)
+    class BadIsbnsDialog < SimpleDelegator
+      def initialize(parent, message, list)
+        dialog = Gtk::MessageDialog.new(parent: parent,
+                                        flags: :modal,
+                                        type: :warning,
+                                        buttons: :close,
+                                        message: message)
+        super(dialog)
 
         isbn_container = Gtk::Box.new :horizontal
         the_vbox = children.first

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

@@ -118,24 +118,26 @@ module Alexandria
           # If set to nil .to_yaml in library.save causes crash
           @book.isbn = ''
         else
-          ary = @library.select { |book| book.ident == @entry_isbn.text }
+          isbn = Library.canonicalise_ean(@entry_isbn.text)
+          unless isbn
+            ErrorDialog.new(@book_properties_dialog,
+                            _("Couldn't modify the book"),
+                            _("Couldn't validate the EAN/ISBN you " \
+                              'provided.  Make sure it is written ' \
+                              'correcty, and try again.')).display
+            return
+          end
+
+          ary = @library.select { |book| book.ident == isbn }
           unless ary.empty? || ((ary.length == 1) && (ary.first == @book))
-            ErrorDialog.new(@parent,
+            ErrorDialog.new(@book_properties_dialog,
                             _("Couldn't modify the book"),
                             _('The EAN/ISBN you provided is already ' \
-                              'used in this library.'))
+                              'used in this library.')).display
             return
           end
-          @book.isbn = begin
-                         Library.canonicalise_ean(@entry_isbn.text)
-                       rescue Alexandria::Library::InvalidISBNError
-                         ErrorDialog.new(@parent,
-                                         _("Couldn't modify the book"),
-                                         _("Couldn't validate the EAN/ISBN you " \
-                                           'provided.  Make sure it is written ' \
-                                           'correcty, and try again.'))
-                         return
-                       end
+
+          @book.isbn = isbn
         end
         @book.title = @entry_title.text
         @book.publisher = @entry_publisher.text
@@ -153,11 +155,8 @@ module Alexandria
         if loaned_since.strip.empty?
           @book.loaned_since = nil
         else
-          begin
-            t = parse_date(loaned_since)
-            @book.loaned_since = t
-          rescue
-          end
+          t = parse_date(loaned_since)
+          @book.loaned_since = t
         end
 
         @book.redd = @checkbutton_redd.active?

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

@@ -1,24 +1,10 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011, 2014, 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 'alexandria/ui/glade_base'
+require 'alexandria/ui/builder_base'
 
 module Alexandria
   module UI
@@ -197,22 +183,14 @@ module Alexandria
       end
 
       def widget_names
-        [:book_properties_dialog, :dialog_vbox1, :button_box,
-         :notebook1, :hbox1, :table1, :label1, :label7, :entry_title,
-         :entry_publisher, :label5, :entry_isbn, :hbox3,
-         :scrolledwindow2, :treeview_authors, :vbox2, :button3,
-         :image2, :button4, :image3, :label3, :label9, :entry_edition,
-         :label16, :entry_publish_date, :label17, :entry_tags,
-         :vseparator1, :vbox1, :label12, :button_cover, :image_cover,
-         :vbox4, :vbox5, :checkbutton_own, :vbox6, :checkbutton_redd,
-         :redd_date, :checkbutton_want, :eventbox8, :hbox2,
-         :eventbox6, :image5, :eventbox1, :image_rating1, :eventbox5,
-         :image_rating2, :eventbox4, :image_rating3, :eventbox3,
-         :image_rating4, :eventbox2, :image_rating5, :eventbox7,
-         :image4, :label11, :label9, :vbox3, :checkbutton_loaned,
-         :table2, :entry_loaned_to, :label_loaning_duration, :label15,
-         :label14, :date_loaned_since, :label13, :scrolledwindow1,
-         :textview_notes, :label10]
+        [:book_properties_dialog, :button_box, :button_cover,
+         :checkbutton_loaned, :checkbutton_own, :checkbutton_redd,
+         :checkbutton_want, :date_loaned_since, :entry_edition,
+         :entry_loaned_to, :entry_publish_date, :entry_publisher, :entry_isbn,
+         :entry_tags, :entry_title, :image_cover, :image_rating1,
+         :image_rating2, :image_rating3, :image_rating4, :image_rating5,
+         :label_loaning_duration, :notebook, :redd_date, :textview_notes,
+         :treeview_authors]
       end
 
       def on_title_changed
@@ -279,12 +257,12 @@ module Alexandria
                                             @book_properties_dialog,
                                             Gtk::FileChooser::ACTION_OPEN,
                                             backend,
-                                            [_('No Cover'), :reject],
-                                            [Gtk::Stock::CANCEL, :cancel],
-                                            [Gtk::Stock::OPEN, :accept])
+                                            [_('No Cover'), Gtk::ResponseType::REJECT],
+                                            [Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
+                                            [Gtk::Stock::OPEN, Gtk::ResponseType::ACCEPT])
         dialog.current_folder = @@latest_filechooser_directory
         response = dialog.run
-        if response == :accept
+        if response == Gtk::ResponseType::ACCEPT
           begin
             @delete_cover_file = false
             cover = GdkPixbuf::Pixbuf.new(file: dialog.filename)
@@ -310,9 +288,9 @@ module Alexandria
             self.cover = cover
             @@latest_filechooser_directory = dialog.current_folder
           rescue RuntimeError => e
-            ErrorDialog.new(@book_properties_dialog, e.message)
+            ErrorDialog.new(@book_properties_dialog, e.message).display
           end
-        elsif response == :reject
+        elsif response == Gtk::ResponseType::REJECT
           ## FileUtils.rm_f(@cover_file) # fixing bug #16707
           @delete_cover_file = true
 
@@ -321,7 +299,11 @@ module Alexandria
         dialog.destroy
       end
 
-      def on_destroy; end # no action by default
+      def on_destroy
+        @book_properties_dialog.hide
+        # Stop notebook trying to set tab labels at this time
+        @notebook.show_tabs = false
+      end
 
       def on_loaned
         loaned = @checkbutton_loaned.active?
@@ -339,6 +321,7 @@ module Alexandria
           break if matches_regex
         end
         return unless matches_regex
+
         t = parse_date(@date_loaned_since.text)
         if t.nil?
           @label_loaning_duration.label = ''
@@ -377,6 +360,7 @@ module Alexandria
           @image_rating5
         ]
         raise 'out of range' if rating < 0 || rating > images.length
+
         images[0..rating - 1].each { |x| x.pixbuf = Icons::STAR_SET }
         images[rating..-1].each { |x| x.pixbuf = Icons::STAR_UNSET }
         @current_rating = rating
@@ -413,7 +397,7 @@ module Alexandria
         begin
           d = Date.strptime(datestring, date_format)
           Time.gm(d.year, d.month, d.day)
-        rescue
+        rescue StandardError
           nil
         end
       end