alexandria-book-collection-manager 0.7.5 → 0.7.6

data/lib/alexandria/scanners.rb

@@ -40,8 +40,8 @@ module Alexandria
       registry.find { |scanner| scanner.name == name }
     end
 
-    def self.each_scanner
-      registry.each { |scanner| yield scanner }
+    def self.each_scanner(&block)
+      registry.each(&block)
     end
 
     private_class_method :registry

data/lib/alexandria/scanners/cue_cat.rb

@@ -23,7 +23,7 @@ require "alexandria/scanners"
 module Alexandria
   module Scanners
     class CueCat
-      include Alexandria::Logging
+      include Logging
 
       def name
         "CueCat"
@@ -72,7 +72,8 @@ module Alexandria
 
         return code if type == "IBN"
 
-        raise "Don't know how to handle type #{type} (barcode: #{code})"
+        raise format(_("Don't know how to handle type %<type>s (barcode: %<code>s)"),
+                     type: type, code: code)
       end
 
       private
@@ -85,8 +86,7 @@ module Alexandria
 
         padding = pad(values)
         result  = calc(values)
-        result  = result[0, result.length - padding]
-        result
+        result[0, result.length - padding]
       end
 
       def calc(values)
@@ -106,7 +106,7 @@ module Alexandria
         length = array.length % 4
 
         if length.nonzero?
-          raise "Error parsing CueCat input" if length == 1
+          raise _("Error parsing CueCat input") if length == 1
 
           length = 4 - length
           length.times { array.push(0) }

data/lib/alexandria/scanners/keyboard.rb

@@ -48,7 +48,7 @@ module Alexandria
         elsif data.length >= 13
           data[0, 13]
         else
-          raise "Unknown scan data #{data}"
+          raise format(_("Unknown scan data %s<data>"), data: data)
         end
       end
     end

data/lib/alexandria/smart_library.rb

@@ -16,7 +16,7 @@ module Alexandria
 
     ALL_RULES = 1
     ANY_RULE = 2
-    attr_reader :name
+    attr_reader :name, :n_rated
     attr_accessor :rules, :predicate_operator_rule, :deleted_books
 
     EXT = ".yaml"
@@ -94,22 +94,23 @@ module Alexandria
     end
 
     def name=(new_name)
-      if @name != new_name
-        old_yaml = yaml
-        @name = new_name
-        FileUtils.mv(old_yaml, yaml)
-        save
-      end
+      return unless @name != new_name
+
+      old_yaml = yaml
+      @name = new_name
+      FileUtils.mv(old_yaml, yaml)
+      save
     end
 
     def update(*params)
-      if params.first.is_a?(LibraryCollection)
+      case params.first
+      when LibraryCollection
         libraries, _, library = params
         unless library.is_a?(self.class)
           self.libraries = libraries.all_libraries
           refilter
         end
-      elsif params.first.is_a?(Library)
+      when Library
         refilter
       end
     end
@@ -172,14 +173,12 @@ module Alexandria
       end
     end
 
-    attr_reader :n_rated
-
     def n_unrated
       length - n_rated
     end
 
-    def ==(object)
-      object.is_a?(self.class) && object.name == name
+    def ==(other)
+      other.is_a?(self.class) && other.name == name
     end
 
     @@deleted_libraries = []
@@ -190,15 +189,16 @@ module Alexandria
 
     def self.really_delete_deleted_libraries
       @@deleted_libraries.each do |library|
-        puts "Deleting smart library file (#{yaml})" if $DEBUG
+        log.debug { "Deleting smart library file (#{yaml})" }
         FileUtils.rm_rf(library.yaml)
       end
     end
 
     def delete
       if @@deleted_libraries.include?(self)
-        puts "Already deleted a SmartLibrary with this name"
-        puts "(this might mess up undeletes...)"
+        log.info do
+          "Already deleted a SmartLibrary with this name (this might mess up undeletes)"
+        end
         FileUtils.rm_rf(yaml)
         # so we just delete the old smart library, and
         # 'pending' delete the new one of the same name...
@@ -265,8 +265,8 @@ module Alexandria
 
       Operand = Struct.new(:name, :klass)
       class Operand
-        def <=>(x)
-          name <=> x.name
+        def <=>(other)
+          name <=> other.name
         end
       end
 
