alexandria-book-collection-manager 0.7.2 → 0.7.3

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

@@ -1,22 +1,10 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 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/export_format'
 
 module Alexandria
   module UI
@@ -33,16 +21,16 @@ module Alexandria
                 'to replace it with the one you are generating?') % filename)
         # FIXME: Should accept just :cancel
         self.default_response = Gtk::ResponseType::CANCEL
-        show_all && (@response = run)
-        destroy
       end
 
       def erase?
-        @response == :ok
+        show_all && (@response = run)
+        destroy
+        @response == Gtk::ResponseType::OK
       end
     end
 
-    class ExportDialog < Gtk::FileChooserDialog
+    class ExportDialog < SimpleDelegator
       include GetText
       extend GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
@@ -51,13 +39,14 @@ module Alexandria
       THEMES = Alexandria::WebTheme.all
 
       def initialize(parent, library, sort_order)
-        super(title: _("Export '%s'") % library.name,
-              action: :save,
-              buttons: [[Gtk::Stock::HELP, :help],
-                        [Gtk::Stock::CANCEL, :cancel],
-                        [_('_Export'), :accept]])
+        @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.transient_for = parent
         self.current_name = library.name
         signal_connect('destroy') { hide }
 
@@ -67,24 +56,24 @@ module Alexandria
 
         preview_image = Gtk::Image.new
 
-        theme_combo = Gtk::ComboBoxText.new
-        theme_combo.valign = :center
-        theme_combo.vexpand = false
+        @theme_combo = Gtk::ComboBoxText.new
+        @theme_combo.valign = :center
+        @theme_combo.vexpand = false
         THEMES.each do |theme|
-          theme_combo.append_text(theme.name)
+          @theme_combo.append_text(theme.name)
         end
-        theme_combo.signal_connect('changed') do
-          file = THEMES[theme_combo.active].preview_file
+        @theme_combo.signal_connect('changed') do
+          file = THEMES[@theme_combo.active].preview_file
           preview_image.pixbuf = GdkPixbuf::Pixbuf.new(file: file)
         end
-        theme_combo.active = 0
+        @theme_combo.active = 0
         theme_label = Gtk::Label.new(_('_Theme:'), use_underline: true)
         theme_label.xalign = 0
-        theme_label.mnemonic_widget = theme_combo
+        theme_label.mnemonic_widget = @theme_combo
 
-        types_combo = Gtk::ComboBoxText.new
-        types_combo.vexpand = false
-        types_combo.valign = :center
+        @types_combo = Gtk::ComboBoxText.new
+        @types_combo.vexpand = false
+        @types_combo.valign = :center
         FORMATS.each do |format|
           text = format.name + ' ('
           text += if format.ext
@@ -93,42 +82,43 @@ module Alexandria
                     _('directory')
                   end
           text += ')'
-          types_combo.append_text(text)
+          @types_combo.append_text(text)
         end
-        types_combo.active = 0
-        types_combo.signal_connect('changed') do
-          visible = FORMATS[types_combo.active].needs_preview?
-          theme_label.visible = theme_combo.visible = preview_image.visible = visible
+        @types_combo.active = 0
+        @types_combo.signal_connect('changed') do
+          visible = FORMATS[@types_combo.active].needs_preview?
+          theme_label.visible = @theme_combo.visible = preview_image.visible = visible
         end
-        types_combo.show
+        @types_combo.show
 
         types_label = Gtk::Label.new(_('Export for_mat:'), use_underline: true)
         types_label.xalign = 0
-        types_label.mnemonic_widget = types_combo
+        types_label.mnemonic_widget = @types_combo
         types_label.show
 
         # TODO: Re-design extra widget layout
         grid = Gtk::Grid.new
         grid.column_spacing = 6
         grid.attach types_label, 0, 0, 1, 1
-        grid.attach types_combo, 1, 0, 1, 1
+        grid.attach @types_combo, 1, 0, 1, 1
         grid.attach theme_label, 0, 1, 1, 1
-        grid.attach theme_combo, 1, 1, 1, 1
+        grid.attach @theme_combo, 1, 1, 1, 1
         grid.attach preview_image, 2, 0, 1, 3
         set_extra_widget grid
