alexandria-book-collection-manager 0.7.1 → 0.7.2

data/lib/alexandria/ui/dialogs/smart_library_properties_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/smart_library_properties_dialog_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011, 2016 Matijs van Zuijlen
 #
@@ -143,9 +145,7 @@ module Alexandria
         date_entry.primary_icon_name = Gtk::Stock::EDIT
         date_entry.primary_icon_activatable = true
         date_entry.signal_connect('icon-press') do |entry, primary, _icon|
-          if primary.nick == 'primary'
-            display_calendar_popup(entry)
-          end
+          display_calendar_popup(entry) if primary.nick == 'primary'
         end
 
         # Really hide the time part of the date entry, as the constructor
@@ -270,9 +270,7 @@ module Alexandria
         state = boxes.length > 1
         boxes.each do |box|
           button = box.children[-1]
-          if button.is_a?(Gtk::Button)
-            button.sensitive = state
-          end
+          button.sensitive = state if button.is_a?(Gtk::Button)
         end
       end
 

data/lib/alexandria/ui/dndable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2016 Matijs van Zuijlen
@@ -22,11 +24,11 @@ module Alexandria
     BOOKS_TARGET_TABLE = [Gtk::TargetEntry.new('ALEXANDRIA_BOOKS', :same_app, 0)].freeze
 
     module DragAndDropable
-      BADGE_MARKUP = '<span weight="heavy" foreground="white">%d</span>'.freeze
+      BADGE_MARKUP = '<span weight="heavy" foreground="white">%d</span>'
 
       def setup_view_source_dnd(view)
         # better be Loggable!
-        log.info { 'setup_view_source_dnd for %s' % view }
+        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

data/lib/alexandria/ui/icons.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2014-2016 Matijs van Zuijlen
 #
@@ -75,9 +77,7 @@ module Alexandria
         begin
           return BOOK_ICON if library.nil?
           filename = library.cover(book)
-          if File.exist?(filename)
-            return GdkPixbuf::Pixbuf.new(file: filename)
-          end
+          return GdkPixbuf::Pixbuf.new(file: filename) if File.exist?(filename)
         rescue => err
           # report load error; FIX should go to a Logger...
           puts err.message

data/lib/alexandria/ui/iconview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2016 Matijs van Zuijlen
@@ -61,9 +63,7 @@ module Alexandria
         end
 
         # DND support for Gtk::IconView is shipped since GTK+ 2.8.0.
