alexandria-book-collection-manager 0.7.3 → 0.7.8

data/lib/alexandria/ui/iconview.rb

@@ -19,8 +19,8 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'alexandria/ui/columns'
-require 'alexandria/ui/iconview_tooltips'
+require "alexandria/ui/columns"
+require "alexandria/ui/iconview_tooltips"
 
 module Alexandria
   module UI
@@ -51,14 +51,14 @@ module Alexandria
         @iconview.column_spacing = 16
         @iconview.item_width = ICON_WIDTH + 16
 
-        @iconview.signal_connect('selection-changed') do
-          log.debug { 'selection-changed' }
+        @iconview.signal_connect("selection-changed") do
+          log.debug { "selection-changed" }
           @parent.on_books_selection_changed
         end
 
-        @iconview.signal_connect('item-activated') do
-          log.debug { 'item-activated' }
-          @actiongroup['Properties'].activate
+        @iconview.signal_connect("item-activated") do
+          log.debug { "item-activated" }
+          @actiongroup["Properties"].activate
           false
         end
 
@@ -68,12 +68,14 @@ module Alexandria
 
       ICONS_SORTS = [
         Columns::TITLE, Columns::AUTHORS, Columns::ISBN,
-        Columns::PUBLISHER, Columns::EDITION, Columns::RATING, Columns::REDD, Columns::OWN, Columns::WANT
+        Columns::PUBLISHER, Columns::EDITION, Columns::RATING,
+        Columns::REDD, Columns::OWN, Columns::WANT
       ].freeze
+
       def setup_books_iconview_sorting
         mode = ICONS_SORTS[@prefs.arrange_icons_mode]
-        @iconview_model.set_sort_column_id(mode,
-                                           @prefs.reverse_icons ? Gtk::SORT_DESCENDING : Gtk::SORT_ASCENDING)
+        sort = @prefs.reverse_icons ? Gtk::SORT_DESCENDING : Gtk::SORT_ASCENDING
+        @iconview_model.set_sort_column_id(mode, sort)
         @filtered_model.refilter # force redraw
       end
     end

data/lib/alexandria/ui/iconview_tooltips.rb

@@ -1,25 +1,8 @@
 # frozen_string_literal: true
 
-# -*- ruby -*-
+# This file is part of Alexandria.
 #
-# Copyright (C) 2007 kksou
-# Copyright (C) 2008,2009 Cathal Mc Ginley
-# Copyright (C) 2011, 2014, 2016 Matijs van Zuijlen
-#
-# 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.
 
 # Please retain the following note:
 #
@@ -29,49 +12,53 @@
 #
 # Ported to ruby-gtk2 (and modified for IconView) by Cathal Mc Ginley
 
-require 'cgi'
+require "cgi"
 
-class IconViewTooltips
-  include Alexandria::Logging
+module Alexandria
+  module UI
+    class IconViewTooltips
+      include Logging
 
-  def initialize(view)
-    set_view(view)
-  end
+      def initialize(view)
+        set_view(view)
+      end
 
-  def set_view(view)
-    view.has_tooltip = true
-    view.signal_connect('query-tooltip') do |_widget, x, y, _keyboard_mode, tooltip|
-      tree_path = view.get_path_at_pos(x, y)
-      if tree_path
-        iter = view.model.get_iter(tree_path)
+      def set_view(view)
+        view.has_tooltip = true
+        view.signal_connect("query-tooltip") do |_widget, x, y, _keyboard_mode, tooltip|
+          tree_path = view.get_path_at_pos(x, y)
+          if tree_path
+            iter = view.model.get_iter(tree_path)
 
-        title = iter[2] # HACK: hardcoded, should use column names...
-        authors = iter[4]
-        publisher = iter[6]
-        year = iter[7]
-        tooltip.set_markup label_for_book(title, authors, publisher, year)
+            title = iter[2] # HACK: hardcoded, should use column names...
+            authors = iter[4]
+            publisher = iter[6]
+            year = iter[7]
+            tooltip.set_markup label_for_book(title, authors, publisher, year)
+          end
+        end
       end
-    end
-  end
 
