alexandria-book-collection-manager 0.7.1 → 0.7.6

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
 #
@@ -22,7 +24,7 @@ module Alexandria
   module ComboBoxOverrides
     include GetText
     extend GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     def populate_with_libraries(libraries, selected_library)
       libraries_names = libraries.map(&:name)
@@ -31,28 +33,22 @@ module Alexandria
         libraries_names.unshift selected_library.name
       end
       clear
-      set_row_separator_func do |model, iter|
-        # TODO: Replace with iter[1] if possible
-        model.get_value(iter, 1) == '-'
-      end
       self.model = Gtk::ListStore.new(GdkPixbuf::Pixbuf, String, TrueClass)
       libraries_names.each do |library_name|
-        iter = model.append
-        iter[0] = Alexandria::UI::Icons::LIBRARY_SMALL
-        iter[1] = library_name
-        iter[2] = false
+        append_entry(Alexandria::UI::Icons::LIBRARY_SMALL, library_name, false)
       end
-      model.append[1] = '-'
-      iter = model.append
-      iter[0] = Alexandria::UI::Icons::LIBRARY_SMALL
-      iter[1] = _('New Library')
-      iter[2] = true
+      append_entry(nil, "-", nil)
+      append_entry(Alexandria::UI::Icons::LIBRARY_SMALL, _("New Library"), true)
       renderer = Gtk::CellRendererPixbuf.new
       pack_start(renderer, false)
       set_attributes(renderer, pixbuf: 0)
       renderer = Gtk::CellRendererText.new
       pack_start(renderer, true)
       set_attributes(renderer, text: 1)
+      set_row_separator_func do |model, iter|
+        # TODO: Replace with iter[1] if possible
+        model.get_value(iter, 1) == "-"
+      end
       self.active = 0
       # self.sensitive = libraries.length > 1
       # This prohibits us from adding a "New Library" from this combo
@@ -74,8 +70,16 @@ module Alexandria
         end
       end
       raise unless library
+
       [library, is_new]
     end
+
+    def append_entry(icon, label, is_new)
+      iter = model.append
+      iter[0] = icon
+      iter[1] = label
+      iter[2] = is_new
+    end
   end
 end
 

data/lib/alexandria/ui/listview.rb

@@ -1,35 +1,21 @@
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2008 Joseph Method
-# Copyright (C) 2010 Cathal Mc Ginley
-# Copyright (C) 2011, 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 aso
-# 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.
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
 #
-# 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/columns'
+require "alexandria/ui/columns"
 
 module Alexandria
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
     class ListViewManager
       include Logging
       include GetText
       include DragAndDropable
-      BOOKS_TARGET_TABLE = [['ALEXANDRIA_BOOKS', :same_app, 0]].freeze
+      BOOKS_TARGET_TABLE = [["ALEXANDRIA_BOOKS", :same_app, 0]].freeze
 
       def initialize(_listview, parent)
         @parent = parent
@@ -43,18 +29,18 @@ module Alexandria
       end
 
       def setup_title_column
-        title = _('Title')
-        log.debug { 'Create listview column for %s' % title }
+        title = _("Title")
+        log.debug { format("Create listview column for %s", title) }
         column = Gtk::TreeViewColumn.new(title)
 
         renderer = Gtk::CellRendererPixbuf.new
         column.pack_start(renderer, false)
-        column.add_attribute(renderer, 'pixbuf', Columns::COVER_LIST)
+        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)
+        column.add_attribute(renderer, "text", Columns::TITLE)
 
         column.sort_column_id = Columns::TITLE
         column.resizable = true
@@ -62,21 +48,21 @@ module Alexandria
       end
 
       TEXT_COLUMNS = [
-        [_('Authors'), Columns::AUTHORS],
-        [_('ISBN'), Columns::ISBN],
-        [_('Publisher'), Columns::PUBLISHER],
-        [_('Publish Year'), Columns::PUBLISH_DATE],
-        [_('Binding'), Columns::EDITION],
-        [_('Loaned To'), Columns::LOANED_TO]
+        [_("Authors"), Columns::AUTHORS],
+        [_("ISBN"), Columns::ISBN],
+        [_("Publisher"), Columns::PUBLISHER],
+        [_("Publish Year"), Columns::PUBLISH_DATE],
+        [_("Binding"), Columns::EDITION],
+        [_("Loaned To"), Columns::LOANED_TO]
       ].freeze
       CHECK_COLUMNS = [
-        [_('Read'), Columns::REDD],
-        [_('Own'), Columns::OWN],
-        [_('Want'), Columns::WANT]
+        [_("Read"), Columns::REDD],
+        [_("Own"), Columns::OWN],
+        [_("Want"), Columns::WANT]
       ].freeze
 
       def setup_books_listview
