alexandria-book-collection-manager 0.7.8 → 0.7.10

data/lib/alexandria/book_providers.rb

@@ -35,12 +35,16 @@ module Alexandria
     SEARCH_BY_KEYWORD = (0..3).to_a
 
     class SearchError < StandardError; end
+
     class NoResultsError < SearchError; end
+
     class TooManyResultsError < SearchError; end
+
     class InvalidSearchTypeError < SearchError; end
 
     # These errors are not really errors
     class ProviderSkippedError < NoResultsError; end
+
     class SearchEmptyError < SearchError; end
 
     def self.search(criterion, type)
@@ -93,14 +97,9 @@ module Alexandria
 
                     when SocketError
                       format(_("Couldn't reach the provider '%s': socket " \
-                        "error (%s)."), factory.name, ex.message)
+                               "error (%s)."), factory.name, ex.message)
 
-                    when NoResultsError
-                      _("No results were found.  Make sure your " \
-                        "search criterion is spelled correctly, and " \
-                        "try again.")
-
-                    when ProviderSkippedError
+                    when NoResultsError, ProviderSkippedError
                       _("No results were found.  Make sure your " \
                         "search criterion is spelled correctly, and " \
                         "try again.")
@@ -115,7 +114,7 @@ module Alexandria
                       ex.message
                     end
           log.debug { "raising empty error #{message}" }
-          raise SearchEmptyError, message # rubocop:disable GetText/DecorateFunctionMessage
+          raise SearchEmptyError, message # rubocop:disable I18n/GetText/DecorateFunctionMessage
         else
           factory_n += 1
           retry
@@ -291,19 +290,14 @@ module Alexandria
 
     require "alexandria/book_providers/douban" # only requires YAML
 
-    # Amazon AWS (Amazon Associates Web Services) provider, needs hpricot
-    require "alexandria/book_providers/amazon_aws"
-
     # Website based providers
-    require "alexandria/book_providers/adlibris"
-    require "alexandria/book_providers/barnes_and_noble"
-    require "alexandria/book_providers/proxis"
-    require "alexandria/book_providers/siciliano"
     require "alexandria/book_providers/thalia_provider"
     require "alexandria/book_providers/worldcat"
 
     # Z39.50 based providers
-    require "alexandria/book_providers/z3950"
+    require "alexandria/book_providers/loc_provider"
+    require "alexandria/book_providers/bl_provider"
+    require "alexandria/book_providers/sbn_provider"
 
     attr_reader :abstract_classes
 
@@ -381,19 +375,10 @@ module Alexandria
 
       changed = false
 
-      if (ecs_index = priority.index("AmazonECS"))
-        priority[ecs_index] = "Amazon" # replace legacy "AmazonECS" name
-        priority.uniq! # remove any other "Amazon" from the list
-        changed = true
-      end
       if (worldcat_index = priority.index("Worldcat"))
         priority[worldcat_index] = "WorldCat"
         changed = true
       end
-      if (adlibris_index = priority.index("Adlibris"))
-        priority[adlibris_index] = "AdLibris"
-        changed = true
-      end
       @prefs.providers_priority = priority if changed
     end
   end

data/lib/alexandria/console.rb

@@ -5,14 +5,14 @@
 # See the file README.md for authorship and licensing information.
 
 module Alexandria
-  def self.list_books_on_console(_title = true, authors = true)
+  def self.list_books_on_console
     collection = Alexandria::LibraryCollection.instance
     collection.reload
     libraries = collection.all_regular_libraries
     output_string = ""
     @books = libraries.flatten
     @books.each do |book|
-      book_authors = book.authors.join(" & ") if authors
+      book_authors = book.authors.join(" & ")
       output_string += [book.title, book_authors].join(", ") + "\n"
     end
     output_string

data/lib/alexandria/default_preferences.rb

@@ -30,7 +30,7 @@ module Alexandria
       "col_want_visible" => true,
       "col_tags_visible" => true,
       "cols_width" => "{}",
-      "providers_priority" => ["Amazon", "BarnesAndNoble", "AdLibris", "Proxis", "Thalia", "Siciliano", "WorldCat", "LOC", "BL", "SBN"],
+      "providers_priority" => ["Thalia", "WorldCat", "LOC", "BL", "SBN"],
       "view_advanced_settings" => false
     }
   end