-        if @iconview.respond_to?(:enable_model_drag_source)
-          setup_view_source_dnd(@iconview)
-        end
+        setup_view_source_dnd(@iconview) if @iconview.respond_to?(:enable_model_drag_source)
       end
 
       ICONS_SORTS = [

data/lib/alexandria/ui/iconview_tooltips.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #
 # Copyright (C) 2007 kksou
@@ -59,15 +61,11 @@ class IconViewTooltips
       html += "<b>#{CGI.escapeHTML(title)}</b>"
       html += "\n" unless authors.empty?
     end
-    unless authors.empty?
-      html += "<i>#{CGI.escapeHTML(authors)}</i>"
-    end
+    html += "<i>#{CGI.escapeHTML(authors)}</i>" unless authors.empty?
     html += "\n" if !title.empty? || !authors.empty?
 
     html += '<small>'
-    if publisher && !publisher.empty?
-      html += CGI.escapeHTML(publisher).to_s
-    end
+    html += CGI.escapeHTML(publisher).to_s if publisher && !publisher.empty?
 
     if year && !year.empty?
       html += ' ' if publisher && !publisher.empty?

data/lib/alexandria/ui/init.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2011, 2016 Matijs van Zuijlen

data/lib/alexandria/ui/libraries_combo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2016 Matijs van Zuijlen
 #

data/lib/alexandria/ui/listview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2010 Cathal Mc Ginley
@@ -44,7 +46,7 @@ module Alexandria
 
       def setup_title_column
         title = _('Title')
-        log.debug { 'Create listview column for %s' % title }
+        log.debug { format('Create listview column for %s', title) }
         column = Gtk::TreeViewColumn.new(title)
 
         renderer = Gtk::CellRendererPixbuf.new
@@ -52,7 +54,7 @@ module Alexandria
         column.add_attribute(renderer, 'pixbuf', Columns::COVER_LIST)
 
         renderer = Gtk::CellRendererText.new
-        renderer.ellipsize = Pango::ELLIPSIZE_END
+        renderer.ellipsize = :end
         column.pack_start(renderer, true)
         column.add_attribute(renderer, 'text', Columns::TITLE)
 
@@ -101,7 +103,7 @@ module Alexandria
         title = _('Tags')
         log.debug { 'Create listview column for tags...' }
         renderer = Gtk::CellRendererText.new
-        renderer.ellipsize = Pango::ELLIPSIZE_END
+        renderer.ellipsize = :end
         column = Gtk::TreeViewColumn.new(title, renderer,
                                          text: Columns::TAGS)
         column.sort_column_id = Columns::TAGS
@@ -119,7 +121,7 @@ module Alexandria
 
       def setup_rating_column
         title = _('Rating')
-        log.debug { 'Create listview column for %s...' % title }
+        log.debug { format('Create listview column for %s...', title) }
         column = Gtk::TreeViewColumn.new(title)
         column.sizing = :fixed
         width = (Icons::STAR_SET.width + 1) * Book::MAX_RATING_STARS
@@ -181,21 +183,19 @@ module Alexandria
         column = Gtk::TreeViewColumn.new(title, renderer, text: iterid)
         column.sort_column_id = iterid
         column.resizable = true
-        log.debug { 'Create listview column for %s...' % title }
+        log.debug { format('Create listview column for %s...', title) }
 
         column.add_attribute(renderer, 'active', iterid)
-        if iterid == Columns::WANT
-          column.add_attribute(renderer, 'inconsistent', Columns::OWN)
-        end
+        column.add_attribute(renderer, 'inconsistent', Columns::OWN) if iterid == Columns::WANT
 
         log.debug { "append_column #{column}" }
         @listview.append_column(column)
       end
 
       def setup_text_column(title, iterid)
-        log.debug { 'Create listview column for %s...' % title }
+        log.debug { format('Create listview column for %s...', title) }
         renderer = Gtk::CellRendererText.new
-        renderer.ellipsize = Pango::ELLIPSIZE_END
+        renderer.ellipsize = :end
         column = Gtk::TreeViewColumn.new(title, renderer,
                                          text: iterid)
         column.sort_column_id = iterid
@@ -231,7 +231,7 @@ module Alexandria
       def setup_listview_columns_width
         log.debug { "setup_listview_columns_width #{@prefs.cols_width}" }
         if @prefs.cols_width
-          cols_width = YAML.load(@prefs.cols_width)
+          cols_width = YAML.safe_load(@prefs.cols_width)
           log.debug { "cols_width: #{cols_width.inspect}" }
           @listview.columns.each do |c|
             if cols_width.key?(c.title)
@@ -243,7 +243,10 @@ module Alexandria
             end
           end
         end
-        log.debug { 'Columns width: ' + @listview.columns.map { |col| "#{col.title} #{col.width}" }.join(', ') }
+        log.debug {
+          'Columns width: ' +
+            @listview.columns.map { |col| "#{col.title} #{col.width}" }.join(', ')
+        }
       end
     end
   end

data/lib/alexandria/ui/main_app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2007 Cathal Mc Ginley
 # Copyright (C) 2011 Matijs van Zuijlen

data/lib/alexandria/ui/multi_drag_treeview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011, 2016 Matijs van Zuijlen
 #

data/lib/alexandria/ui/sidepane.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2008,2009 Cathal Mc Ginley
 # Copyright (C) 2011, 2014-2016 Matijs van Zuijlen
@@ -48,10 +50,10 @@ module Alexandria
         # also no initial . since that hides the Library (hidden file)
         #      forbidding an initial dot also disallows "." and ".."
         #      which are of course pre-existing directories.
-        return match
+        match
       rescue => ex
         log.warn { "New library name not valid UTF-8: #{ex.message}" }
-        return true
+        true
         # /([^\w\s'"()&?!:;.\-])/.match(new_text) # anglocentric!
       end
 
@@ -113,7 +115,7 @@ module Alexandria
           cell.pixbuf = iter[0]
         end
         renderer = Gtk::CellRendererText.new
-        renderer.ellipsize = Pango::ELLIPSIZE_END
+        renderer.ellipsize = :end
         column.pack_start(renderer, true)
         column.set_cell_data_func(renderer) do |_col, cell, _model, iter|
           # log.debug { "sidepane: editable #{cell}, #{iter} #{iter[1]}: #{iter[2]}" }
@@ -163,7 +165,7 @@ module Alexandria
           @library_listview.set_drag_dest_row(path, :into_or_after)
 
           Gdk.drag_status(drag_context,
-                          !path.nil? ? drag_context.suggested_action : 0,
+                          path ? drag_context.suggested_action : 0,
                           time)
         end
 
@@ -176,13 +178,13 @@ module Alexandria
           true
         end
 
-        @library_listview.signal_connect('drag-data-received') do |_widget, drag_context, x, y, selection_data, _info, _time|
+        @library_listview.signal_connect('drag-data-received') do |_, drag_context, x, y, data, _, _|
           log.debug { 'drag-data-received' }
 
           success = false
           # FIXME: Ruby-GNOME2 should make comparison work without needing to
           # call #name.
-          if selection_data.data_type.name == Gdk::Selection::TYPE_STRING.name
+          if data.data_type.name == Gdk::Selection::TYPE_STRING.name
             success, path =
               @library_listview.get_dest_row_at_pos(x, y)
 

data/lib/alexandria/ui/sound.rb

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

data/lib/alexandria/ui/ui_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2011, 2016 Matijs van Zuijlen
@@ -380,8 +382,13 @@ module Alexandria
       end
 
       def determine_library_popup(widget, event)
-        # widget.grab_focus
-        widget.get_path_at_pos(event.x, event.y).nil? ? @nolibrary_popup : selected_library.is_a?(SmartLibrary) ? @smart_library_popup : @library_popup
+        if widget.get_path_at_pos(event.x, event.y).nil?
+          @nolibrary_popup
+        elsif selected_library.is_a?(SmartLibrary)
+          @smart_library_popup
+        else
+          @library_popup
+        end
       end
 
       def event_is_right_click(event)
@@ -418,23 +425,19 @@ module Alexandria
         else
           n_unrated = library.n_unrated
           if n_unrated == library.length
-            n_("Library '%s' selected, %d unrated book",
-               "Library '%s' selected, %d unrated books",
-               library.length) % [library.name,
-                                  library.length]
+            format(n_("Library '%s' selected, %d unrated book",
+                      "Library '%s' selected, %d unrated books",
+                      library.length), library.name, library.length)
           elsif n_unrated.zero?
-            n_("Library '%s' selected, %d book",
-               "Library '%s' selected, %d books",
-               library.length) % [library.name,
-                                  library.length]
+            format(n_("Library '%s' selected, %d book",
+                      "Library '%s' selected, %d books",
+                      library.length), library.name, library.length)
           else
-            n_("Library '%s' selected, %d book, " \
+            format(n_("Library '%s' selected, %d book, " \
                '%d unrated',
-               "Library '%s' selected, %d books, " \
-               '%d unrated',
-               library.length) % [library.name,
-                                  library.length,
-                                  n_unrated]
+                      "Library '%s' selected, %d books, " \
+                      '%d unrated',
+                      library.length), library.name, library.length, n_unrated)
           end
         end
       end
@@ -459,7 +462,6 @@ module Alexandria
         library = selected_library
         books = selected_books
         set_status_label(get_appbar_status(library, books))
-        # selection = @library_listview.selection.selected ? @library_listview.selection.selected.has_focus? : false
 
         # Focus is the wrong idiom here.
         unless @clicking_on_sidepane || (@main_app.focus == @library_listview)
@@ -467,7 +469,10 @@ module Alexandria
 
           log.debug { "Currently focused widget: #{@main_app.focus.inspect}" }
           log.debug { "#{@library_listview} : #{@library_popup} : #{@listview}" }
-          log.debug { "@library_listview: #{@library_listview.has_focus?} or @library_popup:#{@library_popup.has_focus?}" } # or selection: #{selection}"}
+          log.debug {
+            "@library_listview: #{@library_listview.has_focus?} " \
+            "or @library_popup:#{@library_popup.has_focus?}"
+          }
           log.debug { '@library_listview does *NOT* have focus' }
           log.debug { "Books are empty: #{books.empty?}" }
           @actiongroup['Properties'].sensitive = \
@@ -503,9 +508,7 @@ module Alexandria
               @actiongroup[provider.action_name].sensitive = !has_no_url
               no_urls = false unless has_no_url
             end
-            if no_urls
-              @actiongroup['OnlineInformation'].sensitive = false
-            end
+            @actiongroup['OnlineInformation'].sensitive = false if no_urls
           end
         end
         @clicking_on_sidepane = false
@@ -575,9 +578,7 @@ module Alexandria
           @actiongroup['Undo'].sensitive = caller.can_undo?
           @actiongroup['Redo'].sensitive = caller.can_redo?
         elsif caller.is_a?(Library)
-          unless caller.updating?
-            handle_update_caller_library ary
-          end
+          handle_update_caller_library ary unless caller.updating?
         else
           raise 'unrecognized update event'
         end
@@ -643,12 +644,9 @@ module Alexandria
       end
 
       def handle_ruined_books
-        new_message = _("The data files for the following books are malformed or empty. Do you wish to attempt to download new information for them from the online book providers?\n")
-
-        # message = _("These books do not conform to the ISBN-13
-        # standard. We will attempt to replace them from the book
-        # providers. Otherwise, we will turn them into manual
-        # entries.\n" )
+        new_message = _(
+          'The data files for the following books are malformed or empty. Do you wish to' \
+          " attempt to download new information for them from the online book providers?\n")
 
         @libraries.ruined_books.each { |bi|
           new_message += "\n#{bi[1] || bi[1].inspect}"
@@ -692,13 +690,10 @@ module Alexandria
                   end
 
                   log.debug { "Trying to add #{book.title}, #{cover_uri} in library ''#{library.name}'" }
-                  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)
-                  set_status_label(_("Added '%s' to library '%s'") % [book.title, library.name])
-
+                  set_status_label(format(_("Added '%s' to library '%s'"), book.title, library.name))
                 rescue => ex
                   log.error { "Couldn't add book #{isbn}: #{ex}" }
                   log.error { ex.backtrace.join("\n") }
@@ -772,9 +767,7 @@ module Alexandria
           new_height = [ICON_HEIGHT, icon.height].min
           icon = cache_scaled_icon(icon, new_width, new_height)
         end
-        if rating == Book::MAX_RATING_STARS
-          icon = icon.tag(Icons::FAVORITE_TAG)
-        end
+        icon = icon.tag(Icons::FAVORITE_TAG) if rating == Book::MAX_RATING_STARS
         iter[Columns::COVER_ICON] = icon
         log.debug { 'Full iter: ' + (0..15).map { |num| iter[num].inspect }.join(', ') }
       end
@@ -805,9 +798,7 @@ module Alexandria
         model = @library_listview.model
         is_smart = library.is_a?(SmartLibrary)
         if is_smart
-          if @library_separator_iter.nil?
-            @library_separator_iter = append_library_separator
-          end
+          @library_separator_iter = append_library_separator if @library_separator_iter.nil?
           iter = model.append
         else
           iter = if @library_separator_iter.nil?
@@ -979,7 +970,7 @@ module Alexandria
           @actiongroup['AddBookManual'].sensitive = !smart
           @actiongroup['Properties'].sensitive = smart
           can_delete = smart || (@libraries.all_regular_libraries.length > 1)
-          @actiongroup['Delete'].sensitive = can_delete ## true #(@libraries.all_regular_libraries.length > 1)
+          @actiongroup['Delete'].sensitive = can_delete
           log.debug { "sensitize_library delete: #{@actiongroup['Delete'].sensitive?}" }
           false
         end
@@ -1105,7 +1096,10 @@ module Alexandria
       # Gets the sort order of the current library, for use by export
       def library_sort_order
         # added by Cathal Mc Ginley, 23 Oct 2007
-        log.debug { "library_sort_order #{@notebook.page}: #{@iconview.model.inspect} #{@listview.model.inspect}" }
+        log.debug {
+          "library_sort_order #{@notebook.page}: " \
+          "#{@iconview.model.inspect} #{@listview.model.inspect}"
+        }
         result, sort_column, sort_order = current_view.model.sort_column_id
         if result
           column_ids_to_attributes = { 2 => :title,