-        log.debug { 'setup_books_listview' }
+        log.debug { "setup_books_listview" }
         @listview.model = @listview_model
         setup_title_column
         TEXT_COLUMNS.each do |title, iterid|
@@ -87,8 +73,8 @@ module Alexandria
         end
         setup_rating_column
         @listview.selection.mode = :multiple
-        @listview.selection.signal_connect('changed') do
-          log.debug { 'changed' }
+        @listview.selection.signal_connect("changed") do
+          log.debug { "changed" }
           @parent.on_books_selection_changed
         end
         setup_tags_column
@@ -97,11 +83,10 @@ module Alexandria
       end
 
       def setup_tags_column
-        # adding tags column...
-        title = _('Tags')
-        log.debug { 'Create listview column for tags...' }
+        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
@@ -110,16 +95,16 @@ module Alexandria
       end
 
       def setup_row_activation
-        @listview.signal_connect('row-activated') do
-          log.debug { 'row-activated' }
-          @actiongroup['Properties'].activate
+        @listview.signal_connect("row-activated") do
+          log.debug { "row-activated" }
+          @actiongroup["Properties"].activate
           false
         end
       end
 
       def setup_rating_column
-        title = _('Rating')
-        log.debug { 'Create listview column for %s...' % title }
+        title = _("Rating")
+        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
@@ -130,8 +115,7 @@ module Alexandria
           column.pack_start(renderer, false)
           column.set_cell_data_func(renderer) do |_tree_column, cell, _tree_model, iter|
             rating = (iter[Columns::RATING] - Book::MAX_RATING_STARS).abs
-            cell.pixbuf = rating >= i.succ ?
-              Icons::STAR_SET : Icons::STAR_UNSET
+            cell.pixbuf = rating >= i.succ ? Icons::STAR_SET : Icons::STAR_UNSET
           end
         end
         column.sort_column_id = Columns::RATING
@@ -142,50 +126,48 @@ module Alexandria
       def setup_check_column(title, iterid)
         renderer = CellRendererToggle.new
         renderer.activatable = true
-        renderer.signal_connect('toggled') do |_rndrr, path|
-          begin
-            tree_path = Gtk::TreePath.new(path)
-            child_path = @listview_model.convert_path_to_child_path(tree_path)
-            if child_path
-              unfiltered_path = @filtered_model.convert_path_to_child_path(child_path)
-              # FIX this sometimes returns a nil path for iconview...
-              if unfiltered_path
-                iter = @model.get_iter(unfiltered_path)
-                if iter
-                  book = @parent.book_from_iter(@parent.selected_library, iter)
-                  toggle_state = case iterid
-                                 when Columns::REDD then book.redd
-                                 when Columns::OWN then book.own
-                                 when Columns::WANT then book.want
-                                 end
-                  # invert toggle_state
-                  unless iterid == Columns::WANT && book.own
-                    toggle_state = !toggle_state
-                    case iterid
-                    when Columns::REDD then book.redd = toggle_state
-                    when Columns::OWN then book.own = toggle_state
-                    when Columns::WANT then book.want = toggle_state
-                    end
-                    iter[iterid] = toggle_state
-                    lib = @parent.selected_library
-                    lib.save(book)
+        renderer.signal_connect("toggled") do |_rndrr, path|
+          tree_path = Gtk::TreePath.new(path)
+          child_path = @listview_model.convert_path_to_child_path(tree_path)
+          if child_path
+            unfiltered_path = @filtered_model.convert_path_to_child_path(child_path)
+            # FIX this sometimes returns a nil path for iconview...
+            if unfiltered_path
+              iter = @model.get_iter(unfiltered_path)
+              if iter
+                book = @parent.book_from_iter(@parent.selected_library, iter)
+                toggle_state = case iterid
+                               when Columns::REDD then book.redd
+                               when Columns::OWN then book.own
+                               when Columns::WANT then book.want
+                               end
+                # invert toggle_state
+                unless iterid == Columns::WANT && book.own
+                  toggle_state = !toggle_state
+                  case iterid
+                  when Columns::REDD then book.redd = toggle_state
+                  when Columns::OWN then book.own = toggle_state
+                  when Columns::WANT then book.want = toggle_state
                   end