-  def label_for_book(title, authors, publisher, year)
-    # This is much too complex... but it works for now!
-    html = ''
-    unless title.empty?
-      html += "<b>#{CGI.escapeHTML(title)}</b>"
-      html += "\n" unless authors.empty?
-    end
-    html += "<i>#{CGI.escapeHTML(authors)}</i>" unless authors.empty?
-    html += "\n" if !title.empty? || !authors.empty?
+      def label_for_book(title, authors, publisher, year)
+        # This is much too complex... but it works for now!
+        html = ""
+        unless title.empty?
+          html += "<b>#{CGI.escapeHTML(title)}</b>"
+          html += "\n" unless authors.empty?
+        end
+        html += "<i>#{CGI.escapeHTML(authors)}</i>" unless authors.empty?
+        html += "\n" if !title.empty? || !authors.empty?
 
-    html += '<small>'
-    html += CGI.escapeHTML(publisher).to_s if publisher && !publisher.empty?
+        html += "<small>"
+        html += CGI.escapeHTML(publisher).to_s if publisher && !publisher.empty?
 
-    if year && !year.empty?
-      html += ' ' if publisher && !publisher.empty?
-      html += "(#{year})"
-    end
+        if year && !year.empty?
+          html += " " if publisher && !publisher.empty?
+          html += "(#{year})"
+        end
 
-    html + '</small>'
+        html + "</small>"
+      end
+    end
   end
 end

data/lib/alexandria/ui/import_dialog.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/error_dialog"
+require "alexandria/ui/skip_entry_dialog"
+
+module Alexandria
+  module UI
+    class ImportDialog
+      include GetText
+      include Logging
+
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
+
+      FILTERS = Alexandria::ImportFilter.all
+
+      attr_reader :dialog
+
+      def initialize(parent)
+        title = _("Import a Library")
+        @dialog = Gtk::FileChooserDialog.new title: title, parent: parent, action: :open
+        log.debug { "ImportDialog opened" }
+        @destroyed = false
+        @running = false
+        dialog.add_button(Gtk::Stock::HELP, Gtk::ResponseType::HELP)
+        dialog.add_button(Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL)
+        import_button = dialog.add_button(_("_Import"),
+                                          Gtk::ResponseType::ACCEPT)
+        import_button.sensitive = false
+
+        dialog.signal_connect("destroy") do
+          if @running
+            @destroyed = true
+          else
+            dialog.destroy
+          end
+        end
+
+        @filters = {}
+        FILTERS.each do |filter|
+          filefilter = make_filefilter filter
+          dialog.add_filter(filefilter)
+          log.debug { "Added ImportFilter #{filefilter} -- #{filefilter.name}" }
+          @filters[filefilter] = filter
+        end
+
+        dialog.signal_connect("selection_changed") do
+          import_button.sensitive = dialog.filename && File.file?(dialog.filename)
+        end
+
+        # before adding the (hidden) progress bar, we must re-set the
+        # packing of the button box (currently packed at the end),
+        # because the progressbar will be *after* the button box.
+        buttonbox = dialog.child.children.last
+        dialog.child.set_child_packing(buttonbox, pack_type: :start)
+        dialog.child.reorder_child(buttonbox, 1)
+
+        @pbar = Gtk::ProgressBar.new
+        @pbar.show_text = true
+        dialog.child.pack_start(@pbar, expand: false)
+      end
+
+      def acquire
+        on_progress = proc do |fraction|
+          @pbar.show unless @pbar.visible?
+          @pbar.fraction = fraction
+        end
+
+        on_error = proc do |message|
+          SkipEntryDialog.new(self, message).continue?
+        end
+
+        exec_queue = ExecutionQueue.new
+
+        while !@destroyed &&
+            ((response = dialog.run) != Gtk::ResponseType::CANCEL) &&
+            response != Gtk::ResponseType::DELETE_EVENT
+
+          if response == Gtk::ResponseType::HELP
+            Alexandria::UI.display_help(self, "import-library")
+            next
+          end
+          file = File.basename(dialog.filename, ".*")
+          base = GLib.locale_to_utf8(file)
+          new_library_name = Library.generate_new_name(
+            LibraryCollection.instance.all_libraries,
+            base)
+
+          filter = @filters[dialog.filter]
+          log.debug { "Going forward with filter: #{filter.name}" }
+          dialog.sensitive = false
+
+          filter.on_iterate do |n, total|
+            unless @destroyed
+              fraction = n * 1.0 / total
+              log.debug { "#{inspect} fraction: #{fraction}" }
+              exec_queue.call(on_progress, fraction)
+            end
+          end
+
+          not_cancelled = true
+          filter.on_error do |message|
+            not_cancelled = exec_queue.sync_call(on_error, message)
+            log.debug { "#{inspect} cancel state: #{not_cancelled}" }
+          end
+
+          library = nil
+          @bad_isbns = nil
+          @failed_isbns = nil
+          thread = Thread.start do
+            library, @bad_isbns, @failed_isbns =
+              filter.invoke(new_library_name, dialog.filename)
+          rescue StandardError => ex
+            trace = ex.backtrace.join("\n> ")
+            log.error { "Import failed: #{ex.message} #{trace}" }
+          end
+
+          while thread.alive? && !@destroyed
+            @running = true
+            exec_queue.iterate
+            Gtk.main_iteration_do(false)
+          end
+
+          unless @destroyed
+            if library
+              yield(library, @bad_isbns, @failed_isbns)
+              break
+            elsif not_cancelled
+              log.debug { "Raising ErrorDialog because not_cancelled is #{not_cancelled}" }
+              ErrorDialog.new(dialog,
+                              _("Couldn't import the library"),
+                              _("The format of the file you " \
+                                "provided is unknown.  Please " \
+                                "retry with another file.")).display
+            end
+            @pbar.hide
+            self.sensitive = true
+          end
+        end
+
+        dialog.destroy unless @destroyed
+      end
+
+      private
+
+      def make_filefilter(import_filter)
+        filefilter = Gtk::FileFilter.new
+        filefilter.name = import_filter.name
+        import_filter.patterns.each { |x| filefilter.add_pattern(x) }
+        filefilter
+      end
+    end
+  end
+end

