alexandria-book-collection-manager 0.7.0 → 0.7.1

data/lib/alexandria/export_library.rb

@@ -22,13 +22,8 @@
 # iPod Notes support added 20 January 2008 by Tim Malone
 # require 'cgi'
 
-begin # image_size is optional
-  $IMAGE_SIZE_LOADED = true
-  require 'image_size'
-rescue LoadError
-  $IMAGE_SIZE_LOADED = false
-  puts "Can't load image_size, hence exported libraries are not optimized" if $DEBUG
-end
+require 'csv'
+require 'image_size'
 
 module Alexandria
   class LibrarySortOrder
@@ -55,8 +50,7 @@ module Alexandria
     end
 
     class Unsorted < LibrarySortOrder
-      def initialize
-      end
+      def initialize; end
 
       def sort(library)
         library
@@ -180,8 +174,9 @@ module Alexandria
       FileUtils.mkdir(filename) unless File.exist?(filename)
       Dir.chdir(filename) do
         copy_covers('pixmaps')
-        FileUtils.cp_r(theme.pixmaps_directory,
-                       'pixmaps') if theme.has_pixmaps?
+        if theme.has_pixmaps?
+          FileUtils.cp_r(theme.pixmaps_directory, 'pixmaps')
+        end
         FileUtils.cp(theme.css_file, '.')
         File.open('index.html', 'w') do |io|
           io << to_xhtml(File.basename(theme.css_file))
@@ -228,10 +223,15 @@ module Alexandria
     end
 
     def export_as_csv_list(filename)
-      File.open(filename, 'w') do |io|
-        io.puts 'Title' + ';' + 'Authors' + ';' + 'Publisher' + ';' + 'Edition' + ';' + 'ISBN' + ';' + 'Year Published' + ';' + 'Rating' + "(0 to #{UI::MainApp::MAX_RATING_STARS})" + ';' + 'Notes' + ';' + 'Want?' + ';' + 'Read?' + ';' + 'Own?' + ';' + 'Tags'
+      CSV.open(filename, 'w', col_sep: ';') do |csv|
+        csv << ['Title', 'Authors', 'Publisher', 'Edition', 'ISBN', 'Year Published',
+                "Rating(#{Book::DEFAULT_RATING} to #{Book::MAX_RATING_STARS})", 'Notes',
+                'Want?', 'Read?', 'Own?', 'Tags']
         each do |book|
-          io.puts book.title + ';' + book.authors.join(', ') + ';' + (book.publisher || '') + ';' + (book.edition || '') + ';' + (book.isbn || '') + ';' + (book.publishing_year.to_s || '') + ';' + (book.rating.to_s || '0') + ';' + (book.notes || '') + ';' + (book.want ? '1' : '0') + ';' + (book.redd ? '1' : '0') + ';' + (book.own ? '1' : '0') + ';' + (book.tags ? book.tags.join(', ') : '')
+          csv << [book.title, book.authors.join(', '), book.publisher, book.edition, book.isbn,
+                  book.publishing_year, book.rating, book.notes,
+                  (book.want ? '1' : '0'), (book.redd ? '1' : '0'), (book.own ? '1' : '0'),
+                  (book.tags ? book.tags.join(', ') : '')]
         end
       end
     end
@@ -352,15 +352,10 @@ module Alexandria
           entry.add_element('cover').text = final_cover(book)
           image = images.add_element('image')
           image.add_attribute('id', final_cover(book))
-          if $IMAGE_SIZE_LOADED
-            image_s = ImageSize.new(IO.read(cover(book)))
-            image.add_attribute('height', image_s.get_height.to_s)
-            image.add_attribute('width', image_s.get_width.to_s)
-            image.add_attribute('format', image_s.get_type)
-          else
-            image.add_attribute('format',
-                                Library.jpeg?(cover(book)) ? 'JPEG' : 'GIF')
-          end
+          image_s = ImageSize.new(IO.read(cover(book)))
+          image.add_attribute('height', image_s.get_height.to_s)
+          image.add_attribute('width', image_s.get_width.to_s)
+          image.add_attribute('format', image_s.get_type)
         end
       end
       doc
@@ -409,12 +404,10 @@ EOS
        src="#{File.join('pixmaps', final_cover(book))}"
        alt="Cover file for '#{xhtml_escape(book.title)}'"
 EOS
-          if $IMAGE_SIZE_LOADED
-            image_s = ImageSize.new(IO.read(cover(book)))
-            xhtml << <<EOS
+          image_s = ImageSize.new(IO.read(cover(book)))
+          xhtml << <<EOS
        height="#{image_s.get_height}" width="#{image_s.get_width}"
 EOS