@@ -281,8 +281,8 @@ module Alexandria
 
       Operator = Struct.new(:sym, :name, :proc)
       class Operator
-        def <=>(x)
-          name <=> x.name
+        def <=>(other)
+          name <=> other.name
         end
       end
 
@@ -462,17 +462,13 @@ module Alexandria
             end
           end
         else
-          raise "invalid operand klass #{operand.klass}"
+          raise format(_("invalid operand klass %<klass>s"), klass: operand.klass)
         end
       end
 
       def filter_proc
         proc do |book|
-          begin
-            left_value = book.send(@operand.book_selector)
-          rescue StandardError => ex
-            puts ex.message
-          end
+          left_value = book.send(@operand.book_selector)
           right_value = @value
           if right_value.is_a?(String)
             left_value = left_value.to_s.downcase

data/lib/alexandria/ui.rb

@@ -31,21 +31,21 @@ module Alexandria
   module UI
     include Logging
     def self.init_icons
-      log.info { "Initializing Icons..." }
+      log.info { "Initializing Icons" }
       Icons.init
     end
 
     def self.start_main_app
-      puts "==========================" if $DEBUG
-      log.info { "Starting MainApp..." }
-      puts "==========================" if $DEBUG
+      log.debug { "==========================" }
+      log.info { "Starting MainApp" }
+      log.debug { "==========================" }
       MainApp.instance
     end
 
     def self.start_gtk
-      puts "====================================" if $DEBUG
-      log.info { "Starting Gtk..." }
-      puts "====================================" if $DEBUG
+      log.debug { "====================================" }
+      log.info { "Starting Gtk" }
+      log.debug { "====================================" }
       Gtk.main
     end
 

data/lib/alexandria/ui/about_dialog.rb

@@ -7,7 +7,7 @@
 module Alexandria
   module UI
     class AboutDialog
-      GPL = <<~EOL
+      GPL = <<~EOL # rubocop:disable GetText/DecorateString
         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

data/lib/alexandria/ui/acquire_dialog.rb

@@ -64,6 +64,10 @@ module Alexandria
         @search_threads_running = @search_thread_counter.new_cond
       end
 
+      def show
+        @acquire_dialog.show
+      end
+
       def widget_names
         [:acquire_dialog, :add_button, :barcodes_treeview, :barcode_label,
          :scan_area, :scan_frame, :combo_libraries]
@@ -71,14 +75,9 @@ module Alexandria
 
       def book_in_library(isbn10, library)
         isbn13 = Library.canonicalise_ean(isbn10)
-        # puts "new book #{isbn10} (or #{isbn13})"
         match = library.find do |book|
-          # puts "testing #{book.isbn}"
           (book.isbn == isbn10 || book.isbn == isbn13)
-          # puts "book #{book.isbn}"
-          # book == new_book
         end
-        # puts "book_in_library match #{match.inspect}"
         !match.nil?
       rescue StandardError
         log.warn { "Failed to check for book #{isbn10} in library #{library}" }
@@ -472,7 +471,7 @@ module Alexandria
             if @scanner.match? @scanner_buffer
 
               Thread.new(@interval, @scanner_buffer) do |interval, buffer|
-                log.debug { "Waiting for more scanner input..." }
+                log.debug { "Waiting for more scanner input" }
                 GLib::Idle.add do
                   @animation.manual_input
                   false
@@ -492,7 +491,7 @@ module Alexandria
 
                 else
                   log.debug do
-                    "Buffer has changed while waiting, reading more characters..."
+                    "Buffer has changed while waiting; reading more characters"
                   end
                 end
               end
@@ -511,12 +510,12 @@ module Alexandria
 
       def play_sound(effect)
         if effect == "scanning"
-          puts "Effect: #{effect}, playing: #{@prefs.play_scanning_sound}" if $DEBUG
+          log.debug { "Effect: #{effect}, playing: #{@prefs.play_scanning_sound}" }
           return unless @prefs.play_scanning_sound
 
           @sound_players["scanning"].play("scanning")
         else
-          puts "Effect: #{effect}, playing: #{@prefs.play_scan_sound}" if $DEBUG
+          log.debug { "Effect: #{effect}, playing: #{@prefs.play_scan_sound}" }
           return unless @prefs.play_scan_sound
 
           # sleep(0.5) # "scanning" effect lasts 0.5 seconds, wait for it to end
