alexandria-book-collection-manager 0.7.1 → 0.7.2

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2007 Cathal Mc Ginley
 # Copyright (C) 2011, 2016 Matijs van Zuijlen
@@ -26,7 +28,6 @@ require 'alexandria/ui/dialogs/barcode_animation'
 
 module Alexandria
   module UI
-    require 'thread'
     require 'monitor'
 
     # assists in turning on progress bar when searching
@@ -64,9 +65,7 @@ module Alexandria
         @block = block
 
         libraries = Libraries.instance.all_regular_libraries
-        if selected_library.is_a?(SmartLibrary)
-          selected_library = libraries.first
-        end
+        selected_library = libraries.first if selected_library.is_a?(SmartLibrary)
         @combo_libraries.populate_with_libraries(libraries,
                                                  selected_library)
 
@@ -208,9 +207,7 @@ module Alexandria
             book = result[0]
             cover_uri = result[1]
 
-            unless cover_uri.nil?
-              library.save_cover(book, cover_uri)
-            end
+            library.save_cover(book, cover_uri) unless cover_uri.nil?
             books << book
             library << book
             library.save(book)
@@ -320,8 +317,11 @@ module Alexandria
 
       def start_search
         @search_thread_counter.synchronize do
-          if @search_thread_counter.count.zero?
-            @search_thread_counter.new_search
+          first_search = @search_thread_counter.count.zero?
+
+          @search_thread_counter.new_search
+
+          if first_search
             @progress_bar_thread = Thread.new do
               notify_start_add_by_isbn
               Alexandria::BookProviders.instance.add_observer(self)
@@ -333,8 +333,6 @@ module Alexandria
               notify_end_add_by_isbn
               Alexandria::BookProviders.instance.add_observer(self)
             end
-          else
-            @search_thread_counter.new_search
           end
         end
       end
@@ -403,13 +401,11 @@ module Alexandria
                 end
               end
             end
-
           rescue StandardError => err
             log.error {
               "Failed to load cover image icon: #{err.message}"
             }
             log << err if log.error?
-
           end
         end
       end
@@ -443,7 +439,7 @@ module Alexandria
           @scan_area.grab_focus
         end
         @scan_area.signal_connect('focus-in-event') do |_widget, _event|
-          @barcode_label.label = _('%s _Barcode Scanner Ready' % _(@scanner.display_name))
+          @barcode_label.label = _(format('%s _Barcode Scanner Ready', _(@scanner.display_name)))
           @scanner_buffer = ''
           begin
             @animation.set_active
@@ -601,9 +597,7 @@ module Alexandria
         @barcodes_treeview.append_column(col)
 
         @barcodes_treeview.model.signal_connect('row-deleted') do |model, _path|
-          unless model.iter_first
-            @add_button.sensitive = false
-          end
+          @add_button.sensitive = false unless model.iter_first
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 #
 # Alexandria is free software; you can redistribute it and/or

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 #
 # Alexandria is free software; you can redistribute it and/or
@@ -21,8 +23,14 @@ module Alexandria
     # be used for on_load library conversions.
     class BadIsbnsDialog < Gtk::MessageDialog
       def initialize(parent, message = nil, list = nil)
-        message = _("There's a problem") unless message
-        super(parent, Gtk::Dialog::MODAL, Gtk::MessageDialog::WARNING, Gtk::MessageDialog::BUTTONS_CLOSE, message)
+        message ||= _("There's a problem")
+
+        super(parent,
+              Gtk::Dialog::MODAL,
+              Gtk::MessageDialog::WARNING,
+              Gtk::MessageDialog::BUTTONS_CLOSE,
+              message)
+
         isbn_container = Gtk::Box.new :horizontal
         the_vbox = children.first
         the_vbox.pack_start(isbn_container)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #--
 # Copyright (C) 2011 Cathal Mc Ginley

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2016 Matijs van Zuijlen
 #
@@ -106,9 +108,7 @@ module Alexandria
         end
         @checkbutton_want.active = book.want?
 
-        if (@checkbutton_own.active = book.own?)
-          @checkbutton_want.inconsistent = true
-        end
+        @checkbutton_want.inconsistent = true if (@checkbutton_own.active = book.own?)
       end
 
       private
@@ -178,9 +178,7 @@ module Alexandria
 
         FileUtils.rm_f(@cover_file) if @delete_cover_file
 
-        if @original_cover_file
-          FileUtils.rm_f(@original_cover_file)
-        end
+        FileUtils.rm_f(@original_cover_file) if @original_cover_file
 
         @library.save(@book)
         # @on_close_cb.call(@book)
@@ -188,9 +186,7 @@ module Alexandria
       end
 
       def on_cancel
-        if @original_cover_file
-          FileUtils.mv(@original_cover_file, @cover_file)
-        end
+        FileUtils.mv(@original_cover_file, @cover_file) if @original_cover_file
         @book_properties_dialog.destroy
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011, 2014, 2016 Matijs van Zuijlen
 #
