alexandria-book-collection-manager 0.7.8 → 0.7.9

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")
@@ -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

@@ -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,10 +10,12 @@ 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
@@ -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
 
@@ -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/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/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/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,11 +146,7 @@ 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
@@ -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/listview.rb

@@ -201,7 +201,7 @@ module Alexandria
           @prefs.col_rating_visible,
           @prefs.col_tags_visible
         ]
-        cols = @listview.columns[1..-1] # skip "Title"
+        cols = @listview.columns[1..] # skip "Title"
         cols.each_index do |i|
           cols[i].visible = cols_visibility[i]
         end

data/lib/alexandria/ui/multi_drag_treeview.rb

@@ -99,7 +99,7 @@ module Alexandria
         return true
       end
 
-      return false if event.event_type == :'2button_press'
+      return false if event.event_type == :"2button_press"
 
       path, _, cell_x, cell_y = get_path_at_pos(event.x, event.y)
       return false if path.nil?

data/lib/alexandria/ui/new_book_dialog.rb

@@ -8,6 +8,7 @@ require "gdk_pixbuf2"
 require "alexandria/ui/builder_base"
 require "alexandria/ui/error_dialog"
 require "alexandria/ui/keep_bad_isbn_dialog"
+require "alexandria/image_fetcher"
 
 module Alexandria
   class DuplicateBookException < NameError
@@ -16,6 +17,7 @@ module Alexandria
   module UI
     class NewBookDialog < BuilderBase
       include Logging
+      include ImageFetcher
       include GetText
       extend GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
@@ -163,17 +165,11 @@ module Alexandria
           begin
             @results.each_with_index do |result, i|
               uri = result[1]
-              if uri
-                if URI.parse(uri).scheme.nil?
-                  File.open(uri, "r") do |io|
-                    @images[i] = io.read
-                  end
-                else
-                  @images[i] = URI.parse(uri).read
-                end
-              end
+              @images[i] = fetch_image(uri) if uri
             end
           rescue StandardError => ex
+            log.error { "Couldn't download image: #{ex.class} #{ex}" }
+            log.error { ex.backtrace.join("\n") }
             @image_error = ex.message
           end
         end
@@ -181,8 +177,13 @@ module Alexandria
         GLib::Timeout.add(100) do
           if @image_error
             image_error_dialog(@image_error).display
+            @image_error = nil
           else
             @images.each_pair do |key, value|
+              @images.delete(key)
+
+              next unless value
+
               loader = GdkPixbuf::PixbufLoader.new
               loader.last_write(value)
               pixbuf = loader.pixbuf
@@ -195,8 +196,6 @@ module Alexandria
 
                 iter[2] = pixbuf # I bet you this is it!
               end
-
-              @images.delete(key)
             rescue StandardError => ex
               image_error_dialog(ex.message).display
             end
@@ -326,7 +325,7 @@ module Alexandria
 
       def on_results_button_press_event(_widget, event)
         # double left click
-        on_add if (event.event_type == :'2button_press') && (event.button == 1)
+        on_add if (event.event_type == :"2button_press") && (event.button == 1)
       end
 
       def add_single_book_by_isbn(library, is_new)
@@ -462,7 +461,6 @@ module Alexandria
           # Do not destroy if there is no addition.
           #          return unless book_was_added
         rescue StandardError => ex
-          # FIXME: Message containing <> should be displayed correctly.
           ErrorDialog.new(@new_book_dialog, _("Couldn't add the book"), ex.message).display
         end
         # books_to_add

data/lib/alexandria/ui/new_book_dialog_manual.rb

@@ -93,7 +93,7 @@ module Alexandria
         @treeview_authors.model.each { |_m, _p, i| authors << i[0] }
         if authors.empty?
           raise AddError, _("At least one author must be " \
-                               "provided.")
+                            "provided.")
         end
         book = Book.new(title, authors, isbn, publisher,
                         publishing_year.zero? ? nil : publishing_year,

data/lib/alexandria/ui/preferences_dialog.rb

@@ -41,7 +41,7 @@ module Alexandria
           else
             log.warn do
               "no CheckButton for property #{pref_name} " \
-              "(probably conflicting versions of GUI and lib code)"
+                "(probably conflicting versions of GUI and lib code)"
             end
           end
         end
@@ -235,7 +235,7 @@ module Alexandria
 
       def on_providers_button_press_event(_widget, event)
         # double left click
-        on_provider_setup if (event.event_type == :'2button_press') && (event.button == 1)
+        on_provider_setup if (event.event_type == :"2button_press") && (event.button == 1)
       end
 
       def on_close

data/lib/alexandria/ui/provider_preferences_base_dialog.rb

@@ -19,7 +19,7 @@ module Alexandria
 
       def initialize(title:, parent:, flags:, buttons:)
         @dialog = Gtk::Dialog.new(title: title, parent: parent, flags: flags,
-                                 buttons: buttons)
+                                  buttons: buttons)
 
         @dialog.resizable = false
         @dialog.child.border_width = 12