-          end
           xhtml << <<EOS
   />
 EOS

data/lib/alexandria/import_library.rb

@@ -141,7 +141,7 @@ module Alexandria
                     end
             puts cover
             book = Book.new(*book_elements)
-            if elements['rating'] && (0..UI::MainApp::MAX_RATING_STARS).map.member?(elements['rating'].text.to_i)
+            if elements['rating'] && Book::VALID_RATINGS.member?(elements['rating'].text.to_i)
               book.rating = elements['rating'].text.to_i
             end
             book.notes = neaten(elements['comments'].text) if elements['comments']
@@ -278,8 +278,9 @@ module Alexandria
           #  (on_error_cb and on_error_cb.call(e.message))
         end
 
-        on_iterate_cb.call(current_iteration += 1,
-                           max_iterations) if on_iterate_cb
+        if on_iterate_cb
+          on_iterate_cb.call(current_iteration += 1, max_iterations)
+        end
       end
       puts "Bad Isbn list: #{bad_isbns.inspect}" if bad_isbns
       library = load(name)
@@ -290,8 +291,9 @@ module Alexandria
         puts "Saving #{book.isbn}..." if $DEBUG
         library << book
         library.save(book)
-        on_iterate_cb.call(current_iteration += 1,
-                           max_iterations) if on_iterate_cb
+        if on_iterate_cb
+          on_iterate_cb.call(current_iteration += 1, max_iterations)
+        end
       end
       [library, bad_isbns, failed_lookup_isbns]
     end

data/lib/alexandria/models/book.rb

@@ -18,10 +18,14 @@
 module Alexandria
   class Book
     attr_accessor :title, :authors, :isbn, :publisher, :publishing_year,
-                  :edition, :rating, :notes, :loaned, :loaned_since,
+                  :edition, :notes, :loaned, :loaned_since,
                   :loaned_to, :saved_ident, :redd, :redd_when, :own, :want, :tags, :version, :library
 
+    attr_reader :rating
+
     DEFAULT_RATING = 0
+    MAX_RATING_STARS = 5
+    VALID_RATINGS = (DEFAULT_RATING..MAX_RATING_STARS)
 
     def initialize(title, authors, isbn, publisher, publishing_year,
                    edition)
@@ -38,6 +42,7 @@ module Alexandria
       @own = true
       @want = true
       @tags = []
+      @rating = DEFAULT_RATING
       # Need to implement bulk save function to update this
       @version = Alexandria::DATA_VERSION
     end
@@ -47,6 +52,11 @@ module Alexandria
       @isbn || @title.hash.to_s
     end
 
+    def rating=(rating)
+      raise ArgumentError unless VALID_RATINGS.include? rating
+      @rating = rating
+    end
+
     def loaned?
       loaned || false
     end

data/lib/alexandria/models/library.rb

@@ -25,12 +25,6 @@ require 'open-uri'
 require 'observer'
 require 'singleton'
 
-class Array
-  def sum
-    reduce(0) { |a, b| a + b }
-  end
-end
-
 module Alexandria
   class Library < Array
     include Logging
@@ -270,9 +264,6 @@ module Alexandria
     end
 
     class NoISBNError < StandardError
-      def initialize(msg)
-        super(msg)
-      end
     end
 
     class InvalidISBNError < StandardError
@@ -308,8 +299,8 @@ module Alexandria
     end
 
     def self.ean_checksum(numbers)
-      (10 - ([1, 3, 5, 7, 9, 11].map { |x| numbers[x] }.sum * 3 +
-             [0, 2, 4, 6, 8, 10].map { |x| numbers[x] }.sum)) % 10
+      -(numbers.values_at(1, 3, 5, 7, 9, 11).reduce(:+) * 3 +
+        numbers.values_at(0, 2, 4, 6, 8, 10).reduce(:+)) % 10
     end
 
     def self.valid_ean?(ean)
@@ -323,8 +314,8 @@ module Alexandria
     end
 
     def self.upc_checksum(numbers)
-      (10 - ([0, 2, 4, 6, 8, 10].map { |x| numbers[x] }.sum * 3 +
-             [1, 3, 5, 7, 9].map { |x| numbers[x] }.sum)) % 10
+      -(numbers.values_at(0, 2, 4, 6, 8, 10).reduce(:+) * 3 +
+        numbers.values_at(1, 3, 5, 7, 9).reduce(:+)) % 10
     end
 
     def self.valid_upc?(upc)
@@ -571,8 +562,6 @@ module Alexandria
                 something
               when Integer
                 something
