alexandria-book-collection-manager 0.7.2 → 0.7.3

data/lib/alexandria/preferences.rb

@@ -1,23 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011 Cathal Mc Ginley
-# 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 'singleton'
 require 'set'
@@ -132,15 +117,13 @@ module Alexandria
           # set list value
           exec_gconf_set_list(var_path, new_value)
         end
+      elsif new_value.nil?
+        exec_gconf_unset(variable_name)
       else
         # set non-list value
-        if new_value.nil?
-          exec_gconf_unset(variable_name)
-        else
-          exec_gconf_set(var_path, new_value)
-        end
+        exec_gconf_set(var_path, new_value)
       end
-    rescue => ex
+    rescue StandardError => ex
       log.debug { new_value.inspect }
       log.error { "Could not set GConf setting #{variable_name} to value: #{new_value.inspect}" }
       log << ex.message
@@ -264,7 +247,7 @@ module Alexandria
         begin
           pair = Regexp.last_match[1].split(',')
           return [discriminate(pair.first), discriminate(pair.last)]
-        rescue
+        rescue StandardError
           return [0, 0]
         end
       else

data/lib/alexandria/scanners/cuecat.rb

@@ -37,9 +37,11 @@ module Alexandria
       def match?(data)
         data = data.chomp
         return false if data[-1] != '.'
+
         fields = data.split('.')
         return false if fields.size != 4
         return false if fields[2].size != 4
+
         true
       end
 
@@ -64,7 +66,7 @@ module Alexandria
             code = isbn13
             type = 'IBN'
           end
-        rescue
+        rescue StandardError
           log.debug { "Cannot translate UPC (#{type}) code #{code} to ISBN" }
         end
 

data/lib/alexandria/smart_library.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011, 2014 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 'date'
 require 'time'
@@ -33,16 +19,17 @@ module Alexandria
     attr_reader :name
     attr_accessor :rules, :predicate_operator_rule, :deleted_books
 
-    DIR = File.join(ENV['HOME'], '.alexandria', '.smart_libraries')
     EXT = '.yaml'
 
-    def initialize(name, rules, predicate_operator_rule)
+    def initialize(name, rules, predicate_operator_rule, store = nil)
       super()
       raise if name.nil? || rules.nil? || predicate_operator_rule.nil?
+
       @name = name.dup.force_encoding('UTF-8')
       @rules = rules
       @predicate_operator_rule = predicate_operator_rule
-      libraries = Libraries.instance
+      @store = store
+      libraries = LibraryCollection.instance
       libraries.add_observer(self)
       self.libraries = libraries.all_regular_libraries
       # carry deleted books over from libraries that are part of the smart library
@@ -50,39 +37,7 @@ module Alexandria
       @cache = {}
     end
 
-    def self.loadall
-      a = []
-      begin
-        # Deserialize smart libraries.
-        Dir.chdir(DIR) do
-          Dir['*' + EXT].each do |filename|
-            # Skip non-regular files.
-            next unless File.stat(filename).file?
-
-            text = IO.read(filename)
-            hash = YAML.safe_load(text, whitelist_classes = [Symbol])
-            begin
-              smart_library = from_hash(hash)
-              a << smart_library
-            rescue => e
-              puts "Cannot load serialized smart library: #{e}"
-              puts e.backtrace
-            end
-          end
-        end
-      rescue Errno::ENOENT
-        # First run and no smart libraries yet? Provide some default
-        # ones.
-        sample_smart_libraries.each do |smart_library|
-          smart_library.save
-          a << smart_library
-        end
-      end
-      a.each(&:refilter)
-      a
-    end
-
-    def self.sample_smart_libraries
+    def self.sample_smart_libraries(store)
       a = []
 
       operands = Rule::Operands::LEFT
@@ -91,25 +46,25 @@ module Alexandria
       rule = Rule.new(operands.find { |x| x.book_selector == :rating },
                       Rule::Operators::IS,
                       Book::MAX_RATING_STARS.to_s)
-      a << new(_('Favorite'), [rule], ALL_RULES)
+      a << new(_('Favorite'), [rule], ALL_RULES, store)
 
       # Loaned books.
       rule = Rule.new(operands.find { |x| x.book_selector == :loaned },
                       Rule::Operators::IS_TRUE,
                       nil)