+                  iter[iterid] = toggle_state
+                  lib = @parent.selected_library
+                  lib.save(book)
                 end
               end
-
             end
-          rescue => e
-            log.error { "toggle failed for path #{path} #{e}\n" + e.backtrace.join("\n") }
+
           end
+        rescue StandardError => ex
+          log.error { "toggle failed for path #{path} #{ex}\n" + e.backtrace.join("\n") }
         end
         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)
+        column.add_attribute(renderer, "active", iterid)
         if iterid == Columns::WANT
-          column.add_attribute(renderer, 'inconsistent', Columns::OWN)
+          column.add_attribute(renderer, "inconsistent", Columns::OWN)
         end
 
         log.debug { "append_column #{column}" }
@@ -193,9 +175,9 @@ module Alexandria
       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
@@ -204,7 +186,7 @@ module Alexandria
       end
 
       def setup_listview_columns_visibility
-        log.debug { 'setup_listview_columns_visibility' }
+        log.debug { "setup_listview_columns_visibility" }
         # Show or hide list view columns according to the preferences.
         cols_visibility = [
           @prefs.col_authors_visible,
@@ -223,7 +205,10 @@ module Alexandria
         cols.each_index do |i|
           cols[i].visible = cols_visibility[i]
         end
-        log.debug { 'Columns visibility: ' + cols.map { |col| "#{col.title} #{col.visible?}" }.join(', ') }
+        log.debug do
+          "Columns visibility: " +
+            cols.map { |col| "#{col.title} #{col.visible?}" }.join(", ")
+        end
       end
 
       # Sets the width of each column based on any respective
@@ -231,19 +216,23 @@ 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)
               log.debug { "#{c.title} : #{cols_width[c.title]}" }
               width = cols_width[c.title]
               next if width.zero?
+
               c.sizing = :fixed
               c.fixed_width = width
             end
           end
         end
-        log.debug { 'Columns width: ' + @listview.columns.map { |col| "#{col.title} #{col.width}" }.join(', ') }
+        log.debug do
+          "Columns width: " +
+            @listview.columns.map { |col| "#{col.title} #{col.width}" }.join(", ")
+        end
       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
@@ -17,43 +19,41 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'alexandria/ui/dialogs/alert_dialog'
-# misc_dialogs depends on alert_dialog
-require 'alexandria/ui/dialogs/misc_dialogs'
-require 'alexandria/ui/dialogs/about_dialog'
-require 'alexandria/ui/dialogs/book_properties_dialog_base'
-require 'alexandria/ui/dialogs/book_properties_dialog'
-require 'alexandria/ui/dialogs/new_book_dialog_manual'
-require 'alexandria/ui/dialogs/new_book_dialog'
-require 'alexandria/ui/dialogs/preferences_dialog'
-require 'alexandria/ui/dialogs/export_dialog'
-require 'alexandria/ui/dialogs/import_dialog'
-require 'alexandria/ui/dialogs/acquire_dialog'
-require 'alexandria/ui/dialogs/smart_library_properties_dialog_base'
-require 'alexandria/ui/dialogs/smart_library_properties_dialog'
-require 'alexandria/ui/dialogs/new_smart_library_dialog'
-require 'alexandria/ui/dialogs/bad_isbns_dialog'
-require 'alexandria/ui/dndable'
-require 'alexandria/ui/init'
-require 'alexandria/ui/ui_manager'
-require 'alexandria/ui/listview'
-require 'alexandria/ui/iconview'
-require 'alexandria/ui/sidepane'
+require "alexandria/ui/alert_dialog"
+require "alexandria/ui/about_dialog"
+require "alexandria/ui/book_properties_dialog_base"
+require "alexandria/ui/book_properties_dialog"
+require "alexandria/ui/new_book_dialog_manual"
+require "alexandria/ui/new_book_dialog"
+require "alexandria/ui/preferences_dialog"
+require "alexandria/ui/export_dialog"
+require "alexandria/ui/import_dialog"
+require "alexandria/ui/acquire_dialog"
+require "alexandria/ui/smart_library_properties_dialog_base"
+require "alexandria/ui/smart_library_properties_dialog"
+require "alexandria/ui/new_smart_library_dialog"
+require "alexandria/ui/bad_isbns_dialog"
+require "alexandria/ui/dndable"
+require "alexandria/ui/init"
+require "alexandria/ui/ui_manager"
+require "alexandria/ui/listview"
+require "alexandria/ui/iconview"
+require "alexandria/ui/sidepane_manager"
 
 module Alexandria
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     class MainApp
       include Logging
       include GetText
       include Singleton
