alexandria-book-collection-manager 0.7.3 → 0.7.8

data/lib/alexandria/ui/completion_models.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2005-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.
 
 module Alexandria
   module EntryOverrides
@@ -44,21 +30,21 @@ module Alexandria
       complete(Alexandria::UI::CompletionModels::TAG)
       # min = self.completion.minimum_key_length
       min = 2
-      completion.signal_connect('match-selected') do |c, model, iter|
+      completion.signal_connect("match-selected") do |c, model, iter|
         cur_text = c.entry.text
         # TODO: Replace with iter[0] if possible
         new_tag = model.get_value(iter, 0)
-        cur_text_split = cur_text.split(',')
+        cur_text_split = cur_text.split(",")
         cur_text_split.delete_at(-1)
         cur_text_split << new_tag
-        c.entry.text = cur_text_split.join(',')
+        c.entry.text = cur_text_split.join(",")
         true
       end
       completion.set_match_func do |_comp, key, iter|
-        cur_tag = key.split(',').last.strip
+        cur_tag = key.split(",").last.strip
         if cur_tag.size >= min
           begin
-            if iter[0] =~ /^#{cur_tag}/
+            if /^#{cur_tag}/.match?(iter[0])
               true
             else
               false
@@ -178,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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/alert_dialog"
+
+module Alexandria
+  module UI
+    class ConfirmEraseDialog < AlertDialog
+      include GetText
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
+
+      def initialize(parent, filename)
+        super(parent, _("File already exists"),
+              Gtk::Stock::DIALOG_QUESTION,
+              [[Gtk::Stock::CANCEL, :cancel],
+               [_("_Replace"), :ok]],
+              _("A file named '%s' already exists.  Do you want " \
+                "to replace it with the one you are generating?") % filename)
+        # FIXME: Should accept just :cancel
+        dialog.default_response = Gtk::ResponseType::CANCEL
+      end
+
+      def erase?
+        show_all && (@response = run)
+        destroy
+        @response == Gtk::ResponseType::OK
+      end
+    end
+  end
+end

data/lib/alexandria/ui/conflict_while_copying_dialog.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/alert_dialog"
+
+module Alexandria
+  module UI
+    class ConflictWhileCopyingDialog < AlertDialog
+      include GetText
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
+
+      def initialize(parent, library, book)
+        super(parent,
+              format(_("The book '%s' already exists in '%s'. Would you like " \
+                "to replace it?"), book.title, library.name),
+              Gtk::Stock::DIALOG_QUESTION,
+              [[_("_Skip"), Gtk::ResponseType::CANCEL],
+               [_("_Replace"), Gtk::ResponseType::OK]],
+              _("If you replace the existing book, its contents will " \
+                "be overwritten."))
+        dialog.default_response = Gtk::ResponseType::CANCEL
+      end
+
+      def replace?
+        show_all && (@response = run)
+        destroy
+        @response == Gtk::ResponseType::OK
+      end
+    end
+  end
+end

data/lib/alexandria/ui/dndable.rb

@@ -21,15 +21,15 @@
 
 module Alexandria
   module UI
-    BOOKS_TARGET_TABLE = [Gtk::TargetEntry.new('ALEXANDRIA_BOOKS', :same_app, 0)].freeze
+    BOOKS_TARGET_TABLE = [Gtk::TargetEntry.new("ALEXANDRIA_BOOKS", :same_app, 0)].freeze
 
     module DragAndDropable
       BADGE_MARKUP = '<span weight="heavy" foreground="white">%d</span>'
 
       def setup_view_source_dnd(view)
         # better be Loggable!
-        log.info { format('setup_view_source_dnd for %s', view) }
-        view.signal_connect_after('drag-begin') do |_widget, drag_context|
+        log.info { format("setup_view_source_dnd for %s", view) }
+        view.signal_connect_after("drag-begin") do |_widget, drag_context|
           n_books = @parent.selected_books.length
           if n_books > 1
             # Render generic book icon.
@@ -45,8 +45,8 @@ module Alexandria
 
             # Draw a red ellipse where the badge number should be.
             red_gc = Gdk::GC.new(pixmap)
-            red_gc.rgb_fg_color = Gdk::Color.parse('red')
-            red_gc.rgb_bg_color = Gdk::Color.parse('red')
+            red_gc.rgb_fg_color = Gdk::Color.parse("red")
+            red_gc.rgb_bg_color = Gdk::Color.parse("red")
             pixmap.draw_arc(red_gc,
                             true,
                             x - 5, y - 2,
@@ -66,11 +66,11 @@ module Alexandria
           end
         end
 
-        view.signal_connect('drag-data-get') do |_widget, _drag_context, selection_data, _info, _time|
+        view.signal_connect("drag-data-get") do |_, _, selection_data, _, _|
           idents = @parent.selected_books.map(&:ident)
           unless idents.empty?
             selection_data.set(Gdk::Selection::TYPE_STRING,
-                               idents.join(','))
+                               idents.join(","))
           end
         end
 