@@ -525,7 +524,7 @@ module Alexandria
       end
 
       def developer_test_scan
-        log.info { "Developer test scan." }
+        log.info { "Developer test scan" }
         scans = [".C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3j3C3f1Dxj3Dq.",
                  ".C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3z0CNj3Dhj1EW.",
                  ".C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3r2DNbXCxTZCW.",

data/lib/alexandria/ui/alert_dialog.rb

@@ -6,20 +6,17 @@
 
 module Alexandria
   module UI
-    class AlertDialog < SimpleDelegator
+    class AlertDialog
       def initialize(parent, title, stock_icon, buttons, message = nil)
-        dialog = Gtk::Dialog.new(title: "", parent: parent, flags: :destroy_with_parent,
-                                 buttons: buttons)
-        super(dialog)
-
-        self.border_width = 6
-        self.resizable = false
-        child.spacing = 12
+        @dialog = Gtk::Dialog.new(title: "", parent: parent, flags: :destroy_with_parent,
+                                  buttons: buttons)
+        @dialog.border_width = 6
+        @dialog.resizable = false
+        @dialog.child.spacing = 12
 
         hbox = Gtk::Box.new(:horizontal, 12)
         hbox.homogeneous = false
         hbox.border_width = 6
-        child.pack_start(hbox)
 
         image = Gtk::Image.new(stock: stock_icon,
                                size: Gtk::IconSize::DIALOG)
@@ -28,21 +25,39 @@ module Alexandria
 
         vbox = Gtk::Box.new(:vertical, 6)
         vbox.homogeneous = false
+        vbox.pack_start make_label("<b><big>#{title}</big></b>")
+        vbox.pack_start make_label(message.strip) unless message
         hbox.pack_start(vbox)
 
+        @dialog.child.pack_start(hbox)
+      end
+
+      def show_all
+        dialog.show_all
+      end
+
+      def run
+        dialog.run
+      end
+
+      def destroy
+        dialog.destroy
+      end
+
+      def default_response=(response)
+        dialog.default_response = response
+      end
+
+      private
+
+      attr_reader :dialog
+
+      def make_label(markup)
         label = Gtk::Label.new
         label.set_alignment(0, 0)
         label.wrap = label.selectable = true
-        label.markup = "<b><big>#{title}</big></b>"
-        vbox.pack_start(label)
-
-        if message
-          label = Gtk::Label.new
-          label.set_alignment(0, 0)
-          label.wrap = label.selectable = true
-          label.markup = message.strip
-          vbox.pack_start(label)
-        end
+        label.markup = markup
+        label
       end
     end
   end

data/lib/alexandria/ui/bad_isbns_dialog.rb

@@ -8,17 +8,16 @@ 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 < SimpleDelegator
+    class BadIsbnsDialog
       def initialize(parent, message, list)
-        dialog = Gtk::MessageDialog.new(parent: parent,
-                                        flags: :modal,
-                                        type: :warning,
-                                        buttons: :close,
-                                        message: message)
-        super(dialog)
+        @dialog = Gtk::MessageDialog.new(parent: parent,
+                                         flags: :modal,
+                                         type: :warning,
+                                         buttons: :close,
+                                         message: message)
+        the_vbox = @dialog.children.first
 
         isbn_container = Gtk::Box.new :horizontal
-        the_vbox = children.first
         the_vbox.pack_start(isbn_container)
         the_vbox.reorder_child(isbn_container, 3)
         scrolley = Gtk::ScrolledWindow.new
@@ -30,7 +29,12 @@ module Alexandria
         list.each do |li|
           textview.buffer.insert_at_cursor("#{li}\n")
         end
-        show_all
+
+        @dialog.signal_connect("response") { @dialog.destroy }
+      end
+
+      def show
+        @dialog.show_all
       end
     end
   end

data/lib/alexandria/ui/barcode_animation.rb

@@ -96,11 +96,11 @@ module Alexandria
       end
 
       def set_passive
-        if @canvas
-          passive_bg = "#F4F4F4"
-          @canvas.set_property(:background_color, passive_bg)
-          @barcode_bars.each { |rect| rect.set_property(:fill_color, passive_bg) }
-        end
+        @canvas or return
+
+        passive_bg = "#F4F4F4"
+        @canvas.set_property(:background_color, passive_bg)
+        @barcode_bars.each { |rect| rect.set_property(:fill_color, passive_bg) }
       end
 
       def manual_input

data/lib/alexandria/ui/book_properties_dialog.rb

@@ -16,7 +16,7 @@ module Alexandria
 
       def initialize(parent, library, book)
         super(parent, library.cover(book))
-        puts "Initializing Book Properties Dialog..." if $DEBUG
+        log.debug { "Initializing Book Properties Dialog" }
 
         cancel_button = Gtk::Button.new(stock_id: Gtk::Stock::CANCEL)
         cancel_button.signal_connect("clicked") { on_cancel }
@@ -86,7 +86,7 @@ module Alexandria
         if (@checkbutton_redd.active = book.redd?)
           @redd_date.sensitive = true
           if book.redd_when.nil?
-            puts "no redd_when"
+            log.debug { "no redd_when" }
           else
             @redd_date.text = format_date(book.redd_when)
           end

data/lib/alexandria/ui/book_properties_dialog_base.rb

@@ -59,6 +59,10 @@ module Alexandria
         end
       end
 
+      def show
+        @book_properties_dialog.show
+      end
+
       def setup_calendar_widgets
         @popup_displayed = false
         @calendar_popup = Gtk::Window.new # Gtk::Window::POPUP)
@@ -107,17 +111,19 @@ module Alexandria
         end
 
         @redd_date.signal_connect("icon-press") do |entry, primary, _icon|
-          if primary.nick == "primary"
+          case primary.nick
+          when "primary"
             display_calendar_popup(entry)
-          elsif primary.nick == "secondary"
+          when "secondary"
             clear_date_entry(entry)
           end
         end
 
         @date_loaned_since.signal_connect("icon-press") do |entry, primary, _icon|
-          if primary.nick == "primary"
+          case primary.nick
+          when "primary"
             display_calendar_popup(entry)
-          elsif primary.nick == "secondary"
+          when "secondary"
             clear_date_entry(entry)
             @label_loaning_duration.label = ""
           end
@@ -263,18 +269,17 @@ module Alexandria
                                             [Gtk::Stock::OPEN, Gtk::ResponseType::ACCEPT])
         dialog.current_folder = @@latest_filechooser_directory
         response = dialog.run