@@ -360,9 +362,7 @@ module Alexandria
         @redd_date.sensitive = redd_yes
         if @setup_finished
           # don't do this when popping up the dialog for the first time
-          if redd_yes && @redd_date.text.strip.empty?
-            display_calendar_popup(@redd_date)
-          end
+          display_calendar_popup(@redd_date) if redd_yes && @redd_date.text.strip.empty?
         end
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2014, 2016 Matijs van Zuijlen
 #
@@ -136,9 +138,7 @@ module Alexandria
       private
 
       def on_export(format, theme)
-        unless @library.respond_to?(format.message)
-          raise NotImplementedError
-        end
+        raise NotImplementedError unless @library.respond_to?(format.message)
         filename = self.filename
         if format.ext
           filename += '.' + format.ext if File.extname(filename).empty?

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011, 2016 Matijs van Zuijlen
 #
@@ -16,8 +18,6 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'thread'
-
 class Alexandria::ImportFilter
   def to_filefilter
     filefilter = Gtk::FileFilter.new

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 #
 # Alexandria is free software; you can redistribute it and/or
@@ -23,8 +25,8 @@ module Alexandria
 
       def initialize(parent, library, book)
         super(parent,
-              _("The book '%s' already exists in '%s'. Would you like " \
-                'to replace it?') % [book.title, library.name],
+              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]],
@@ -58,8 +60,8 @@ module Alexandria
           # Deleting books.
         else
           message = if books.length == 1
-                      _("Are you sure you want to delete '%s' " \
-                        "from '%s'?") % [books.first.title, library.name]
+                      format(_("Are you sure you want to delete '%s' " \
+                        "from '%s'?"), books.first.title, library.name)
                     else
                       _('Are you sure you want to delete the ' \
                         "selected books from '%s'?") % library.name

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011, 2015, 2016 Matijs van Zuijlen
 #
@@ -76,9 +78,7 @@ module Alexandria
 
       def setup_dialog_gui
         libraries = Libraries.instance.all_regular_libraries
-        if @selected_library.is_a?(SmartLibrary)
-          @selected_library = libraries.first
-        end
+        @selected_library = libraries.first if @selected_library.is_a?(SmartLibrary)
         @combo_libraries.populate_with_libraries(libraries,
                                                  @selected_library)
 
@@ -223,7 +223,7 @@ module Alexandria
                 if pixbuf.width > 1
                   iter = @treeview_results.model.get_iter(key.to_s)
                   unless @treeview_results.model.iter_is_valid?(iter)
-                    raise 'Iter is invalid! %s' % iter
+                    raise format('Iter is invalid! %s', iter)
                   end
                   iter[2] = pixbuf # I bet you this is it!
                 end
@@ -270,15 +270,16 @@ module Alexandria
         criterion = @entry_search.text.strip
         @treeview_results.model.clear
         log.info {
-          'TreeStore Model: %s columns; ref_counts: %s' %
-            [@treeview_results.model.n_columns, @treeview_results.model.ref_count]
+          format('TreeStore Model: %s columns; ref_counts: %s',
+                 @treeview_results.model.n_columns,
+                 @treeview_results.model.ref_count)
         }
 
         @find_error = nil
         @results = nil
 
-        @find_thread.kill if @find_thread
-        @image_thread.kill if @image_thread
+        @find_thread&.kill
+        @image_thread&.kill
 
         notify_start_add_by_isbn
         GLib::Idle.add do
@@ -311,17 +312,14 @@ module Alexandria
                        false
                      elsif @results
                        log.info { "Got results: #{@results[0]}..." }
-                       @results.each do |book, _cover|
-                         s = _('%s, by %s') % [book.title,
-                                               book.authors.join(', ')]
+                       @results.each_key do |book|
+                         s = format(_('%s, by %s'), book.title, book.authors.join(', '))
                          similar_books = @results.find { |book2, _cover2|
                            (book.title == book2.title) &&
                              (book.authors == book2.authors)
                          }
-                         if similar_books.length > 1
-                           s += " (#{book.edition}, #{book.publisher})"
-                         end
-                         log.info { 'Copying %s into tree view.' % book.title }
+                         s += " (#{book.edition}, #{book.publisher})" if similar_books.length > 1
+                         log.info { format('Copying %s into tree view.', book.title) }
                          iter = @treeview_results.model.append
                          iter[0] = s
                          iter[1] = book.ident
@@ -366,17 +364,13 @@ module Alexandria
           tmp = ((32 + tmp.length * 3 / 4).to_i.chr << tmp).unpack('u')[0]
           tmp.chomp!("\000")
           entry.text = tmp.gsub!(/./) { |c| (c[0] ^ 67).chr }
-          if entry.text.count('^ -~') > 0
-            entry.text = 'Bad scan result'
-          end
+          entry.text = 'Bad scan result' if entry.text.count('^ -~') > 0
         end
       end
 
       def on_results_button_press_event(_widget, event)
         # double left click
-        if (event.event_type == :'2button_press') && (event.button == 1)
-          on_add
-        end
+        on_add if (event.event_type == :'2button_press') && (event.button == 1)
       end
 
       def add_single_book_by_isbn(library, is_new)