-      a << new(_('Loaned'), [rule], ALL_RULES)
+      a << new(_('Loaned'), [rule], ALL_RULES, store)
 
       # Redd books.
       rule = Rule.new(operands.find { |x| x.book_selector == :redd },
                       Rule::Operators::IS_TRUE,
                       nil)
-      a << new(_('Read'), [rule], ALL_RULES)
+      a << new(_('Read'), [rule], ALL_RULES, store)
 
       # Own books.
       rule = Rule.new(operands.find { |x| x.book_selector == :own },
                       Rule::Operators::IS_TRUE,
                       nil)
-      a << new(_('Owned'), [rule], ALL_RULES)
+      a << new(_('Owned'), [rule], ALL_RULES, store)
 
       # Want books.
       rule = Rule.new(operands.find { |x| x.book_selector == :want },
@@ -118,15 +73,16 @@ module Alexandria
       rule2 = Rule.new(operands.find { |x| x.book_selector == :own },
                        Rule::Operators::IS_NOT_TRUE,
                        nil)
-      a << new(_('Wishlist'), [rule, rule2], ALL_RULES)
+      a << new(_('Wishlist'), [rule, rule2], ALL_RULES, store)
 
       a
     end
 
-    def self.from_hash(hash)
+    def self.from_hash(hash, store)
       SmartLibrary.new(hash[:name],
                        hash[:rules].map { |x| Rule.from_hash(x) },
-                       hash[:predicate_operator_rule] == :all ? ALL_RULES : ANY_RULE)
+                       hash[:predicate_operator_rule] == :all ? ALL_RULES : ANY_RULE,
+                       store)
     end
 
     def to_hash
@@ -147,7 +103,7 @@ module Alexandria
     end
 
     def update(*params)
-      if params.first.is_a?(Libraries)
+      if params.first.is_a?(LibraryCollection)
         libraries, _, library = params
         unless library.is_a?(self.class)
           self.libraries = libraries.all_libraries
@@ -183,7 +139,7 @@ module Alexandria
       if book
         @cache[book].yaml(book)
       else
-        File.join(DIR, @name + EXT)
+        File.join(base_dir, @name + EXT)
       end
     end
 
@@ -191,7 +147,7 @@ module Alexandria
       if book
         @cache[book].save(book)
       else
-        FileUtils.mkdir_p(DIR) unless File.exist? DIR
+        FileUtils.mkdir_p(base_dir) unless File.exist? base_dir
         File.open(yaml, 'w') { |io| io.puts to_hash.to_yaml }
       end
     end
@@ -210,6 +166,7 @@ module Alexandria
       each do |book|
         library = @cache[book]
         next unless File.exist?(library.cover(book))
+
         FileUtils.cp(File.join(library.path, book.ident + Library::EXT[:cover]),
                      File.join(somewhere, library.final_cover(book)))
       end
@@ -256,6 +213,7 @@ module Alexandria
 
     def undelete
       raise unless @@deleted_libraries.include?(self)
+
       @@deleted_libraries.delete(self)
     end
 
@@ -268,6 +226,10 @@ module Alexandria
       @libraries.each { |x| x.add_observer(self) }
     end
 
+    def base_dir
+      @store.smart_library_dir
+    end
+
     class Rule
       include GetText
       extend GetText
@@ -277,6 +239,7 @@ module Alexandria
 
       def initialize(operand, operation, value)
         raise if operand.nil? || operation.nil? # value can be nil
+
         @operand = operand
         @operation = operation
         @value = value
@@ -300,7 +263,8 @@ module Alexandria
         }
       end
 
-      class Operand < Struct.new(:name, :klass)
+      Operand = Struct.new(:name, :klass)
+      class Operand
         def <=>(x)
           name <=> x.name
         end
@@ -315,7 +279,8 @@ module Alexandria
         end
       end
 
-      class Operator < Struct.new(:sym, :name, :proc)
+      Operator = Struct.new(:sym, :name, :proc)
+      class Operator
         def <=>(x)
           name <=> x.name
         end
@@ -407,7 +372,7 @@ module Alexandria
 
                                         Time.now - given_date <= days
                                       end
-                                    rescue => ex
+                                    rescue StandardError => ex
                                       trace = ex.backtrace.join("\n >")
                                       log.warn { "Date matching failed #{ex} #{trace}" }
                                       false