data/lib/alexandria/ui/error_dialog.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/alert_dialog"
+
+module Alexandria
+  module UI
+    class ErrorDialog < AlertDialog
+      def initialize(parent, title, message = nil)
+        super(parent, title, Gtk::Stock::DIALOG_ERROR,
+              [[Gtk::Stock::OK, :ok]], message)
+        # FIXME: Should accept just :ok
+        dialog.default_response = Gtk::ResponseType::OK
+      end
+
+      def display
+        show_all && run
+        destroy
+      end
+    end
+  end
+end

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

@@ -4,51 +4,31 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'alexandria/export_format'
+require "alexandria/export_format"
+require "alexandria/ui/confirm_erase_dialog"
+require "alexandria/ui/error_dialog"
 
 module Alexandria
   module UI
-    class ConfirmEraseDialog < AlertDialog
-      include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-
-      def initialize(parent, filename)
-        super(parent, _('File already exists'),
-              Gtk::Stock::DIALOG_QUESTION,
-              [[Gtk::Stock::CANCEL, :cancel],
-               [_('_Replace'), :ok]],
-              _("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
-      end
-
-      def erase?
-        show_all && (@response = run)
-        destroy
-        @response == Gtk::ResponseType::OK
-      end
-    end
-
-    class ExportDialog < SimpleDelegator
+    class ExportDialog
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       FORMATS = Alexandria::ExportFormat.all
       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)
+      attr_reader :dialog
 
-        self.current_name = library.name
-        signal_connect('destroy') { hide }
+      def initialize(parent, library, sort_order)
+        @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
@@ -62,12 +42,12 @@ module Alexandria
         THEMES.each do |theme|
           @theme_combo.append_text(theme.name)
         end
-        @theme_combo.signal_connect('changed') do
+        @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_label = Gtk::Label.new(_('_Theme:'), use_underline: true)
+        theme_label = Gtk::Label.new(_("_Theme:"), use_underline: true)
         theme_label.xalign = 0
         theme_label.mnemonic_widget = @theme_combo
 
@@ -75,23 +55,23 @@ module Alexandria
         @types_combo.vexpand = false
         @types_combo.valign = :center
         FORMATS.each do |format|
-          text = format.name + ' ('
+          text = format.name + " ("
           text += if format.ext
-                    '*.' + format.ext
+                    "*." + format.ext
                   else
-                    _('directory')
+                    _("directory")
                   end
-          text += ')'
+          text += ")"
           @types_combo.append_text(text)
         end
         @types_combo.active = 0
-        @types_combo.signal_connect('changed') do
+        @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_label = Gtk::Label.new(_('Export for_mat:'), use_underline: true)
+        types_label = Gtk::Label.new(_("Export for_mat:"), use_underline: true)
         types_label.xalign = 0
         types_label.mnemonic_widget = @types_combo
         types_label.show
@@ -104,37 +84,36 @@ 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
-        while ((response = run) != Gtk::ResponseType::CANCEL) &&
+        while ((response = dialog.run) != Gtk::ResponseType::CANCEL) &&
             (response != Gtk::ResponseType::DELETE_EVENT)
 
           if response == Gtk::ResponseType::HELP
-            Alexandria::UI.display_help(self, 'exporting')
+            Alexandria::UI.display_help(self, "exporting")
           else
             begin
               break if on_export(FORMATS[@types_combo.active],
                                  THEMES[@theme_combo.active])
-            rescue StandardError => e
-              ErrorDialog.new(@export_dialog, _('Export failed'), e.message).display
+            rescue StandardError => ex
+              ErrorDialog.new(@dialog, _("Export failed"), ex.message).display
+              break
             end
           end
         end
-        destroy
+        dialog.destroy
       end
 
       private
 
       def on_export(format, theme)
-        raise NotImplementedError unless @library.respond_to?(format.message)
-
-        filename = self.filename
+        filename = dialog.filename
         if format.ext
-          filename += '.' + format.ext if File.extname(filename).empty?
+          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)
@@ -144,10 +123,10 @@ module Alexandria
           if File.exist?(filename)
             unless File.directory?(filename)
               msg = _("The target, named '%s', is a regular " \
-                      '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
+                      "file.  A directory is needed for this " \
+                      "operation.  Please select a directory and " \
+                      "try again.") % filename
+              ErrorDialog.new(@dialog, _("Not a directory"), msg).display
               return
             end
           else

data/lib/alexandria/ui/icons.rb