@@ -456,9 +450,7 @@ module Alexandria
       end
 
       def add_book_to_library(library, book, cover_uri)
-        unless cover_uri.nil?
-          library.save_cover(book, cover_uri)
-        end
+        library.save_cover(book, cover_uri) unless cover_uri.nil?
         library << book
         library.save(book)
       end
@@ -491,8 +483,8 @@ module Alexandria
 
       def on_add
         return unless @button_add.sensitive?
-        @find_thread.kill if @find_thread
-        @image_thread.kill if @image_thread
+        @find_thread&.kill
+        @image_thread&.kill
 
         begin
           libraries = Libraries.instance.all_libraries
@@ -510,7 +502,6 @@ module Alexandria
 
           # Do not destroy if there is no addition.
           #          return unless book_was_added
-
         rescue => e
           ErrorDialog.new(@parent, _("Couldn't add the book"), e.message)
         end
@@ -518,8 +509,8 @@ module Alexandria
       end
 
       def on_cancel
-        @find_thread.kill if @find_thread
-        @image_thread.kill if @image_thread
+        @find_thread&.kill
+        @image_thread&.kill
         @new_book_dialog.destroy
       end
 
@@ -614,8 +605,8 @@ module Alexandria
         isbn13 = Library.canonicalise_ean(isbn)
         puts isbn13
         if (book = library.find { |bk| bk.isbn == isbn13 })
-          raise DuplicateBookException, _("'%s' already exists in '%s' (titled '%s').") % \
-            [isbn, library.name, book.title.sub('&', '&amp;')]
+          raise DuplicateBookException, format(_("'%s' already exists in '%s' (titled '%s')."),
+                                               isbn, library.name, book.title.sub('&', '&amp;'))
         end
         true
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011, 2014 Matijs van Zuijlen
 #
@@ -84,9 +86,7 @@ module Alexandria
           ary = @library.select { |book|
             book.ident == @entry_isbn.text
           }
-          unless ary.empty?
-            raise AddError, _('The EAN/ISBN you provided is already used in this library.')
-          end
+          raise AddError, _('The EAN/ISBN you provided is already used in this library.') unless ary.empty?
           isbn = begin
                    Library.canonicalise_isbn(@entry_isbn.text)
                  rescue Alexandria::Library::InvalidISBNError

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2015, 2016 Matijs van Zuijlen
 #
@@ -64,9 +66,7 @@ module Alexandria
       def smart_library_base_name(rules)
         if rules.length == 1
           value = rules.first.value
-          if value.is_a?(String) && !value.strip.empty?
-            return value
-          end
+          return value if value.is_a?(String) && !value.strip.empty?
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011, 2016 Matijs van Zuijlen
 #
@@ -296,9 +298,7 @@ module Alexandria
           @checkbutton_prov_advanced.sensitive = false
         else
           view_advanced = Preferences.instance.view_advanced_settings
-          if view_advanced
-            @checkbutton_prov_advanced.active = true
-          end
+          @checkbutton_prov_advanced.active = true if view_advanced
         end
 
         setup_enable_disable_popup
@@ -332,9 +332,7 @@ module Alexandria
           iter = @scanner_device_model.append
           iter[0] = scanner.display_name
           iter[1] = scanner.name
-          if chosen_scanner_name == scanner.name
-            @scanner_device_type.active = index
-          end
+          @scanner_device_type.active = index if chosen_scanner_name == scanner.name
           index += 1
         end
 
@@ -409,9 +407,7 @@ module Alexandria
 
       def on_provider_setup
         provider = selected_provider
-        unless prefs_empty(provider.prefs)
-          ProviderPreferencesDialog.new(@preferences_dialog, provider)
-        end
+        ProviderPreferencesDialog.new(@preferences_dialog, provider) unless prefs_empty(provider.prefs)
       end
 
       def on_provider_up
@@ -449,9 +445,7 @@ module Alexandria
 
       def on_scanner_device_type(_combo)
         iter = @scanner_device_type.active_iter
-        if iter && iter[1]
-          Preferences.instance.barcode_scanner = iter[1]
-        end
+        Preferences.instance.barcode_scanner = iter[1] if iter && iter[1]
       end
 
       def on_use_scanning_sound(checkbox)
@@ -496,9 +490,7 @@ module Alexandria
 
       def on_providers_button_press_event(_widget, event)
         # double left click
-        if (event.event_type == :'2button_press') && (event.button == 1)
-          on_provider_setup
-        end
+        on_provider_setup if (event.event_type == :'2button_press') && (event.button == 1)
       end
 
       def on_close
@@ -531,9 +523,7 @@ module Alexandria
 
       def selected_provider
         iter = @treeview_providers.selection.selected
-        unless iter.nil?
-          BookProviders.find { |x| x.name == iter[1] }
-        end
+        BookProviders.find { |x| x.name == iter[1] } unless iter.nil?
       end
 
       def adjust_selected_provider(prov)