+      end
 
-        while ((response = run) != :cancel) &&
-            (response != :delete_event)
+      def perform
+        while ((response = run) != Gtk::ResponseType::CANCEL) &&
+            (response != Gtk::ResponseType::DELETE_EVENT)
 
-          if response == :help
+          if response == Gtk::ResponseType::HELP
             Alexandria::UI.display_help(self, 'exporting')
           else
             begin
-              break if on_export(FORMATS[types_combo.active],
-                                 THEMES[theme_combo.active])
-            rescue => e
-              raise
-              ErrorDialog.new(self, _('Export failed'), e.message)
+              break if on_export(FORMATS[@types_combo.active],
+                                 THEMES[@theme_combo.active])
+            rescue StandardError => e
+              ErrorDialog.new(@export_dialog, _('Export failed'), e.message).display
             end
           end
         end
@@ -139,12 +129,14 @@ module Alexandria
 
       def on_export(format, theme)
         raise NotImplementedError unless @library.respond_to?(format.message)
+
         filename = self.filename
         if format.ext
           filename += '.' + format.ext if File.extname(filename).empty?
           if File.exist?(filename)
-            dialog = ConfirmEraseDialog.new(@parent, filename)
+            dialog = ConfirmEraseDialog.new(@export_dialog, filename)
             return unless dialog.erase?
+
             FileUtils.rm(filename)
           end
           args = []
@@ -155,7 +147,7 @@ module Alexandria
                       'file.  A directory is needed for this ' \
                       'operation.  Please select a directory and ' \
                       'try again.') % filename
-              ErrorDialog.new(@parent, _('Not a directory'), msg)
+              ErrorDialog.new(@export_dialog, _('Not a directory'), msg).display
               return
             end
           else

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

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-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.
 
 class Alexandria::ImportFilter
   def to_filefilter
@@ -36,21 +22,21 @@ module Alexandria
       def initialize(parent, message)
         super(parent, _('Error while importing'),
               Gtk::Stock::DIALOG_QUESTION,
-              [[Gtk::Stock::CANCEL, :cancel],
-               [_('_Continue'), :ok]],
+              [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
+               [_('_Continue'), Gtk::ResponseType::OK]],
               message)
         puts "Opened SkipEntryDialog #{inspect}" if $DEBUG
         self.default_response = Gtk::ResponseType::CANCEL
-        show_all && (@response = run)
-        destroy
       end
 
       def continue?
-        @response == :ok
+        show_all && (@response = run)
+        destroy
+        @response == Gtk::ResponseType::OK
       end
     end
 
-    class ImportDialog < Gtk::FileChooserDialog
+    class ImportDialog < SimpleDelegator
       include GetText
       include Logging
 
@@ -59,29 +45,25 @@ module Alexandria
       FILTERS = Alexandria::ImportFilter.all
 
       def initialize(parent)
-        super()
+        title = _('Import a Library')
+        dialog = Gtk::FileChooserDialog.new title: title, parent: parent, action: :open
+        super(dialog)
         puts 'ImportDialog opened.' if $DEBUG
         @destroyed = false
-        self.title = _('Import a Library')
-        self.action = :open
-        self.transient_for = parent
-        #            self.deletable = false
-        running = false
-        add_button(Gtk::Stock::HELP, :help)
-        add_button(Gtk::Stock::CANCEL, :cancel)
+        @running = false
+        add_button(Gtk::Stock::HELP, Gtk::ResponseType::HELP)
+        add_button(Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL)
         import_button = add_button(_('_Import'),
-                                   :accept)
+                                   Gtk::ResponseType::ACCEPT)
         import_button.sensitive = false
 
-        signal_connect('destroy') {
-          if running
+        signal_connect('destroy') do
+          if @running
             @destroyed = true
-
           else
             destroy
           end
-          # self.destroy unless running
-        }
+        end
 
         filters = {}
         FILTERS.each do |filter|
@@ -105,34 +87,32 @@ module Alexandria
         pbar = Gtk::ProgressBar.new
         pbar.show_text = true
         child.pack_start(pbar, expand: false)
+      end
 