-        if response == Gtk::ResponseType::ACCEPT
+        case response
+        when Gtk::ResponseType::ACCEPT
           begin
             @delete_cover_file = false
             cover = GdkPixbuf::Pixbuf.new(file: dialog.filename)
             # At this stage the file format is recognized.
 
-            if File.exist?(@cover_file)
-              unless @original_cover_file
-                # make a back up, but only of the original
-                @original_cover_file = "#{@cover_file}~"
-                FileUtils.cp(@cover_file, @original_cover_file)
-              end
+            if File.exist?(@cover_file) && !@original_cover_file
+              # make a back up, but only of the original
+              @original_cover_file = "#{@cover_file}~"
+              FileUtils.cp(@cover_file, @original_cover_file)
             end
             if cover.height > COVER_ABSOLUTE_MAXHEIGHT
               FileUtils.cp(dialog.filename, "#{@cover_file}.orig")
@@ -294,7 +299,7 @@ module Alexandria
           rescue RuntimeError => ex
             ErrorDialog.new(@book_properties_dialog, ex.message).display
           end
-        elsif response == Gtk::ResponseType::REJECT
+        when Gtk::ResponseType::REJECT
           ## FileUtils.rm_f(@cover_file) # fixing bug #16707
           @delete_cover_file = true
 
@@ -347,10 +352,11 @@ module Alexandria
       def redd_toggled
         redd_yes = @checkbutton_redd.active?
         @redd_date.sensitive = redd_yes
-        if @setup_finished
-          # don't do this when popping up the dialog for the first time
-          display_calendar_popup(@redd_date) if redd_yes && @redd_date.text.strip.empty?
-        end
+
+        return unless redd_yes && @redd_date.text.strip.empty?
+
+        # don't do this when popping up the dialog for the first time
+        display_calendar_popup(@redd_date) if @setup_finished
       end
 
       private
@@ -363,7 +369,7 @@ module Alexandria
           @image_rating4,
           @image_rating5
         ]
-        raise "out of range" if rating < 0 || rating > images.length
+        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 }