alexandria-book-collection-manager 0.7.5 → 0.7.9

data/lib/alexandria/models/library.rb

@@ -10,13 +10,16 @@ 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")
     EXT = { book: ".yaml", cover: ".cover" }.freeze
 
@@ -76,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
@@ -95,8 +98,8 @@ module Alexandria
     end
 
     def self.ean_checksum(numbers)
-      -(numbers.values_at(1, 3, 5, 7, 9, 11).reduce(:+) * 3 +
-        numbers.values_at(0, 2, 4, 6, 8, 10).reduce(:+)) % 10
+      -(numbers.values_at(1, 3, 5, 7, 9, 11).sum * 3 +
+        numbers.values_at(0, 2, 4, 6, 8, 10).sum) % 10
     end
 
     def self.valid_ean?(ean)
@@ -108,8 +111,8 @@ module Alexandria
     end
 
     def self.upc_checksum(numbers)
-      -(numbers.values_at(0, 2, 4, 6, 8, 10).reduce(:+) * 3 +
-        numbers.values_at(1, 3, 5, 7, 9).reduce(:+)) % 10
+      -(numbers.values_at(0, 2, 4, 6, 8, 10).sum * 3 +
+        numbers.values_at(1, 3, 5, 7, 9).sum) % 10
     end
 
     def self.valid_upc?(upc)
@@ -221,11 +224,11 @@ module Alexandria
       File.open(yaml(temp_book), "w") { |io| io.puts temp_book.to_yaml }
 
       # Do not notify twice.
-      if changed?
-        notify_observers(self,
-                         already_there ? BOOK_UPDATED : BOOK_ADDED,
-                         book)
-      end
+      return unless changed?
+
+      notify_observers(self,
+                       already_there ? BOOK_UPDATED : BOOK_ADDED,
+                       book)
     end
 
     def transport
@@ -237,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
 
@@ -283,7 +280,10 @@ module Alexandria
       else
         if @deleted_books.include?(book)
           doubles = @deleted_books.select { |b| b.equal?(book) }
-          raise ArgumentError, "Book #{book.isbn} was already deleted" unless doubles.empty?
+          unless doubles.empty?
+            raise ArgumentError, format(_("Book %<isbn>s was already deleted"),
+                                        isbn: book.isbn)
+          end
         end
         @deleted_books << book
         i = index(book)
@@ -341,12 +341,10 @@ module Alexandria
                 else
                   "g#{something.ident}" # g is for generated id...
                 end
-              when String
-                something
-              when Integer
+              when String, Integer
                 something
               else
-                raise "#{something} is a #{something.class}"
+                raise NotImplementedError
               end
       File.join(path, ident.to_s + EXT[:cover])
     end
@@ -355,18 +353,16 @@ module Alexandria
       ident = case something
               when Book
                 something.ident
-              when String
-                something
-              when Integer
+              when String, Integer
                 something
               else
-                raise "#{something} is #{something.class}"
+                raise NotImplementedError
               end
       File.join(basedir, ident.to_s + EXT[:book])
     end
 
     def name=(name)
-      File.rename(path, File.join(dir, name))
+      File.rename(path, File.join(@store.library_dir, name))
       @name = name
     end
 
@@ -378,8 +374,8 @@ module Alexandria
       length - n_rated
     end
 
-    def ==(object)
-      object.is_a?(self.class) && object.name == name
+    def ==(other)
+      other.is_a?(self.class) && other.name == name
     end
 
     def copy_covers(somewhere)
@@ -394,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/net.rb

@@ -38,10 +38,9 @@ module Alexandria
       @extra_request_headers.each_pair do |header_name, value|
         req.add_field(header_name, value)
       end
-      res = WWWAgent.transport.start(uri.host, uri.port) do |http|
+      WWWAgent.transport.start(uri.host, uri.port) do |http|
         http.request(req)
       end
-      res
     end
 
     def language=(lang)

data/lib/alexandria/preferences.rb

@@ -57,30 +57,24 @@ module Alexandria
       @changed_settings.clear
     end
 
-    def method_missing(id, *args)
-      method = id.id2name
-      if (match = /(.*)=$/.match(method))
-        if args.length != 1
-          raise "Set method #{method} should be called with " \
-            "only one argument (was called with #{args.length})"
-        end
-        variable_name = match[1]
-        new_value = args.first
-        generic_setter(variable_name, new_value)
-      else
-        unless args.empty?
-          raise "Get method #{method} should be called " \
-            "without argument (was called with #{args.length})"
-        end
-        generic_getter(method)
-      end
-    end
-
     def remove_preference(variable_name)
       @alexandria_settings.delete(variable_name)
       @changed_settings << variable_name
     end
 