+      def acquire
         on_progress = proc do |fraction|
-          begin
-            pbar.show unless pbar.visible?
-            pbar.fraction = fraction
-          rescue
-            # TODO: check if destroyed instead...
-          end
+          pbar.show unless pbar.visible?
+          pbar.fraction = fraction
         end
 
         on_error = proc do |message|
-          SkipEntryDialog.new(parent, message).continue?
+          SkipEntryDialog.new(self, message).continue?
         end
 
         exec_queue = ExecutionQueue.new
 
         while !@destroyed &&
-            ((response = run) != :cancel) &&
-            (response != :delete_event)
+            ((response = run) != Gtk::ResponseType::CANCEL) &&
+            response != Gtk::ResponseType::DELETE_EVENT
 
-          if response == :help
+          if response == Gtk::ResponseType::HELP
             Alexandria::UI.display_help(self, 'import-library')
             next
           end
           file = File.basename(filename, '.*')
           base = GLib.locale_to_utf8(file)
           new_library_name = Library.generate_new_name(
-            Libraries.instance.all_libraries,
+            LibraryCollection.instance.all_libraries,
             base)
 
           filter = filters[self.filter]
@@ -160,7 +140,7 @@ module Alexandria
             begin
               library, @bad_isbns, @failed_isbns = filter.invoke(new_library_name,
                                                                  filename)
-            rescue => ex
+            rescue StandardError => ex
               trace = ex.backtrace.join("\n> ")
               log.error { "Import failed: #{ex.message} #{trace}" }
             end
@@ -168,7 +148,7 @@ module Alexandria
 
           while thread.alive? && !@destroyed
             # puts "Thread #{thread} still alive."
-            running = true
+            @running = true
             exec_queue.iterate
             Gtk.main_iteration_do(false)
           end
@@ -179,11 +159,11 @@ module Alexandria
               break
             elsif not_cancelled
               puts "Raising ErrorDialog because not_cancelled is #{not_cancelled}" if $DEBUG
-              ErrorDialog.new(parent,
+              ErrorDialog.new(self,
                               _("Couldn't import the library"),
                               _('The format of the file you ' \
                                 'provided is unknown.  Please ' \
-                                'retry with another file.'))
+                                'retry with another file.')).display
             end
             pbar.hide
             self.sensitive = true

data/lib/alexandria/ui/dialogs/keep_bad_isbn_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.
+
+module Alexandria
+  module UI
+    class KeepBadISBNDialog < AlertDialog
+      include GetText
+      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
+        super(parent, title,
+              Gtk::Stock::DIALOG_QUESTION,
+              [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
+               [_('_Keep'), Gtk::ResponseType::OK]], message)
+        self.default_response = Gtk::ResponseType::OK
+      end
+
+      def keep?
+        show_all
+        @response = run
+        destroy
+        @response == Gtk::ResponseType::OK
+      end
+    end
+  end
+end

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

@@ -1,21 +1,8 @@
 # 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
@@ -28,17 +15,17 @@ module Alexandria
               format(_("The book '%s' already exists in '%s'. Would you like " \
                 'to replace it?'), book.title, library.name),
               Gtk::Stock::DIALOG_QUESTION,
-              [[_('_Skip'), :cancel],
-               [_('_Replace'), :ok]],
+              [[_('_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
-        show_all && (@response = run)
-        destroy
       end
 
       def replace?
-        @response == :ok
+        show_all && (@response = run)
+        destroy
+        @response == Gtk::ResponseType::OK
       end
     end
 
@@ -70,17 +57,17 @@ module Alexandria
         end
 
         super(parent, message, Gtk::Stock::DIALOG_QUESTION,
-              [[Gtk::Stock::CANCEL, :cancel],
-               [Gtk::Stock::DELETE, :ok]],
+              [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
+               [Gtk::Stock::DELETE, Gtk::ResponseType::OK]],
               description)
 
         self.default_response = Gtk::ResponseType::CANCEL
-        show_all && (@response = run)
-        destroy
       end
 
       def ok?
-        @response == :ok
+        show_all && (@response = run)
+        destroy
+        @response == Gtk::ResponseType::OK
       end
     end
   end