alexandria-book-collection-manager 0.7.2 → 0.7.3

data/lib/alexandria/ui/sidepane.rb

@@ -1,23 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2008 Joseph Method
-# Copyright (C) 2008,2009 Cathal Mc Ginley
-# Copyright (C) 2011, 2014-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 UI
@@ -28,7 +13,7 @@ module Alexandria
       def initialize(library_listview, parent)
         @library_listview = library_listview
         @parent = parent
-        @libraries = Libraries.instance
+        @libraries = LibraryCollection.instance
         @main_app = @parent.main_app
         setup_sidepane
       end
@@ -51,7 +36,7 @@ module Alexandria
         #      forbidding an initial dot also disallows "." and ".."
         #      which are of course pre-existing directories.
         match
-      rescue => ex
+      rescue StandardError => ex
         log.warn { "New library name not valid UTF-8: #{ex.message}" }
         true
         # /([^\w\s'"()&?!:;.\-])/.match(new_text) # anglocentric!
@@ -67,24 +52,24 @@ module Alexandria
               chars = match[1].gsub(/&/, '&')
               ErrorDialog.new(@main_app, _("Invalid library name '%s'") % new_text,
                               _('The name provided contains the ' \
-                                'disallowed character <b>%s</b> ') % chars)
+                                'disallowed character <b>%s</b> ') % chars).display
             else
               ErrorDialog.new(@main_app, _('Invalid library name'),
                               _('The name provided contains ' \
-                                'invalid characters.'))
+                                'invalid characters.')).display
             end
 
           elsif new_text.strip.empty?
             log.debug { 'Empty text' }
             ErrorDialog.new(@main_app, _('The library name ' \
-                                         'can not be empty'))
+                                         'can not be empty')).display
           elsif library_already_exists new_text
             log.debug { 'Already exists' }
             ErrorDialog.new(@main_app,
                             _('The library can not be renamed'),
                             _('There is already a library named ' \
                               "'%s'.  Please choose a different " \
-                              'name.') % new_text.strip)
+                              'name.') % new_text.strip).display
           else
             log.debug { "Attempting to apply #{path_string}, #{new_text}" }
             path = Gtk::TreePath.new(path_string)
@@ -199,7 +184,7 @@ module Alexandria
           end
           begin
             drag_context.finish(success: success, delete: false)
-          rescue => ex
+          rescue StandardError => ex
             log.error { "drag_context.finish failed: #{ex}" }
             raise
           end

data/lib/alexandria/ui/ui_manager.rb

@@ -1,25 +1,12 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2008 Joseph Method
-# 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.
 
+require 'alexandria/ui/callbacks'
 require 'alexandria/ui/columns'
+require 'alexandria/library_sort_order'
 
 module Alexandria
   module UI
@@ -93,7 +80,6 @@ module Alexandria
       end
 
       def setup_callbacks
-        require 'alexandria/ui/callbacks'
         self.class.send(:include, Callbacks)
         connect_signals
       end
@@ -350,34 +336,19 @@ module Alexandria
           # seem to suffice).
           #
           # Then we wait a while and only *then* pop up the menu.
+          sensitize_library selected_library if library_already_selected
 
-          if library_already_selected
-            sensitize_library selected_library
-
-            GLib::Idle.add do
-              menu.popup(nil, nil, event.button, event.time)
-              # @clicking_on_sidepane = false
-              false
-            end
-          else
-            GLib::Idle.add do
-              menu.popup(nil, nil, event.button, event.time)
-              # @clicking_on_sidepane = false
-
-              false
-            end
+          GLib::Idle.add do
+            menu.popup(nil, nil, event.button, event.time)
+            false
           end
 
-        else
           # not a right click
-          if (path = widget.get_path_at_pos(event.x, event.y))
-            @clicking_on_sidepane = true
-            obj, path = widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
-            obj.select_path(path)
-            sensitize_library selected_library
-
-          end
-
+        elsif (path = widget.get_path_at_pos(event.x, event.y))
+          @clicking_on_sidepane = true
+          obj, path = widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
+          obj.select_path(path)
+          sensitize_library selected_library
         end
       end
 