-              when Integer
-                something
               else
                 raise "#{something} is a #{something.class}"
               end
@@ -587,8 +576,6 @@ module Alexandria
                 something
               when Integer
                 something
-              when Integer
-                something
               else
                 raise "#{something} is #{something.class}"
               end

data/lib/alexandria/preferences.rb

@@ -257,13 +257,13 @@ module Alexandria
     # range of values used by Alexandria.
     def discriminate(value)
       if value == 'true'        # bool
-        return true
+        true
       elsif value == 'false'    # bool
-        return false
+        false
       elsif value =~ /^[0-9]+$/   # int
-        return value.to_i
+        value.to_i
       elsif value =~ /^\[(.*)\]$/ # list (assume of type String)
-        return Regexp.last_match[1].split(',')
+        Regexp.last_match[1].split(',')
       elsif value =~ /^\((.*)\)$/ # pair (assume of type int)
         begin
           pair = Regexp.last_match[1].split(',')
@@ -272,7 +272,7 @@ module Alexandria
           return [0, 0]
         end
       else
-        return value # string
+        value # string
       end
     end
   end

data/lib/alexandria/smart_library.rb

@@ -37,10 +37,9 @@ module Alexandria
     def initialize(name, rules, predicate_operator_rule)
       super()
       raise if name.nil? || rules.nil? || predicate_operator_rule.nil?
-      @name = name
+      @name = name.dup.force_encoding('UTF-8')
       @rules = rules
       @predicate_operator_rule = predicate_operator_rule
-      save
       libraries = Libraries.instance
       libraries.add_observer(self)
       self.libraries = libraries.all_regular_libraries
@@ -90,7 +89,7 @@ module Alexandria
       # Favorite books.
       rule = Rule.new(operands.find { |x| x.book_selector == :rating },
                       Rule::Operators::IS,
-                      UI::MainApp::MAX_RATING_STARS.to_s)
+                      Book::MAX_RATING_STARS.to_s)
       a << new(_('Favorite'), [rule], ALL_RULES)
 
       # Loaned books.
@@ -159,11 +158,6 @@ module Alexandria
     end
 
     def refilter
-      raise 'need libraries' if @libraries.nil?
-      raise 'no libraries' if @libraries.empty?
-      raise 'need predicate operator' if @predicate_operator_rule.nil?
-      raise 'need rule' if @rules.nil? || @rules.empty?
-
       filters = @rules.map(&:filter_proc)
       selector = @predicate_operator_rule == ALL_RULES ? :all? : :any?
 

data/lib/alexandria/ui/callbacks.rb

@@ -199,7 +199,7 @@ module Alexandria
       end
 
       def on_set_rating
-        (0..MAX_RATING_STARS).map do |rating|
+        Book::VALID_RATINGS.map do |rating|
           proc do
             books = selected_books
             library = selected_library

data/lib/alexandria/ui/columns.rb

@@ -0,0 +1,9 @@
+module Alexandria
+  module UI
+    module Columns
+      COVER_LIST, COVER_ICON, TITLE, TITLE_REDUCED, AUTHORS,
+        ISBN, PUBLISHER, PUBLISH_DATE, EDITION, RATING, IDENT,
+        NOTES, REDD, OWN, WANT, TAGS, LOANED_TO = (0..17).to_a
+    end
+  end
+end

data/lib/alexandria/ui/completion_models.rb

@@ -44,6 +44,7 @@ module Alexandria
       min = 2
       completion.signal_connect('match-selected') do |c, model, iter|
         cur_text = c.entry.text
+        # TODO: Replace with iter[0] if possible
         new_tag = model.get_value(iter, 0)
         cur_text_split = cur_text.split(',')
         cur_text_split.delete_at(-1)
@@ -83,34 +84,6 @@ end
 
 Gtk::Entry.prepend Alexandria::EntryOverrides
 
-begin
-  require 'revolution'
-
-  EVOLUTION_CONTACTS =
-    Revolution::Revolution.new.get_all_contacts.map do |contact|
-      first = contact.first_name
-      last = contact.last_name
-
-      if first
-        first.strip!
-        first = nil if first.empty?
-      end
-
-      if last
-        last.strip!
-        last = nil if last.empty?
-      end
-
-      first && last ? first + ' ' + last : first ? first : last
-    end
-rescue LoadError => e
-  Alexandria.log.debug { 'Could not find optional ruby-revolution; Evolution contacts will not be loaded' }
-  EVOLUTION_CONTACTS = [].freeze
-rescue => e
-  Alexandria.log.warn { e.message }
-  EVOLUTION_CONTACTS = [].freeze
-end
-
 module Alexandria
   module UI
     class CompletionModels