data/lib/alexandria/ui/init.rb

@@ -1,87 +1,76 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2008 Joseph Method
-# 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 "alexandria/ui/error_dialog"
 
 class CellRendererToggle < Gtk::CellRendererToggle
   attr_accessor :text
+
   type_register
   install_property(GLib::Param::String.new(
-                     'text',
-                     'text',
-                     'Some damn value',
-                     '',
+                     "text",
+                     "text",
+                     "Some damn value",
+                     "",
                      GLib::Param::READABLE | GLib::Param::WRITABLE))
 end
 
 class Gtk::ActionGroup
-  def [](x)
-    get_action(x)
+  def [](index)
+    get_action(index)
   end
 end
 
-class Gtk::IconView
-  def freeze
-    @old_model = model
-    self.model = nil
+module Alexandria::UI::FreezeThaw
+  def frozen?
+    @old_model && !model
   end
 
-  def unfreeze
-    self.model = @old_model
-  end
-end
-
-class Gtk::TreeView
   def freeze
+    return if frozen?
+
     @old_model = model
     self.model = nil
   end
 
   def unfreeze
+    return unless frozen?
+
     self.model = @old_model
+    @old_model = nil
   end
 end
 
+Gtk::IconView.include Alexandria::UI::FreezeThaw
+Gtk::TreeView.include Alexandria::UI::FreezeThaw
+
 class Alexandria::Library
   def action_name
-    'MoveIn' + name.gsub(/\s/, '')
+    "MoveIn" + name.gsub(/\s/, "")
   end
 end
 
 class Alexandria::BookProviders::AbstractProvider
   def action_name
-    'At' + name
+    "At" + name
   end
 end
 
 module Alexandria
   module UI
     def self.display_help(parent, section = nil)
-      section_index = ''
+      section_index = ""
       section_index = "##{section}" if section
       exec("gnome-help ghelp:alexandria#{section_index}") if fork.nil?
     rescue StandardError
-      log.error(self) { 'Unable to load help browser' }
-      ErrorDialog.new(parent, _('Unable to launch the help browser'),
-                      _('Could not display help for Alexandria. ' \
-                        'There was an error launching the system ' \
-                        'help browser.')).display
+      log.error(self) { "Unable to load help browser" }
+      ErrorDialog.new(parent, _("Unable to launch the help browser"),
+                      _("Could not display help for Alexandria. " \
+                        "There was an error launching the system " \
+                        "help browser.")).display
     end
   end
 end

data/lib/alexandria/ui/{dialogs/keep_bad_isbn_dialog.rb → keep_bad_isbn_dialog.rb}

@@ -4,22 +4,25 @@
 #
 # See the file README.md for authorship and licensing information.
 
+require "alexandria/ui/alert_dialog"
+
 module Alexandria
   module UI
     class KeepBadISBNDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      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
+        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
+               [_("_Keep"), Gtk::ResponseType::OK]], message)
+        dialog.default_response = Gtk::ResponseType::OK
       end
 
       def keep?