data/lib/alexandria/export_library.rb

@@ -73,7 +73,7 @@ module Alexandria
     end
 
     def export_as_html(filename, theme)
-      FileUtils.mkdir(filename) unless File.exist?(filename)
+      FileUtils.mkdir_p(filename)
       Dir.chdir(filename) do
         copy_covers("pixmaps")
         FileUtils.cp_r(theme.pixmaps_directory, "pixmaps") if theme.has_pixmaps?
@@ -91,7 +91,7 @@ module Alexandria
     end
 
     def export_as_ipod_notes(filename, _theme)
-      FileUtils.mkdir(filename) unless File.exist?(filename)
+      FileUtils.mkdir_p(filename)
       tempdir = Dir.getwd
       Dir.chdir(filename)
       copy_covers("pixmaps")
@@ -211,8 +211,8 @@ module Alexandria
       doc = REXML::Document.new
       doc << REXML::XMLDecl.new
       doc << REXML::DocType.new("tellico",
-                                'PUBLIC "-//Robby Stephenson/DTD Tellico V7.0//EN"' \
-                                ' "http://periapsis.org/tellico/dtd/v7/tellico.dtd"')
+                                'PUBLIC "-//Robby Stephenson/DTD Tellico V7.0//EN" ' \
+                                '"http://periapsis.org/tellico/dtd/v7/tellico.dtd"')
       tellico = doc.add_element("tellico")
       tellico.add_attribute("syntaxVersion", "7")
       tellico.add_namespace("http://periapsis.org/tellico/")
@@ -251,7 +251,7 @@ module Alexandria
           entry.add_element("cover").text = final_cover(book)
           image = images.add_element("image")
           image.add_attribute("id", final_cover(book))
-          image_s = ImageSize.new(IO.read(cover(book)))
+          image_s = ImageSize.new(File.read(cover(book)))
           image.add_attribute("height", image_s.height.to_s)
           image.add_attribute("width", image_s.width.to_s)
           image.add_attribute("format", image_s.format)
@@ -298,7 +298,7 @@ module Alexandria
         EOS
 
         if File.exist?(cover(book))
-          image_s = ImageSize.new(IO.read(cover(book)))
+          image_s = ImageSize.new(File.read(cover(book)))
           xhtml << <<~EOS
             <img class="book_cover"
                  src="#{File.join('pixmaps', final_cover(book))}"
@@ -374,7 +374,7 @@ module Alexandria
         bibtex << 'author = "'
         if book.authors != []
           bibtex << book.authors[0]
-          book.authors[1..-1].each do |author|
+          book.authors[1..].each do |author|
             bibtex << " and #{latex_escape(author)}"
           end
         end
@@ -395,13 +395,13 @@ module Alexandria
       return "" if str.nil?
 
       my_str = str.dup