@@ -426,7 +391,7 @@ module Alexandria
 
                                             Time.now - given_date > days
                                           end
-                                        rescue => ex
+                                        rescue StandardError => ex
                                           trace = ex.backtrace.join("\n >")
                                           log.warn { "Date matching failed #{ex} #{trace}" }
                                           false
@@ -503,7 +468,7 @@ module Alexandria
         proc do |book|
           begin
             left_value = book.send(@operand.book_selector)
-          rescue => e
+          rescue StandardError => e
             puts e.message
           end
           right_value = @value

data/lib/alexandria/ui/builder_base.rb

@@ -1,21 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2011 Cathal Mc Ginley
+# 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
@@ -23,21 +10,14 @@ module Alexandria
       def initialize(filename, widget_names)
         file = File.join(Alexandria::Config::DATA_DIR, 'glade', filename)
         builder = Gtk::Builder.new
+        # TODO: This emits the warning 'GtkDialog mapped without a transient
+        # parent. This is discouraged.'
         builder.add_from_file(file)
         builder.connect_signals do |handler|
-          begin
-            method(handler)
-          rescue => ex
-            puts "Error: #{ex}" if $DEBUG
-            nil
-          end
+          method(handler)
         end
         widget_names.each do |name|
-          begin
-            instance_variable_set("@#{name}".intern, builder[name.to_s])
-          rescue => err
-            puts "Error: #{err}" if $DEBUG
-          end
+          instance_variable_set("@#{name}".intern, builder[name.to_s])
         end
       end
     end

data/lib/alexandria/ui/callbacks.rb

@@ -1,23 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2008 Joseph Method
-# 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
@@ -34,7 +19,7 @@ module Alexandria
       end
 
       def on_new_smart(*)
-        NewSmartLibraryDialog.new(@main_app) do |smart_library|
+        NewSmartLibraryDialog.new(@main_app).acquire do |smart_library|
           smart_library.refilter
           @libraries.add_library(smart_library)
           append_library(smart_library, true)
@@ -62,7 +47,7 @@ module Alexandria
       end
 
       def on_import(*)
-        ImportDialog.new(@main_app) do |library, bad_isbns, failed_isbns|
+        ImportDialog.new(@main_app).acquire do |library, bad_isbns, failed_isbns|
           unless bad_isbns.empty?
             log.debug { 'bad_isbn' }
             message = _('The following lines are not valid ISBNs and were not imported:')
@@ -121,13 +106,7 @@ module Alexandria
       end
 
       def on_export(*)
-        ExportDialog.new(@main_app, selected_library, library_sort_order)
-        # FIXME: Remove this hack and fix the underlying problem.
-      rescue => ex
-        log.error { "problem with immediate export #{ex} try again" }
-        ErrorDialog.new(@main_app, _('Export failed'),
-                        _('Try letting this library load ' \
-                          'completely before exporting.'))
+        ExportDialog.new(@main_app, selected_library, library_sort_order).perform
       end
 
       def on_acquire(*)
@@ -146,7 +125,7 @@ module Alexandria
         if @library_listview.focus? || selected_books.empty?
           library = selected_library
           if library.is_a?(SmartLibrary)
-            SmartLibraryPropertiesDialog.new(@main_app, library) do
+            SmartLibraryPropertiesDialog.new(@main_app, library).acquire do
               library.refilter
               refresh_books
             end
@@ -267,12 +246,7 @@ module Alexandria
       end
 
       def on_about(*)
-        ad = AboutDialog.new(@main_app)
-        ad.signal_connect('response') do
-          log.debug { 'destroy about' }
-          ad.destroy
-        end
-        ad.show
+        AboutDialog.new(@main_app).show
       end
 
       def on_view_sidepane(action)
@@ -343,7 +317,7 @@ module Alexandria
           ['Sidepane', nil, _('Side _Pane'), 'F9', nil, method(:on_view_sidepane), true],
           ['Toolbar', nil, _('_Toolbar'), nil, nil, method(:on_view_toolbar), true],
           ['Statusbar', nil, _('_Statusbar'), nil, nil, method(:on_view_statusbar), true],
-          ['ReversedOrder', nil, _('Re_versed Order'), nil, nil, method(:on_reverse_order)],
+          ['ReversedOrder', nil, _('Re_versed Order'), nil, nil, method(:on_reverse_order), false],
         ]
 
         view_as_actions = [