@@ -4,47 +4,12 @@
 #
 # See the file README.md for authorship and licensing information.
 
-class GdkPixbuf::Pixbuf
-  def tag(tag_pixbuf)
-    # Computes some tweaks.
-    tweak_x = tag_pixbuf.width / 3
-    tweak_y = tag_pixbuf.height / 3
-
-    # Creates the destination pixbuf.
-    new_pixbuf = GdkPixbuf::Pixbuf.new(colorspace: :rgb,
-                                       has_alpha: true,
-                                       bits_per_sample: 8,
-                                       width: width + tweak_x,
-                                       height: height + tweak_y)
-
-    # Fills with blank.
-    new_pixbuf.fill!(0)
-
-    # Copies the current pixbuf there (south-west).
-    copy_area(0, 0,
-              width, height,
-              new_pixbuf,
-              0, tweak_y)
-
-    # Copies the tag pixbuf there (north-est).
-    tag_pixbuf_x = width - (tweak_x * 2)
-    new_pixbuf.composite!(tag_pixbuf,
-                          dest_x: 0, dest_y: 0,
-                          dest_width: tag_pixbuf.width + tag_pixbuf_x,
-                          dest_height: tag_pixbuf.height,
-                          offset_x: tag_pixbuf_x, offset_y: 0,
-                          scale_x: 1, scale_y: 1,
-                          interpolation_type: :hyper, overall_alpha: 255)
-    new_pixbuf
-  end
-end
-
 module Alexandria
   module UI
     module Icons
       include Logging
 
-      ICONS_DIR = File.join(Alexandria::Config::DATA_DIR, 'icons')
+      ICONS_DIR = File.join(Alexandria::Config::DATA_DIR, "icons")
       def self.init
         load_icon_images
       end
@@ -53,11 +18,11 @@ module Alexandria
       # Alexandria::UI::Icons namespace, e.g., Icons::STAR_SET
       def self.load_icon_images
         Dir.entries(ICONS_DIR).each do |file|
-          next unless file =~ /\.png$/ # skip non '.png' files
+          next unless file.end_with?(".png") # skip non '.png' files
 
           # Don't use upcase and use tr instead
           # For example in Turkish the upper case of 'i' is still 'i'.
-          name = File.basename(file, '.png').tr('a-z', 'A-Z')
+          name = File.basename(file, ".png").tr("a-z", "A-Z")
           const_set(name, GdkPixbuf::Pixbuf.new(file: File.join(ICONS_DIR, file)))
         end
       end
@@ -70,19 +35,49 @@ module Alexandria
           return GdkPixbuf::Pixbuf.new(file: filename) if File.exist?(filename)
         rescue GdkPixbuf::PixbufError
           log.error do
-            "Failed to load GdkPixbuf::Pixbuf, please ensure that #{filename} is a valid image file"
+            "Failed to load GdkPixbuf::Pixbuf," \
+              " please ensure that #{filename} is a valid image file"
           end
         end
         BOOK_ICON
       end
 
+      def self.tag_icon(icon_pixbuf, tag_pixbuf)
+        # Computes some tweaks.
+        tweak_x = tag_pixbuf.width / 3
+        tweak_y = tag_pixbuf.height / 3
+
+        # Creates the destination pixbuf.
+        new_pixbuf = GdkPixbuf::Pixbuf.new(colorspace: :rgb,
+                                           has_alpha: true,
+                                           bits_per_sample: 8,
+                                           width: icon_pixbuf.width + tweak_x,
+                                           height: icon_pixbuf.height + tweak_y)
+
+        # Fills with blank.
+        new_pixbuf.fill!(0)
+
+        # Copies the current pixbuf there (south-west).
+        icon_pixbuf.copy_area(0, 0,
+                              icon_pixbuf.width, icon_pixbuf.height,
+                              new_pixbuf,
+                              0, tweak_y)
+
+        # Copies the tag pixbuf there (north-est).
+        tag_pixbuf_x = icon_pixbuf.width - (tweak_x * 2)
+        new_pixbuf.composite!(tag_pixbuf,
+                              dest_x: 0, dest_y: 0,
+                              dest_width: tag_pixbuf.width + tag_pixbuf_x,
+                              dest_height: tag_pixbuf.height,
+                              offset_x: tag_pixbuf_x, offset_y: 0,
+                              scale_x: 1, scale_y: 1,
+                              interpolation_type: :hyper, overall_alpha: 255)
+        new_pixbuf
+      end
+
       def self.blank?(filename)
         pixbuf = GdkPixbuf::Pixbuf.new(file: filename)
         (pixbuf.width == 1) && (pixbuf.height == 1)
-      rescue StandardError => err
-        puts err.message
-        puts err.backtrace.join("\n> ")
-        true
       end
     end
   end