alexandria-book-collection-manager 0.7.1 → 0.7.2

data/lib/alexandria/import_library_csv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2010 Cathal Mc Ginley
 #
 # Alexandria is free software; you can redistribute it and/or
@@ -93,7 +95,6 @@ module Alexandria
           book.redd_when = date
           book.redd = true
         rescue
-          #
         end
       end
       if row[@mainshelf]
@@ -140,9 +141,7 @@ module Alexandria
       authors << normalize(row[@author])
       isbn = row[@isbn]
       if isbn
-        if isbn =~ /\[([^\]]+)\]/
-          isbn = Regexp.last_match[1]
-        end
+        isbn = Regexp.last_match[1] if isbn =~ /\[([^\]]+)\]/
         isbn = Library.canonicalise_ean(isbn)
       end
 
@@ -150,14 +149,10 @@ module Alexandria
       # sometimes "Publisher (YEAR), Edition: NUM, Binding, NUM pages"
       publisher_info = normalize(row[@publisher_info])
       publisher = publisher_info
-      if publisher_info =~ /([^\(]+)\(/
-        publisher = Regexp.last_match[1]
-      end
+      publisher = Regexp.last_match[1] if publisher_info =~ /([^\(]+)\(/
       edition = publisher_info # binding
       edition_info = publisher_info.split(',')
-      if edition_info.size >= 3
-        edition = publisher_info.split(',')[-2]
-      end
+      edition = publisher_info.split(',')[-2] if edition_info.size >= 3
 
       year = row[@publishing_year].to_i
 
@@ -207,46 +202,4 @@ module Alexandria
       raise 'Not Recognized' unless is_librarything || is_goodreads
     end
   end
-
-  #   def read_csv_file(csv_file)
-
-  #     reader = CSV.open(csv_file, 'r')
-  #     # goodreads & librarything now use csv header lines
-  #     header = reader.shift
-
-  #     #header.each {|h| puts h }
-  #     importer = identify_csv_type(header)
-
-  #     retries = 0
-  #     begin
-  #       reader.each do |row|
-  #         #puts row
-  #         bk = importer.row_to_book(row)
-  #         puts "\"#{bk.title}\"     by     #{bk.authors.join(', ')};     isbn : #{bk.isbn}      #{bk.publisher} | #{bk.publishing_year.inspect}   binding:#{bk.edition}"
-  #         if bk.notes.size > 0
-  #           puts "   >>> #{bk.notes}"
-  #         end
-  #       end
-  #     rescue
-  #       if retries < 1
-  #         retries += 1
-  #         puts "Retrying..."
-
-  #         # probably Goodreads' wonky ISBN fields ,,="043432432X", and such
-  #         # hack to fix up these files
-  #         data = File.read(csv_file)
-  #         data.gsub!(/\,\=\"/, ',"')
-  #         csv_fixed = Tempfile.new("#{csv_file}_fixed")
-  #         csv_fixed.write(data)
-  #         csv_fixed.close
-  #         reader = CSV.open(csv_fixed.path, 'r')
-  #         #puts csv_fixed.path
-  #         header = reader.shift
-
-  #         retry
-  #       end
-
-  #     end
-
-  #   end
 end

data/lib/alexandria/logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Cathal Mc Ginley
 # Copyright (C) 2011 Matijs van Zuijlen
 #
@@ -26,13 +28,9 @@ module Alexandria
   # or Object. A LoggerWrapper can be used to simplify this procedure.
   class Logger < ::Logger
     def add(severity, message = nil, source = nil, progname = nil, &block)
-      if source.nil?
-        return super(severity, message, progname, &block)
-      end
+      return super(severity, message, progname, &block) if source.nil?
       category = self.class.category(source)
-      unless block_given?
-        return super(severity, progname, category)
-      end
+      return super(severity, progname, category) unless block_given?
       category = "#{category} #{progname}" if progname
       super(severity, message, category, &block)
     end

data/lib/alexandria/models/book.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/models/library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2014 Matijs van Zuijlen
 #
@@ -130,7 +132,6 @@ module Alexandria
             # retries the Dir.each block...
             # but gives up after three tries
             redo unless test[0] > 2
-
           else
             test = [0, nil]
           end
@@ -193,7 +194,7 @@ module Alexandria
       end
 
       # TODO: Ensure book loading passes through Book#initialize
-      book = YAML.load(text)
+      book = YAML.safe_load(text, whitelist_classes = [Book, Time])
 
       unless book.isbn.class == String
         # HACK
@@ -231,7 +232,6 @@ module Alexandria
 
           a << load(file)
         end
-
       rescue Errno::ENOENT
         FileUtils.mkdir_p(DIR)
       end
@@ -246,9 +246,7 @@ module Alexandria
       dest = dest_library.path
       books.each do |book|
         FileUtils.mv(source_library.yaml(book), dest)
-        if File.exist?(source_library.cover(book))
-          FileUtils.mv(source_library.cover(book), dest)
-        end
+        FileUtils.mv(source_library.cover(book), dest) if File.exist?(source_library.cover(book))
 
         source_library.changed
         source_library.old_delete(book)
@@ -365,9 +363,7 @@ module Alexandria
 
     def self.canonicalise_isbn(isbn)
       numbers = extract_numbers(isbn)
-      if valid_ean?(isbn) && (numbers[0..2] != [9, 7, 8])
-        return isbn
-      end
+      return isbn if valid_ean?(isbn) && (numbers[0..2] != [9, 7, 8])
       canonical = if valid_ean?(isbn)
                     # Looks like an EAN number -- extract the intersting part and
                     # calculate a checksum. It would be nice if we could validate
@@ -392,9 +388,7 @@ module Alexandria
       # Let's initialize the saved identifier if not already
       # (backward compatibility from 0.4.0)
       # book.saved_ident ||= book.ident
-      if book.saved_ident.nil? || book.saved_ident.empty?
-        book.saved_ident = book.ident
-      end
+      book.saved_ident = book.ident if book.saved_ident.nil? || book.saved_ident.empty?
       if book.ident != book.saved_ident
         # log.debug { "Backwards compatibility step: #{book.saved_ident.inspect}, #{book.ident.inspect}" }
         FileUtils.rm(yaml(book.saved_ident))
@@ -421,9 +415,7 @@ module Alexandria
 
       if book.ident != book.saved_ident
         FileUtils.rm(yaml(book.saved_ident))
-        if File.exist?(cover(book.saved_ident))
-          FileUtils.mv(cover(book.saved_ident), cover(book.ident))
-        end
+        FileUtils.mv(cover(book.saved_ident), cover(book.ident)) if File.exist?(cover(book.saved_ident))
 
         # Notify before updating the saved identifier, so the views
         # can still use the old one to update their models.
@@ -467,9 +459,7 @@ module Alexandria
         end
 
         # Remove the file if its blank.
-        if Alexandria::UI::Icons.blank?(cover_file)
-          File.delete(cover_file)
-        end
+        File.delete(cover_file) if Alexandria::UI::Icons.blank?(cover_file)
       end
     end
 
@@ -501,7 +491,7 @@ module Alexandria
         @@deleted_libraries << self
       else
         if @deleted_books.include?(book)
-          doubles = @deleted_books.reject { |b| !b.equal?(book) }
+          doubles = @deleted_books.select { |b| b.equal?(book) }
           raise ArgumentError, "Book #{book.isbn} was already deleted" unless doubles.empty?
         end
         @deleted_books << book
@@ -610,7 +600,7 @@ module Alexandria
     end
 
     def self.jpeg?(file)
-      'JFIF' == IO.read(file, 10)[6..9]
+      IO.read(file, 10)[6..9] == 'JFIF'
     end
 
     def final_cover(book)

data/lib/alexandria/net.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2009 Cathal Mc Ginley
 # Copyright (C) 2014 Matijs van Zuijlen
 #

data/lib/alexandria/preferences.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011 Cathal Mc Ginley
 # Copyright (C) 2011, 2016 Matijs van Zuijlen
@@ -26,12 +28,12 @@ module Alexandria
     include Singleton
     include Logging
 
-    APP_DIR = '/apps/alexandria'.freeze
-    HTTP_PROXY_DIR = '/system/http_proxy'.freeze
-    HTTP_PROXY_MODE = '/system/proxy/mode'.freeze
-    URL_HANDLERS_DIR = '/desktop/gnome/url-handlers'.freeze
+    APP_DIR = '/apps/alexandria'
+    HTTP_PROXY_DIR = '/system/http_proxy'
+    HTTP_PROXY_MODE = '/system/proxy/mode'
+    URL_HANDLERS_DIR = '/desktop/gnome/url-handlers'
 
-    GCONFTOOL = 'gconftool-2'.freeze
+    GCONFTOOL = 'gconftool-2'
 
     def initialize
       @alexandria_settings = {}
@@ -116,9 +118,7 @@ module Alexandria
       end
       old_value = @alexandria_settings[variable_name]
       @alexandria_settings[variable_name] = new_value
-      unless new_value == old_value
-        @changed_settings << variable_name
-      end
+      @changed_settings << variable_name unless new_value == old_value
     end
 
     def generic_save_setting(variable_name, new_value)
@@ -180,9 +180,7 @@ module Alexandria
     end
 
     def make_list_string(list)
-      if get_gconf_type(list.first) == 'string'
-        list.map! { |x| x.gsub(/\"/, '\\"') }
-      end
+      list.map! { |x| x.gsub(/\"/, '\\"') } if get_gconf_type(list.first) == 'string'
       contents = list.join(',')
       '[' + contents + ']'
     end
@@ -245,9 +243,7 @@ module Alexandria
       hash = {}
       vals = all_vals.split(/$/)
       vals.each do |val|
-        if /([a-z_]+) = (.*)/ =~ val
-          hash[Regexp.last_match[1]] = discriminate(Regexp.last_match[2])
-        end
+        hash[Regexp.last_match[1]] = discriminate(Regexp.last_match[2]) if /([a-z_]+) = (.*)/ =~ val
       end
       hash
     end

data/lib/alexandria/scanners.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2005-2006 Christopher Cyll
 # Copyright (C) 2014-2016 Matijs van Zuijlen
 #

data/lib/alexandria/scanners/cuecat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2005-2006 Christopher Cyll
 # Copyright (C) 2011 Matijs van Zuijlen
 #
@@ -33,7 +35,7 @@ module Alexandria
 
       # Checks if data looks like cuecat input
       def match?(data)
-        data.chomp!
+        data = data.chomp
         return false if data[-1] != '.'
         fields = data.split('.')
         return false if fields.size != 4
@@ -45,7 +47,7 @@ module Alexandria
       # The following code is adapted from Skip Rosebaugh's public
       # domain perl implementation.
       def decode(data)
-        data.chomp!
+        data = data.chomp
         fields = data.split('.')
         fields.shift # First part is gibberish
         fields.shift # Second part is cuecat serial number

data/lib/alexandria/scanners/keyboard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2005-2006 Christopher Cyll
 # Copyright (C) 2008 Cathal Mc Ginley
 #

data/lib/alexandria/smart_library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011, 2014 Matijs van Zuijlen
 #
@@ -32,7 +34,7 @@ module Alexandria
     attr_accessor :rules, :predicate_operator_rule, :deleted_books
 
     DIR = File.join(ENV['HOME'], '.alexandria', '.smart_libraries')
-    EXT = '.yaml'.freeze
+    EXT = '.yaml'
 
     def initialize(name, rules, predicate_operator_rule)
       super()
@@ -58,7 +60,7 @@ module Alexandria
             next unless File.stat(filename).file?
 
             text = IO.read(filename)
-            hash = YAML.load(text)
+            hash = YAML.safe_load(text, whitelist_classes = [Symbol])
             begin
               smart_library = from_hash(hash)
               a << smart_library
@@ -68,7 +70,6 @@ module Alexandria
             end
           end
         end
-
       rescue Errno::ENOENT
         # First run and no smart libraries yet? Provide some default
         # ones.

data/lib/alexandria/ui.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/builder_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2011 Cathal Mc Ginley
 #
 # Alexandria is free software; you can redistribute it and/or

data/lib/alexandria/ui/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2011, 2014, 2016 Matijs van Zuijlen
@@ -81,9 +83,7 @@ module Alexandria
 
       def on_window_state_event(_window, event)
         log.debug { 'window-state-event' }
-        if event.is_a?(Gdk::EventWindowState)
-          @maximized = event.new_window_state == :maximized
-        end
+        @maximized = event.new_window_state == :maximized if event.is_a?(Gdk::EventWindowState)
         log.debug { 'end window-state-event' }
       end
 
@@ -298,6 +298,7 @@ module Alexandria
       end
 
       def connect_signals
+        # rubocop:disable LineLength
         standard_actions = [
           ['LibraryMenu', nil, _('_Library')],
           ['New', Gtk::Stock::NEW, _('_New Library'), '<control>L', _('Create a new library'), method(:on_new)],
@@ -336,6 +337,7 @@ module Alexandria
           ['Help', Gtk::Stock::HELP, _('Contents'), 'F1', _("View Alexandria's manual"), method(:on_help)],
           ['About', Gtk::Stock::ABOUT, _('_About'), nil, _('Show information about Alexandria'), method(:on_about)],
         ]
+        # rubocop:enable LineLength
 
         toggle_actions = [
           ['Sidepane', nil, _('Side _Pane'), 'F9', nil, method(:on_view_sidepane), true],
@@ -370,26 +372,20 @@ module Alexandria
         standard_actions.each do |name, stock_id, label, accelerator, tooltip, callback|
           action = Gtk::Action.new(name, label: label, tooltip: tooltip, stock_id: stock_id)
           @actiongroup.add_action_with_accel(action, accelerator)
-          if callback
-            action.signal_connect('activate', &callback)
-          end
+          action.signal_connect('activate', &callback) if callback
         end
 
         providers_actions.each do |name, stock_id, label, accelerator, tooltip, callback|
           action = Gtk::Action.new(name, label: label, tooltip: tooltip, stock_id: stock_id)
           @actiongroup.add_action_with_accel(action, accelerator)
-          if callback
-            action.signal_connect('activate', &callback)
-          end
+          action.signal_connect('activate', &callback) if callback
         end
 
         toggle_actions.each do |name, stock_id, label, accelerator, tooltip, callback, is_active|
           action = Gtk::ToggleAction.new(name, label: label, tooltip: tooltip, stock_id: stock_id)
           action.set_active is_active
           @actiongroup.add_action_with_accel(action, accelerator)
-          if callback
-            action.signal_connect('toggled', &callback)
-          end
+          action.signal_connect('toggled', &callback) if callback
         end
 
         group = nil

data/lib/alexandria/ui/columns.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alexandria
   module UI
     module Columns

data/lib/alexandria/ui/completion_models.rb

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

data/lib/alexandria/ui/dialogs/about_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
@@ -21,7 +23,7 @@ module Alexandria
       include GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
-      GPL = <<EOL.freeze
+      GPL = <<EOL
 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