-      attr_accessor :main_app, :libraries, :actiongroup, :appbar, :prefs
-      attr_accessor :ui_manager
+      attr_accessor :main_app, :libraries, :actiongroup, :appbar, :prefs, :ui_manager
+
       def initialize
-        log.info { 'Starting MainApp' }
+        log.info { "Starting MainApp" }
         @ui_manager = UIManager.new self
         @actiongroup = @ui_manager.actiongroup
         @appbar = @ui_manager.appbar

data/lib/alexandria/ui/misc_dialogs.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+module Alexandria
+  module UI
+  end
+end

data/lib/alexandria/ui/multi_drag_treeview.rb

@@ -1,47 +1,36 @@
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011, 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.
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
 #
-# 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 EventOverrides
-    def ==(obj)
-      obj.is_a?(self.class) && (time == obj.time) && (x == obj.x) && (y == obj.y) && (button == obj.button)
+    def ==(other)
+      other.is_a?(self.class) &&
+        (time == other.time) && (x == other.x) && (y == other.y) &&
+        (button == other.button)
     end
   end
 
   module TreeViewOverrides
-    # include Alexandria::Logging
-
-    class Context < Struct.new(:pressed_button,
-                               :x,
-                               :y,
-                               :cell_x,
-                               :cell_y,
-                               :button_press_handler,
-                               :motion_notify_handler,
-                               :button_release_handler,
-                               :drag_data_get_handler,
-                               :events,
-                               :source_start_button_mask,
-                               :source_targets,
-                               :source_actions,
-                               :pending_event,
-                               :drag_context)
-
+    Context = Struct.new(:pressed_button,
+                         :x,
+                         :y,
+                         :cell_x,
+                         :cell_y,
+                         :button_press_handler,
+                         :motion_notify_handler,
+                         :button_release_handler,
+                         :drag_data_get_handler,
+                         :events,
+                         :source_start_button_mask,
+                         :source_targets,
+                         :source_actions,
+                         :pending_event,
+                         :drag_context)
+
+    class Context
       def initialize(*ary)
         super
         self.events ||= []
@@ -61,7 +50,7 @@ module Alexandria
       @context.source_actions = actions
 
       @context.button_press_handler =
-        signal_connect('button_press_event') do |_widget, event, _data|
+        signal_connect("button_press_event") do |_widget, event, _data|
           button_press_event(event)
         end
     end
@@ -74,6 +63,7 @@ module Alexandria
 
     def stop_drag_check
       raise if @context.nil?
+
       @context.events.clear
       @context.pending_event = false
       signal_handler_disconnect(@context.motion_notify_handler)
@@ -114,13 +104,12 @@ module Alexandria
       path, _, cell_x, cell_y = get_path_at_pos(event.x, event.y)
       return false if path.nil?
 
-      # call_parent = (event.state.control_mask? or event.state.shift_mask?) or !selected or event.button != 1
       (call_parent = !selection.path_is_selected?(path)) ||
         (event.button != 1)
 
       if call_parent
         signal_handler_block(@context.button_press_handler) do
-          signal_emit('button_press_event', event)
+          signal_emit("button_press_event", event)
         end
       end
 
@@ -132,11 +121,11 @@ module Alexandria
         @context.cell_x = cell_x
         @context.cell_y = cell_y
         @context.motion_notify_handler =
-          signal_connect('motion_notify_event') do |_widget, evnt, _data|
+          signal_connect("motion_notify_event") do |_widget, evnt, _data|
             motion_notify_event(evnt)
           end
         @context.button_release_handler =
-          signal_connect('button_release_event') do |_widget, evnt, _data|
+          signal_connect("button_release_event") do |_widget, evnt, _data|
             button_release_event(evnt)
           end
         @context.events << event unless call_parent