-      my_str.gsub!(/%/, '\\%')
-      my_str.gsub!(/~/, '\\textasciitilde')
-      my_str.gsub!(/&/, '\\\\&')
-      my_str.gsub!(/\#/, '\\\\#')
-      my_str.gsub!(/\{/, '\\{')
-      my_str.gsub!(/\}/, '\\}')
-      my_str.gsub!(/_/, '\\_')
+      my_str.gsub!(/%/, "\\%")
+      my_str.gsub!(/~/, "\\textasciitilde")
+      my_str.gsub!(/&/, "\\\\&")
+      my_str.gsub!(/\#/, "\\\\#")
+      my_str.gsub!(/\{/, "\\{")
+      my_str.gsub!(/\}/, "\\}")
+      my_str.gsub!(/_/, "\\_")
       my_str.gsub!(/\$/, "\\\$")
       my_str.gsub!(/"(.+)"/, "``\1''")
       my_str

data/lib/alexandria/image_fetcher.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/net"
+
+module Alexandria
+  module ImageFetcher
+    def fetch_image(uri)
+      result = nil
+      if URI.parse(uri).scheme.nil?
+        File.open(uri, "r") do |io|
+          result = io.read
+        end
+      else
+        result = WWWAgent.new.get(uri)
+      end
+      result
+    rescue Errno::ECONNRESET
+      nil
+    end
+  end
+end

data/lib/alexandria/import_library.rb

@@ -53,13 +53,13 @@ module Alexandria
     def self.import_autodetect(*args)
       log.debug { args.inspect }
       filename = args[1]
-      log.debug { "Filename is #{filename} and ext is #{filename[-4..-1]}" }
+      log.debug { "Filename is #{filename} and ext is #{filename[-4..]}" }
       log.debug { "Beginning import: #{args[0]}, #{args[1]}" }
-      if filename[-4..-1] == ".txt"
+      if filename[-4..] == ".txt"
         import_as_isbn_list(*args)
-      elsif [".tc", ".bc"].include? filename[-3..-1]
+      elsif [".tc", ".bc"].include? filename[-3..]
         import_as_tellico_xml_archive(*args)
-      elsif [".csv"].include? filename[-4..-1]
+      elsif [".csv"].include? filename[-4..]
         import_as_csv_file(*args)
       else
         raise _("Unsupported type")
@@ -72,7 +72,7 @@ module Alexandria
       return nil unless system("unzip -qqt \"#{filename}\"")
 
       tmpdir = File.join(Dir.tmpdir, "tellico_export")
-      FileUtils.rm_rf(tmpdir) if File.exist?(tmpdir)
+      FileUtils.rm_rf(tmpdir)
       Dir.mkdir(tmpdir)
       Dir.chdir(tmpdir) do
         system("unzip -qq \"#{filename}\"")
@@ -97,11 +97,11 @@ module Alexandria
           keys = ["isbn", "publisher", "pub_year", "binding"]
 
           book_elements = [neaten(elements["title"].text)]
-          book_elements += if !elements["authors"].nil?
+          book_elements += if elements["authors"].nil?
+                             [[]]
+                           else
                              [elements["authors"].elements.to_a.map \
                                                { |x| neaten(x.text) }]
-                           else
-                             [[]]
                            end
           book_elements += keys.map do |key|
             neaten(elements[key].text) if elements[key]
@@ -139,7 +139,7 @@ module Alexandria
     def self.import_as_csv_file(name, filename, on_iterate_cb, _on_error_cb)
       require "alexandria/import_library_csv"
       books_and_covers = []
-      line_count = IO.readlines(filename).reduce(0) { |count, _line| count + 1 }
+      line_count = File.readlines(filename).reduce(0) { |count, _line| count + 1 }
 
       import_count = 0
       max_import = line_count - 1
@@ -210,7 +210,7 @@ module Alexandria
     def self.import_as_isbn_list(name, filename, on_iterate_cb,
                                  on_error_cb)
       log.debug { "Starting import_as_isbn_list... " }
-      isbn_list = IO.readlines(filename).map do |line|
+      isbn_list = File.readlines(filename).map do |line|
         log.debug { "Trying line #{line}" }
         [line.chomp, canonicalise_isbn(line.chomp)] unless line == "\n"
       end

data/lib/alexandria/library_store.rb

@@ -43,7 +43,7 @@ module Alexandria
       test = [0, nil]
       ruined_books = []
       library = Library.new(name, self)
-      FileUtils.mkdir_p(library.path) unless File.exist?(library.path)
+      FileUtils.mkdir_p(library.path)
       Dir.chdir(library.path) do
         Dir["*" + Library::EXT[:book]].sort.each do |filename|
           test[1] = filename if (test[0]).zero?
@@ -152,7 +152,7 @@ module Alexandria
             # Skip non-regular files.
             next unless File.stat(filename).file?
 
-            text = IO.read(filename)
+            text = File.read(filename)
             hash = YAML.safe_load(text, permitted_classes: [Symbol])
             smart_library = SmartLibrary.from_hash(hash, self)
             a << smart_library
@@ -181,7 +181,7 @@ module Alexandria
     private
 
     def regularize_book_from_yaml(name)
-      text = IO.read(name)
+      text = File.read(name)
 
       # Code to remove the mystery string in books imported from Amazon
       # (In the past, still?) To allow ruby-amazon to be removed.
@@ -202,8 +202,7 @@ module Alexandria
         text.sub!(md[0], "loaned_since: #{new_yaml}\n")
       end
 
-      # TODO: Ensure book loading passes through Book#initialize
-      book = YAML.safe_load(text, permitted_classes: [Book, Time])
+      book = Book.from_yaml(text)
 
       unless book.isbn.instance_of? String
         # HACK

data/lib/alexandria/models/book.rb

@@ -71,5 +71,18 @@ module Alexandria
     def inspect
       "#<Alexandria::Book title: #{@title}>"
     end
+
+    def self.from_yaml(text)
+      node = YAML.parse_stream text
+      doc = node.children.first
+      mapping = doc.children.first
+      mapping.children.each_slice(2) do |_k, v|
+        v.tag = nil if v.tag == "!ruby/array:Alexandria:Library"
+      end
+      yaml = node.to_yaml
+
+      # TODO: Ensure book loading passes through Book#initialize
+      YAML.safe_load(yaml, permitted_classes: [Book, Time])
+    end
   end
 end

data/lib/alexandria/models/library.rb

@@ -10,15 +10,17 @@ require "rexml/document"
 require "tempfile"
 require "etc"
 require "alexandria/library_store"
+require "alexandria/image_fetcher"
 
 module Alexandria
   class Library < Array
     include Logging
+    include ImageFetcher
 
     attr_reader :name
     attr_accessor :ruined_books, :updating, :deleted_books
 
-    DEFAULT_DIR = File.join(ENV["HOME"], ".alexandria")
+    DEFAULT_DIR = File.join(Dir.home, ".alexandria")
     EXT = { book: ".yaml", cover: ".cover" }.freeze
 
     include GetText
@@ -77,7 +79,7 @@ module Alexandria
       normalized = entry.delete("- ").upcase
       return [] unless /\A[\dX]*\Z/.match?(normalized)
 
-      normalized.split("").map do |char|
+      normalized.chars.map do |char|
         char == "X" ? 10 : char.to_i
       end
     end
@@ -238,19 +240,13 @@ module Alexandria
       Dir.chdir(path) do
         # Fetch the cover picture.
         cover_file = cover(book)
-        File.open(cover_file, "w") do |io|
-          uri = URI.parse(cover_uri)
-          if uri.scheme.nil?
-            # Regular filename.
-            File.open(cover_uri) { |io2| io.puts io2.read }
-          else
-            # Try open-uri.
-            io.puts transport.get(uri)
-          end
-        end
+        data = fetch_image(cover_uri)
+        if data
+          File.write(cover_file, data)
 
-        # Remove the file if its blank.
-        File.delete(cover_file) if Alexandria::UI::Icons.blank?(cover_file)
+          # Remove the file if its blank.
+          File.delete(cover_file) if Alexandria::UI::Icons.blank?(cover_file)
+        end
       end
     end
 
@@ -345,9 +341,7 @@ module Alexandria
                 else
                   "g#{something.ident}" # g is for generated id...
                 end
-              when String
-                something
-              when Integer
+              when String, Integer
                 something
               else
                 raise NotImplementedError
@@ -359,9 +353,7 @@ module Alexandria
       ident = case something
               when Book
                 something.ident
-              when String
-                something
-              when Integer
+              when String, Integer
                 something
               else
                 raise NotImplementedError
@@ -370,7 +362,7 @@ module Alexandria
     end
 
     def name=(name)
-      File.rename(path, File.join(dir, name))
+      File.rename(path, File.join(@store.library_dir, name))
       @name = name
     end
 
@@ -387,7 +379,7 @@ module Alexandria
     end
 
     def copy_covers(somewhere)
-      FileUtils.rm_rf(somewhere) if File.exist?(somewhere)
+      FileUtils.rm_rf(somewhere)
       FileUtils.mkdir(somewhere)
       each do |book|
         next unless File.exist?(cover(book))
@@ -398,7 +390,7 @@ module Alexandria
     end
 
     def self.jpeg?(file)
-      IO.read(file, 10)[6..9] == "JFIF"
+      File.read(file, 10)[6..9] == "JFIF"
     end
 
     def final_cover(book)

data/lib/alexandria/preferences.rb

@@ -135,8 +135,6 @@ module Alexandria
 
     def get_gconf_type(value)
       case value
-      when String
-        "string"
       when Integer
         "int"
       when TrueClass, FalseClass
@@ -147,7 +145,7 @@ module Alexandria
     end
 
     def exec_gconf_set_list(var_path, new_list)
-      # NOTE we must check between list and pair...
+      # NOTE: we must check between list and pair...
 
       list_type = get_gconf_type(new_list.first)
       if list_type == "int" && new_list.size == 2
@@ -238,11 +236,11 @@ module Alexandria
     # range of values used by Alexandria.
     def discriminate(value)
       case value
-      when "true" # bool
+      when "true"       # bool
         true
-      when "false"    # bool
+      when "false"      # bool
         false
-      when /^[0-9]+$/ # int
+      when /^-?[0-9]+$/ # int
         value.to_i
       when /^\[(.*)\]$/ # list (assume of type String)
         Regexp.last_match[1].split(",")

data/lib/alexandria/{book_providers/pseudomarc.rb → pseudo_marc_parser.rb}

@@ -124,7 +124,7 @@ module Alexandria
 
     def self.marc_text_to_details(marc)
       details = {}
-      marc.each_line do |line|
+      marc&.each_line do |line|
         if line =~ /(\d+)\s*(.+)/
           code = Regexp.last_match[1]
           data = Regexp.last_match[2]
@@ -133,7 +133,7 @@ module Alexandria
 
           d_idx = 0
           while d_idx < data.size
-            d_str = data[d_idx..-1]
+            d_str = data[d_idx..]
             idx = d_str =~ /\$([a-z]) ([^$]+)/
             break unless idx
 

data/lib/alexandria/scanners/cue_cat.rb

@@ -81,7 +81,7 @@ module Alexandria
       def decode_field(encoded)
         seq = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-"
 
-        chars   = encoded.split(//)
+        chars   = encoded.chars
         values  = chars.map { |c| seq.index(c) }
 
         padding = pad(values)

data/lib/alexandria/smart_library.rb

@@ -148,7 +148,7 @@ module Alexandria
       if book
         @cache[book].save(book)
       else
-        FileUtils.mkdir_p(base_dir) unless File.exist? base_dir
+        FileUtils.mkdir_p(base_dir)
         File.open(yaml, "w") { |io| io.puts to_hash.to_yaml }
       end
     end
@@ -162,7 +162,7 @@ module Alexandria
     end
 
     def copy_covers(somewhere)
-      FileUtils.rm_rf(somewhere) if File.exist?(somewhere)
+      FileUtils.rm_rf(somewhere)
       FileUtils.mkdir(somewhere)
       each do |book|
         library = @cache[book]

data/lib/alexandria/ui/about_dialog.rb

@@ -7,7 +7,7 @@
 module Alexandria
   module UI
     class AboutDialog
-      GPL = <<~EOL # rubocop:disable GetText/DecorateString
+      GPL = <<~EOL # rubocop:disable I18n/GetText/DecorateString
         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

data/lib/alexandria/ui/acquire_dialog.rb

@@ -5,6 +5,9 @@
 # See the file README.md for authorship and licensing information.
 
 require "monitor"
+
+require "alexandria/image_fetcher"
+
 require "alexandria/scanners/cue_cat"
 require "alexandria/scanners/keyboard"
 
@@ -40,6 +43,7 @@ module Alexandria
 
     class AcquireDialog < BuilderBase
       include GetText
+      include ImageFetcher
       include Logging
       extend GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
@@ -91,7 +95,7 @@ module Alexandria
         library, is_new_library =
           @combo_libraries.selection_from_libraries(libraries)
 
-        # NOTE at this stage, the ISBN is 10-digit...
+        # NOTE: at this stage, the ISBN is 10-digit...
         #
 
         selection = @barcodes_treeview.selection
@@ -357,14 +361,7 @@ module Alexandria
         Thread.new do
           pixbuf = nil
           if cover_uri
-            image_data = nil
-            if URI.parse(cover_uri).scheme.nil?
-              File.open(cover_uri, "r") do |io|
-                image_data = io.read
-              end
-            else
-              image_data = URI.parse(cover_uri).read
-            end
+            image_data = fetch_image(cover_uri)
             loader = GdkPixbuf::PixbufLoader.new
             loader.last_write(image_data)
             pixbuf = loader.pixbuf

data/lib/alexandria/ui/alert_dialog.rb

@@ -34,6 +34,8 @@ module Alexandria
         @dialog.child.pack_start(hbox)
       end
 
+      attr_reader :dialog
+
       def show_all
         dialog.show_all
       end
@@ -52,8 +54,6 @@ module Alexandria
 
       private
 
-      attr_reader :dialog
-
       def make_label(markup)
         label = Gtk::Label.new
         label.set_alignment(0, 0)

data/lib/alexandria/ui/barcode_animation.rb

@@ -121,7 +121,7 @@ module Alexandria
         until d.empty?
           space_width = d[0].chr.to_i
           bar_width = d[1].chr.to_i
-          d = d[2..-1]
+          d = d[2..]
           @barcode_data << [space_width, bar_width]
         end
       end

data/lib/alexandria/ui/book_properties_dialog_base.rb

@@ -146,16 +146,12 @@ module Alexandria
       end
 
       def own_toggled
-        @checkbutton_want.inconsistent = if @checkbutton_own.active?
-                                           true
-                                         else
-                                           false
-                                         end
+        @checkbutton_want.inconsistent = @checkbutton_own.active?
       end
 
       def want_toggled; end
 
-      @@latest_filechooser_directory = ENV["HOME"]
+      @@latest_filechooser_directory = Dir.home
       def on_change_cover
         dialog = Gtk::FileChooserDialog.new(title: _("Select a cover image"),
                                             parent: @book_properties_dialog,
@@ -181,8 +177,8 @@ module Alexandria
               FileUtils.cp(dialog.filename, "#{@cover_file}.orig")
               new_width = cover.width / (cover.height / COVER_ABSOLUTE_MAXHEIGHT.to_f)
               log.info do
-                "Scaling large cover image to" \
-                  " #{new_width.to_i} x #{COVER_ABSOLUTE_MAXHEIGHT}"
+                "Scaling large cover image to " \
+                  "#{new_width.to_i} x #{COVER_ABSOLUTE_MAXHEIGHT}"
               end
               cover = cover.scale(new_width.to_i, COVER_ABSOLUTE_MAXHEIGHT)
               cover.save(@cover_file, "jpeg")
@@ -268,7 +264,7 @@ module Alexandria
         raise _("out of range") if rating < 0 || rating > images.length
 
         images[0..rating - 1].each { |x| x.pixbuf = Icons::STAR_SET }
-        images[rating..-1].each { |x| x.pixbuf = Icons::STAR_UNSET }
+        images[rating..].each { |x| x.pixbuf = Icons::STAR_UNSET }
         @current_rating = rating
       end
 

data/lib/alexandria/ui/completion_models.rb

@@ -44,11 +44,7 @@ module Alexandria
         cur_tag = key.split(",").last.strip
         if cur_tag.size >= min
           begin
-            if /^#{cur_tag}/.match?(iter[0])
-              true
-            else
-              false
-            end
+            /^#{cur_tag}/.match?(iter[0])
           rescue StandardError
             false
           end

data/lib/alexandria/ui/conflict_while_copying_dialog.rb

@@ -15,7 +15,7 @@ module Alexandria
       def initialize(parent, library, book)
         super(parent,
               format(_("The book '%s' already exists in '%s'. Would you like " \
-                "to replace it?"), book.title, library.name),
+                       "to replace it?"), book.title, library.name),
               Gtk::Stock::DIALOG_QUESTION,
               [[_("_Skip"), Gtk::ResponseType::CANCEL],
                [_("_Replace"), Gtk::ResponseType::OK]],

data/lib/alexandria/ui/icons.rb

@@ -35,8 +35,8 @@ module Alexandria
           return GdkPixbuf::Pixbuf.new(file: filename) if File.exist?(filename)
         rescue GdkPixbuf::PixbufError
           log.error do
-            "Failed to load GdkPixbuf::Pixbuf," \
-              " please ensure that #{filename} is a valid image file"
+            "Failed to load GdkPixbuf::Pixbuf, " \
+              "please ensure that #{filename} is a valid image file"
           end
         end
         BOOK_ICON