@@ -502,7 +473,7 @@ module Alexandria
               has_no_url = true
               begin
                 has_no_url = (b.isbn.nil? || b.isbn.strip.empty? || provider.url(b).nil?)
-              rescue => ex
+              rescue StandardError => ex
                 log.warn { "Error determining URL from #{provider.name}; #{ex.message}" }
               end
               @actiongroup[provider.action_name].sensitive = !has_no_url
@@ -551,8 +522,10 @@ module Alexandria
           @filtered_model.refilter
           iter = iter_from_book bk
           next unless iter
+
           path = iter.path
           next unless view.model
+
           path = view_path_to_model_path(view, path)
           log.debug { "Path for #{bk.ident} is #{path}" }
           selection = view.respond_to?(:selection) ? @listview.selection : @iconview
@@ -564,7 +537,7 @@ module Alexandria
           select_this_book.call(book, @listview)
           log.debug { 'select_a_book: listview' }
           select_this_book.call(book, @iconview)
-        rescue => ex
+        rescue StandardError => ex
           trace = ex.backtrace.join("\n> ")
           log.warn { "Failed to automatically select book: #{ex.message} #{trace}" }
         end
@@ -627,13 +600,13 @@ module Alexandria
       end
 
       def load_libraries
-        log.info { 'Loading Libraries...' }
+        log.info { 'Loading libraries...' }
         @completion_models = CompletionModels.instance
         if @libraries
           detach_old_libraries
           @libraries.reload
         else
-          @libraries = Libraries.instance
+          @libraries = LibraryCollection.instance
           @libraries.reload
           handle_ruined_books unless @libraries.ruined_books.empty?
         end
@@ -657,7 +630,7 @@ module Alexandria
                                                  new_message).show
         recovery_dialog.signal_connect('response') do |_dialog, response_type|
           recovery_dialog.destroy
-          if response_type == :ok
+          if response_type == Gtk::ResponseType::OK
             # progress indicator...
             @progressbar.fraction = 0
             @appbar.children.first.visible = true # show the progress bar
@@ -684,7 +657,7 @@ module Alexandria
                     log.debug { "removing old file #{filename}" }
                     begin
                       File.delete(filename)
-                    rescue => ex
+                    rescue StandardError => ex
                       log.error { "Could not delete empty file #{filename}" }
                     end
                   end
@@ -694,7 +667,7 @@ module Alexandria
                   library << book
                   library.save(book)
                   set_status_label(format(_("Added '%s' to library '%s'"), book.title, library.name))
-                rescue => ex
+                rescue StandardError => ex
                   log.error { "Couldn't add book #{isbn}: #{ex}" }
                   log.error { ex.backtrace.join("\n") }
                 end
@@ -835,9 +808,9 @@ module Alexandria
         log.debug { 'refresh_books' }
         @library_listview.set_sensitive(false)
         library = selected_library
-        @model.clear
         @iconview.freeze
-        @listview.freeze # NEW / bdewey
+        @listview.freeze
+        @model.clear
         @progressbar.fraction = 0
         @appbar.children.first.visible = true # show the progress bar
         set_status_label(_("Loading '%s'...") % library.name)
@@ -851,7 +824,7 @@ module Alexandria
           if book
             begin
               append_book(book)
-            rescue => ex
+            rescue StandardError => ex
               trace = ex.backtrace.join("\n > ")
               log.error { "append_books failed #{ex.message} #{trace}" }
             end
@@ -880,7 +853,8 @@ module Alexandria
       def selected_library
         log.debug { 'selected_library' }
         if (iter = @library_listview.selection.selected)
-          @libraries.all_libraries.find { |x| x.name == iter[1] }
+          target_name = iter[1]
+          @libraries.all_libraries.find { |it| it.name == target_name }
         else
           @libraries.all_libraries.first
         end
@@ -910,6 +884,7 @@ module Alexandria
         ok = true
         while ok
           return iter if iter[Columns::IDENT] == ident
+
           ok = iter.next!
         end
         nil
@@ -1061,6 +1036,7 @@ module Alexandria
       def setup_move_actions
         @actiongroup.actions.each do |action|
           next unless /^MoveIn/ =~ action.name
+
           @actiongroup.remove_action(action)
         end
         actions = []