data/lib/alexandria/ui/really_delete_dialog.rb

@@ -27,7 +27,7 @@ module Alexandria
         else
           message = if books.length == 1
                       format(_("Are you sure you want to delete '%s' " \
-                        "from '%s'?"), books.first.title, library.name)
+                               "from '%s'?"), books.first.title, library.name)
                     else
                       _("Are you sure you want to delete the " \
                         "selected books from '%s'?") % library.name

data/lib/alexandria/ui/ui_manager.rb

@@ -418,7 +418,7 @@ module Alexandria
                       library.length), library.name, library.length)
           else
             format(n_("Library '%s' selected, %d book, " \
-               "%d unrated",
+                      "%d unrated",
                       "Library '%s' selected, %d books, " \
                       "%d unrated",
                       library.length), library.name, library.length, n_unrated)
@@ -455,7 +455,7 @@ module Alexandria
           log.debug { "#{@library_listview} : #{@library_popup} : #{@listview}" }
           log.debug do
             "@library_listview: #{@library_listview.has_focus?} " \
-            "or @library_popup:#{@library_popup.has_focus?}"
+              "or @library_popup:#{@library_popup.has_focus?}"
           end
           log.debug { "@library_listview does *NOT* have focus" }
           log.debug { "Books are empty: #{books.empty?}" }
@@ -531,11 +531,8 @@ module Alexandria
         @actiongroup["Sidepane"].active = false
       end
 
-      # TODO: Figure out why this frequently selects the wrong book!
       def select_a_book(book)
-        log.debug { "select_a_book: listview" }
         select_book_in_view(book, @listview)
-        log.debug { "select_a_book: iconview" }
         select_book_in_view(book, @iconview)
       end
 
@@ -658,7 +655,7 @@ module Alexandria
 
                   log.debug do
                     "Trying to add #{book.title}, #{cover_uri}" \
-                    " in library ''#{library.name}'"
+                      " in library ''#{library.name}'"
                   end
                   library.save_cover(book, cover_uri) unless cover_uri.nil?
                   library << book
@@ -878,7 +875,6 @@ module Alexandria
       end
 
       def iter_from_ident(ident)
-        log.debug { ident.to_s }
         iter = @model.iter_first
         ok = true if iter
         while ok
@@ -890,7 +886,6 @@ module Alexandria
       end
 
       def iter_from_book(book)
-        log.debug { book.to_s }
         iter_from_ident(book.ident)
       end
 
@@ -1074,7 +1069,7 @@ module Alexandria
         # added by Cathal Mc Ginley, 23 Oct 2007
         log.debug do
           "library_sort_order #{@notebook.page}: " \
-          "#{@iconview.model.inspect} #{@listview.model.inspect}"
+            "#{@iconview.model.inspect} #{@listview.model.inspect}"
         end
         result, sort_column, sort_order = current_view.model.sort_column_id
         if result
@@ -1100,10 +1095,10 @@ module Alexandria
       def get_previous_selected_library(library)
         log.debug { "get_previous_selected_library: #{library}" }
         @previous_selected_library = selected_library
-        if @previous_selected_library != library
-          select_library(library)
-        else
+        if @previous_selected_library == library
           @previous_selected_library = nil
+        else
+          select_library(library)
         end
       end
 
@@ -1181,23 +1176,20 @@ module Alexandria
       private
 
       def select_book_in_view(book, view)
-        @filtered_model.refilter
-        iter = iter_from_book book
-        return unless iter
-
-        path = iter.path
         return unless view.model
 
+        @filtered_model.refilter
+        iter = iter_from_book(book) or return
+        path = iter.path
         path = view_path_to_model_path(view, path)
-        log.debug { "Path for #{book.ident} is #{path}" }
         selection = view.respond_to?(:selection) ? view.selection : view
         selection.unselect_all
-        selection.select_path(path)
+        selection.select_path(path) if path
       end
 
-      def view_path_to_model_path(view, path)
-        path = view.model.convert_path_to_child_path(path)
-        @filtered_model.convert_path_to_child_path(path) if path
+      def view_path_to_model_path(view, view_path)
+        filter_path = view.model.convert_path_to_child_path(view_path)
+        @filtered_model.convert_path_to_child_path(filter_path) if filter_path
       end
     end
   end

data/lib/alexandria/version.rb

@@ -5,7 +5,7 @@
 # See the file README.md for authorship and licensing information.
 
 module Alexandria
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
   DATA_VERSION = "0.6.3"
   DISPLAY_VERSION = VERSION
 end