@@ -207,7 +180,6 @@ module Alexandria
           end
         end
 
-        borrowers.concat(EVOLUTION_CONTACTS)
         borrowers.uniq!
 
         tags.uniq!

data/lib/alexandria/ui/dialogs/acquire_dialog.rb

@@ -236,8 +236,7 @@ module Alexandria
         @acquire_dialog.destroy
       end
 
-      def on_help
-      end
+      def on_help; end
 
       def read_barcode_scan
         @animation.start
@@ -535,7 +534,7 @@ module Alexandria
       def play_sound(effect)
         if effect == 'scanning'
           puts "Effect: #{effect}, playing: #{@prefs.play_scanning_sound}" if $DEBUG
-          return unless  @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

data/lib/alexandria/ui/dialogs/book_properties_dialog_base.rb

@@ -268,8 +268,7 @@ module Alexandria
                                          end
       end
 
-      def want_toggled
-      end
+      def want_toggled; end
 
       @@latest_filechooser_directory = ENV['HOME']
       def on_change_cover

data/lib/alexandria/ui/dialogs/new_book_dialog_manual.rb

@@ -84,8 +84,9 @@ module Alexandria
           ary = @library.select { |book|
             book.ident == @entry_isbn.text
           }
-          raise AddError, _('The EAN/ISBN you provided is ' \
-                               'already used in this library.') unless ary.empty?
+          unless ary.empty?
+            raise AddError, _('The EAN/ISBN you provided is already used in this library.')
+          end
           isbn = begin
                    Library.canonicalise_isbn(@entry_isbn.text)
                  rescue Alexandria::Library::InvalidISBNError

data/lib/alexandria/ui/iconview.rb

@@ -17,16 +17,11 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
+require 'alexandria/ui/columns'
 require 'alexandria/ui/iconview_tooltips'
 
 module Alexandria
   module UI
-    module Columns
-      COVER_LIST, COVER_ICON, TITLE, TITLE_REDUCED, AUTHORS,
-        ISBN, PUBLISHER, PUBLISH_DATE, EDITION, RATING, IDENT,
-        NOTES, REDD, OWN, WANT, TAGS = (0..16).to_a
-    end
-
     class IconViewManager
       ICON_WIDTH = 60
       include Logging

data/lib/alexandria/ui/libraries_combo.rb

@@ -32,6 +32,7 @@ module Alexandria
       end
       clear
       set_row_separator_func do |model, iter|
+        # TODO: Replace with iter[1] if possible
         model.get_value(iter, 1) == '-'
       end
       self.model = Gtk::ListStore.new(GdkPixbuf::Pixbuf, String, TrueClass)

data/lib/alexandria/ui/listview.rb

@@ -18,6 +18,8 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
+require 'alexandria/ui/columns'
+
 module Alexandria
   module UI
     include Logging
@@ -29,13 +31,6 @@ module Alexandria
       include DragAndDropable
       BOOKS_TARGET_TABLE = [['ALEXANDRIA_BOOKS', :same_app, 0]].freeze
 
-      MAX_RATING_STARS = 5
-      module Columns
-        COVER_LIST, COVER_ICON, TITLE, TITLE_REDUCED, AUTHORS,
-          ISBN, PUBLISHER, PUBLISH_DATE, EDITION, RATING, IDENT,
-          NOTES, REDD, OWN, WANT, TAGS, LOANED_TO = (0..17).to_a
-      end
-
       def initialize(_listview, parent)
         @parent = parent
         @prefs = @parent.prefs
@@ -127,14 +122,14 @@ module Alexandria
         log.debug { 'Create listview column for %s...' % title }
         column = Gtk::TreeViewColumn.new(title)
         column.sizing = :fixed
-        width = (Icons::STAR_SET.width + 1) * MAX_RATING_STARS
+        width = (Icons::STAR_SET.width + 1) * Book::MAX_RATING_STARS
         column.fixed_width = column.min_width = column.max_width = width
-        MAX_RATING_STARS.times do |i|
+        Book::MAX_RATING_STARS.times do |i|
           renderer = Gtk::CellRendererPixbuf.new
           renderer.xalign = 0.0
           column.pack_start(renderer, false)
           column.set_cell_data_func(renderer) do |_tree_column, cell, _tree_model, iter|
-            rating = (iter[Columns::RATING] - MAX_RATING_STARS).abs
+            rating = (iter[Columns::RATING] - Book::MAX_RATING_STARS).abs
             cell.pixbuf = rating >= i.succ ?
               Icons::STAR_SET : Icons::STAR_UNSET
           end