@@ -1102,16 +1078,16 @@ module Alexandria
         }
         result, sort_column, sort_order = current_view.model.sort_column_id
         if result
-          column_ids_to_attributes = { 2 => :title,
-                                       4 => :authors,
-                                       5 => :isbn,
-                                       6 => :publisher,
-                                       7 => :publishing_year,
-                                       8 => :edition, # binding
+          column_ids_to_attributes = { 2  => :title,
+                                       4  => :authors,
+                                       5  => :isbn,
+                                       6  => :publisher,
+                                       7  => :publishing_year,
+                                       8  => :edition, # binding
                                        12 => :redd,
                                        13 => :own,
                                        14 => :want,
-                                       9 => :rating }
+                                       9  => :rating }
 
           sort_attribute = column_ids_to_attributes.fetch sort_column
           ascending = (sort_order == :ascending)

data/lib/alexandria/undo_manager.rb

@@ -66,6 +66,7 @@ module Alexandria
     def action(array)
       action = array.pop
       raise if action.nil?
+
       action.call
       notify
     end

data/lib/alexandria/version.rb

@@ -20,7 +20,7 @@
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Alexandria
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
   DATA_VERSION = '0.6.3'
-  DISPLAY_VERSION = '0.7.2'
+  DISPLAY_VERSION = '0.7.3'
 end

data/lib/alexandria/web_themes.rb

@@ -45,6 +45,7 @@ module Alexandria
         Dir.entries(themes_dir).each do |file|
           # ignore hidden files
           next if file =~ /^\./
+
           # ignore non-directories
           path = File.join(themes_dir, file)
           next unless File.directory?(path)

data/po/cs.po

@@ -940,10 +940,6 @@ msgstr ""
 msgid "Secret access key"
 msgstr ""
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "Španělské ministerstvo kultury"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr "Jméno počítače"

data/po/cy.po

@@ -959,10 +959,6 @@ msgstr ""
 msgid "Secret access key"
 msgstr ""
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "Gweinidogaeth Diwylliant Sbaeneg"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr ""

data/po/de.po

@@ -944,10 +944,6 @@ msgstr "Zugriffs-Schlüssel-ID"
 msgid "Secret access key"
 msgstr "Privater Zugriffsschlüssel"
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "Spanisches Kulturministerium"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr "Servername"

data/po/el.po

@@ -937,10 +937,6 @@ msgstr "ID του κλειδιού πρόσβασης"
 msgid "Secret access key"
 msgstr "Κρυφό κλειδί πρόσαβασης"
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "Spanish Culture Ministry"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr "Όνομα Host"

data/po/es.po

@@ -934,10 +934,6 @@ msgstr "ID de la clave de acceso"
 msgid "Secret access key"
 msgstr "Clave de acceso secreta"
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "Ministerio de Cultura Español"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr "Nombre del equipo"

data/po/fr.po

@@ -948,10 +948,6 @@ msgstr ""
 msgid "Secret access key"
 msgstr ""
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "Ministère de la culture espagnole"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr "Nom d'hôte"

data/po/ga.po

@@ -928,10 +928,6 @@ msgstr ""
 msgid "Secret access key"
 msgstr ""
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr ""
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr ""

data/po/gl.po

@@ -939,10 +939,6 @@ msgstr ""
 msgid "Secret access key"
 msgstr ""
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "Ministerio de Cultura de España"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr "Nome de servidor"

data/po/it.po

@@ -938,10 +938,6 @@ msgstr ""
 msgid "Secret access key"
 msgstr ""
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "Ministero della Cultura spagnolo"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr "Nome host"

data/po/ja.po

@@ -915,10 +915,6 @@ msgstr ""
 msgid "Secret access key"
 msgstr ""
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "スペイン文化省"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr "ホスト名"

data/po/mk.po

@@ -931,10 +931,6 @@ msgstr "Пристапен клуч РБ"
 msgid "Secret access key"
 msgstr "Таен пристапен клуч"
 
-#: ../lib/alexandria/book_providers/mcu.rb:39
-msgid "Spanish Culture Ministry"
-msgstr "Шпанското Министерство за Култура"
-
 #: ../lib/alexandria/book_providers/z3950.rb:34
 msgid "Hostname"
 msgstr "Домаќин"