+    DEFAULT_VALUES.each_key do |var|
+      define_method(var) { generic_getter var }
+      define_method("#{var}=") { |val| generic_setter var, val }
+    end
+
+    def get_variable(variable_name)
+      generic_getter(variable_name.to_s)
+    end
+
+    def set_variable(variable_name, value)
+      generic_setter(variable_name.to_s, value)
+    end
+
     private
 
     ##
@@ -140,11 +134,10 @@ module Alexandria
     ##
 
     def get_gconf_type(value)
-      if value.is_a?(String)
-        "string"
-      elsif value.is_a?(Integer)
+      case value
+      when Integer
         "int"
-      elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      when TrueClass, FalseClass
         "bool"
       else
         "string"
@@ -152,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
@@ -168,24 +161,24 @@ module Alexandria
     end
 
     def make_list_string(list)
-      list.map! { |x| x.gsub(/\"/, '\\"') } if get_gconf_type(list.first) == "string"
+      list.map! { |x| x.gsub(/"/, '\\"') } if get_gconf_type(list.first) == "string"
       contents = list.join(",")
       "[" + contents + "]"
     end
 
     def exec_gconf_set(var_path, new_value)
       if /cols_width/.match?(var_path)
-        puts new_value
+        log.debug { new_value }
 
         # new_value = {}
       end
       type = get_gconf_type(new_value)
       value_str = new_value
       if new_value.is_a? String
-        new_value = new_value.gsub(/\"/, '\\"')
+        new_value = new_value.gsub(/"/, '\\"')
         value_str = "\"#{new_value}\""
       end
-      puts value_str if /cols_width/.match?(var_path)
+      log.debug { value_str } if /cols_width/.match?(var_path)
       `gconftool-2 --type #{type} --set #{var_path} #{value_str}`
     end
 
@@ -242,15 +235,16 @@ module Alexandria
     # gconftool. This is not fool-proof, but it *does* work for the
     # range of values used by Alexandria.
     def discriminate(value)
-      if value == "true"        # bool
+      case value
+      when "true"       # bool
         true
-      elsif value == "false"    # bool
+      when "false"      # bool
         false
-      elsif /^[0-9]+$/.match?(value) # int
+      when /^-?[0-9]+$/ # int
         value.to_i
-      elsif value =~ /^\[(.*)\]$/ # list (assume of type String)
+      when /^\[(.*)\]$/ # list (assume of type String)
         Regexp.last_match[1].split(",")
-      elsif value =~ /^\((.*)\)$/ # pair (assume of type int)
+      when /^\((.*)\)$/ # pair (assume of type int)
         begin
           pair = Regexp.last_match[1].split(",")
           [discriminate(pair.first), discriminate(pair.last)]

data/lib/alexandria/scanners/cue_cat.rb

@@ -23,7 +23,7 @@ require "alexandria/scanners"
 module Alexandria
   module Scanners
     class CueCat
-      include Alexandria::Logging
+      include Logging
 
       def name
         "CueCat"
@@ -72,7 +72,8 @@ module Alexandria
 
         return code if type == "IBN"
 
-        raise "Don't know how to handle type #{type} (barcode: #{code})"
+        raise format(_("Don't know how to handle type %<type>s (barcode: %<code>s)"),
+                     type: type, code: code)
       end
 
       private
@@ -80,13 +81,12 @@ module Alexandria
       def decode_field(encoded)
         seq = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-"
 
-        chars   = encoded.split(//)
+        chars   = encoded.chars
         values  = chars.map { |c| seq.index(c) }
 
         padding = pad(values)
         result  = calc(values)
-        result  = result[0, result.length - padding]
-        result
+        result[0, result.length - padding]
       end
 
       def calc(values)
@@ -106,7 +106,7 @@ module Alexandria
         length = array.length % 4
 
         if length.nonzero?
-          raise "Error parsing CueCat input" if length == 1
+          raise _("Error parsing CueCat input") if length == 1
 
           length = 4 - length
           length.times { array.push(0) }

data/lib/alexandria/scanners/keyboard.rb

@@ -48,7 +48,7 @@ module Alexandria
         elsif data.length >= 13
           data[0, 13]
         else
-          raise "Unknown scan data #{data}"
+          raise format(_("Unknown scan data %s<data>"), data: data)
         end
       end
     end

data/lib/alexandria/scanners.rb

@@ -40,8 +40,8 @@ module Alexandria
       registry.find { |scanner| scanner.name == name }
     end
 
-    def self.each_scanner
-      registry.each { |scanner| yield scanner }
+    def self.each_scanner(&block)
+      registry.each(&block)
     end
 
     private_class_method :registry

data/lib/alexandria/smart_library.rb

@@ -16,7 +16,7 @@ module Alexandria
 
     ALL_RULES = 1
     ANY_RULE = 2
-    attr_reader :name
+    attr_reader :name, :n_rated
     attr_accessor :rules, :predicate_operator_rule, :deleted_books
 
     EXT = ".yaml"
@@ -94,22 +94,23 @@ module Alexandria
     end
 
     def name=(new_name)
-      if @name != new_name
-        old_yaml = yaml
-        @name = new_name
-        FileUtils.mv(old_yaml, yaml)
-        save
-      end
+      return unless @name != new_name
+
+      old_yaml = yaml
+      @name = new_name
+      FileUtils.mv(old_yaml, yaml)
+      save
     end
 
     def update(*params)
-      if params.first.is_a?(LibraryCollection)
+      case params.first
+      when LibraryCollection
         libraries, _, library = params
         unless library.is_a?(self.class)
           self.libraries = libraries.all_libraries
           refilter
         end
-      elsif params.first.is_a?(Library)
+      when Library
         refilter
       end
     end
@@ -172,14 +173,12 @@ module Alexandria
       end
     end
 
-    attr_reader :n_rated
-
     def n_unrated
       length - n_rated
     end
 
-    def ==(object)
-      object.is_a?(self.class) && object.name == name
+    def ==(other)
+      other.is_a?(self.class) && other.name == name
     end
 
     @@deleted_libraries = []
@@ -190,15 +189,16 @@ module Alexandria
 
     def self.really_delete_deleted_libraries
       @@deleted_libraries.each do |library|
-        puts "Deleting smart library file (#{yaml})" if $DEBUG
+        log.debug { "Deleting smart library file (#{yaml})" }
         FileUtils.rm_rf(library.yaml)
       end
     end
 
     def delete
       if @@deleted_libraries.include?(self)
-        puts "Already deleted a SmartLibrary with this name"
-        puts "(this might mess up undeletes...)"
+        log.info do
+          "Already deleted a SmartLibrary with this name (this might mess up undeletes)"
+        end
         FileUtils.rm_rf(yaml)
         # so we just delete the old smart library, and
         # 'pending' delete the new one of the same name...
@@ -265,8 +265,8 @@ module Alexandria
 
       Operand = Struct.new(:name, :klass)
       class Operand
-        def <=>(x)
-          name <=> x.name
+        def <=>(other)
+          name <=> other.name
         end
       end
 
@@ -281,8 +281,8 @@ module Alexandria
 
       Operator = Struct.new(:sym, :name, :proc)
       class Operator
-        def <=>(x)
-          name <=> x.name
+        def <=>(other)
+          name <=> other.name
         end
       end
 
@@ -462,17 +462,13 @@ module Alexandria
             end
           end
         else
-          raise "invalid operand klass #{operand.klass}"
+          raise format(_("invalid operand klass %<klass>s"), klass: operand.klass)
         end
       end
 
       def filter_proc
         proc do |book|
-          begin
-            left_value = book.send(@operand.book_selector)
-          rescue StandardError => ex
-            puts ex.message
-          end
+          left_value = book.send(@operand.book_selector)
           right_value = @value
           if right_value.is_a?(String)
             left_value = left_value.to_s.downcase

data/lib/alexandria/ui/about_dialog.rb

@@ -7,7 +7,7 @@
 module Alexandria
   module UI
     class AboutDialog
-      GPL = <<~EOL
+      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")
@@ -64,6 +68,10 @@ module Alexandria
         @search_threads_running = @search_thread_counter.new_cond
       end
 
+      def show
+        @acquire_dialog.show
+      end
+
       def widget_names
         [:acquire_dialog, :add_button, :barcodes_treeview, :barcode_label,
          :scan_area, :scan_frame, :combo_libraries]
@@ -71,14 +79,9 @@ module Alexandria
 
       def book_in_library(isbn10, library)
         isbn13 = Library.canonicalise_ean(isbn10)
-        # puts "new book #{isbn10} (or #{isbn13})"
         match = library.find do |book|
-          # puts "testing #{book.isbn}"
           (book.isbn == isbn10 || book.isbn == isbn13)
-          # puts "book #{book.isbn}"
-          # book == new_book
         end
-        # puts "book_in_library match #{match.inspect}"
         !match.nil?
       rescue StandardError
         log.warn { "Failed to check for book #{isbn10} in library #{library}" }
@@ -92,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
@@ -358,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
@@ -472,7 +468,7 @@ module Alexandria
             if @scanner.match? @scanner_buffer
 
               Thread.new(@interval, @scanner_buffer) do |interval, buffer|
-                log.debug { "Waiting for more scanner input..." }
+                log.debug { "Waiting for more scanner input" }
                 GLib::Idle.add do
                   @animation.manual_input
                   false
@@ -492,7 +488,7 @@ module Alexandria
 
                 else
                   log.debug do
-                    "Buffer has changed while waiting, reading more characters..."
+                    "Buffer has changed while waiting; reading more characters"
                   end
                 end
               end
@@ -511,12 +507,12 @@ module Alexandria
 
       def play_sound(effect)
         if effect == "scanning"
-          puts "Effect: #{effect}, playing: #{@prefs.play_scanning_sound}" if $DEBUG
+          log.debug { "Effect: #{effect}, playing: #{@prefs.play_scanning_sound}" }
           return unless @prefs.play_scanning_sound
 
           @sound_players["scanning"].play("scanning")
         else
-          puts "Effect: #{effect}, playing: #{@prefs.play_scan_sound}" if $DEBUG
+          log.debug { "Effect: #{effect}, playing: #{@prefs.play_scan_sound}" }
           return unless @prefs.play_scan_sound
 
           # sleep(0.5) # "scanning" effect lasts 0.5 seconds, wait for it to end
@@ -525,7 +521,7 @@ module Alexandria
       end
 
       def developer_test_scan
-        log.info { "Developer test scan." }
+        log.info { "Developer test scan" }
         scans = [".C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3j3C3f1Dxj3Dq.",
                  ".C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3z0CNj3Dhj1EW.",
                  ".C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3r2DNbXCxTZCW.",

data/lib/alexandria/ui/alert_dialog.rb

@@ -4,22 +4,21 @@
 #
 # See the file README.md for authorship and licensing information.
 
+require "cgi"
+
 module Alexandria
   module UI
-    class AlertDialog < SimpleDelegator
+    class AlertDialog
       def initialize(parent, title, stock_icon, buttons, message = nil)
-        dialog = Gtk::Dialog.new(title: "", parent: parent, flags: :destroy_with_parent,
-                                 buttons: buttons)
-        super(dialog)
-
-        self.border_width = 6
-        self.resizable = false
-        child.spacing = 12
+        @dialog = Gtk::Dialog.new(title: "", parent: parent, flags: :destroy_with_parent,
+                                  buttons: buttons)
+        @dialog.border_width = 6
+        @dialog.resizable = false
+        @dialog.child.spacing = 12
 
         hbox = Gtk::Box.new(:horizontal, 12)
         hbox.homogeneous = false
         hbox.border_width = 6
-        child.pack_start(hbox)
 
         image = Gtk::Image.new(stock: stock_icon,
                                size: Gtk::IconSize::DIALOG)
@@ -28,21 +27,39 @@ module Alexandria
 
         vbox = Gtk::Box.new(:vertical, 6)
         vbox.homogeneous = false
+        vbox.pack_start make_label("<b><big>#{title}</big></b>")
+        vbox.pack_start make_label CGI.escapeHTML(message.strip) if message
         hbox.pack_start(vbox)
 
+        @dialog.child.pack_start(hbox)
+      end
+
+      def show_all
+        dialog.show_all
+      end
+
+      def run
+        dialog.run
+      end
+
+      def destroy
+        dialog.destroy
+      end
+
+      def default_response=(response)
+        dialog.default_response = response
+      end
+
+      private
+
+      attr_reader :dialog
+
+      def make_label(markup)
         label = Gtk::Label.new
         label.set_alignment(0, 0)
         label.wrap = label.selectable = true
-        label.markup = "<b><big>#{title}</big></b>"
-        vbox.pack_start(label)
-
-        if message
-          label = Gtk::Label.new
-          label.set_alignment(0, 0)
-          label.wrap = label.selectable = true
-          label.markup = message.strip
-          vbox.pack_start(label)
-        end
+        label.markup = markup
+        label
       end
     end
   end