alexandria-book-collection-manager 0.7.8 → 0.7.10

data/lib/alexandria/ui/init.rb

@@ -25,22 +25,28 @@ class Gtk::ActionGroup
 end
 
 module Alexandria::UI::FreezeThaw
+  def self.included(base)
+    base.class_eval do
+      attr_accessor :old_model
+    end
+  end
+
   def frozen?
-    @old_model && !model
+    old_model && !model
   end
 
   def freeze
     return if frozen?
 
-    @old_model = model
+    self.old_model = model
     self.model = nil
   end
 
   def unfreeze
     return unless frozen?
 
-    self.model = @old_model
-    @old_model = nil
+    self.model = old_model
+    self.old_model = nil
   end
 end
 

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
 
@@ -612,8 +609,8 @@ module Alexandria
 
       def handle_ruined_books
         new_message = _(
-          "The data files for the following books are malformed or empty. Do you wish to" \
-          " attempt to download new information for them from the online book providers?\n")
+          "The data files for the following books are malformed or empty. Do you wish to " \
+          "attempt to download new information for them from the online book providers?\n")
 
         @libraries.ruined_books.each do |bi|
           new_message += "\n#{bi[1] || bi[1].inspect}"
@@ -657,8 +654,8 @@ module Alexandria
                   end
 
                   log.debug do
-                    "Trying to add #{book.title}, #{cover_uri}" \
-                    " in library ''#{library.name}'"
+                    "Trying to add #{book.title}, #{cover_uri} " \
+                      "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.10"
   DATA_VERSION = "0.6.3"
   DISPLAY_VERSION = VERSION
 end

data/lib/alexandria/web_themes.rb

@@ -39,7 +39,7 @@ module Alexandria
         File.join(Alexandria::Config::DATA_DIR, "web-themes"),
 
         # User dir
-        File.join(ENV["HOME"], ".alexandria", ".web-themes")
+        File.join(Dir.home, ".alexandria", ".web-themes")
       ]
       themes_dir.map { |x| load(x) }.flatten
     end

data/lib/alexandria.rb

@@ -21,10 +21,11 @@ require "alexandria/logging"
 require "alexandria/about"
 
 module Alexandria
-  def self.set_proxy
-    if !ENV["http_proxy"].nil? && URI.parse(ENV["http_proxy"]).userinfo.nil?
-      ENV["http_proxy"] = nil
-    end
+  def self.clear_invalid_proxy
+    current_proxy = ENV.fetch("http_proxy", nil)
+    return if current_proxy.nil?
+
+    ENV["http_proxy"] = nil if URI.parse(current_proxy).userinfo.nil?
   end
 
   def self.set_log_level
@@ -33,7 +34,7 @@ module Alexandria
   end
 
   def self.main
-    set_proxy
+    clear_invalid_proxy
     set_log_level
     Alexandria::UI.main
   end