alexandria-book-collection-manager 0.7.3 → 0.7.4

data/lib/alexandria/import_library.rb

@@ -4,8 +4,8 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'gettext'
-require 'tmpdir'
+require "gettext"
+require "tmpdir"
 
 module Alexandria
   class ImportFilter
@@ -13,15 +13,15 @@ module Alexandria
 
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     def self.all
       [
-        new(_('Autodetect'), ['*'], :import_autodetect),
-        new(_('Archived Tellico XML (*.bc, *.tc)'),
-            ['*.tc', '*.bc'], :import_as_tellico_xml_archive),
-        new(_('ISBN List (*.txt)'), ['*.txt'], :import_as_isbn_list),
-        new(_('GoodReads CSV'), ['*.csv'], :import_as_csv_file)
+        new(_("Autodetect"), ["*"], :import_autodetect),
+        new(_("Archived Tellico XML (*.bc, *.tc)"),
+            ["*.tc", "*.bc"], :import_as_tellico_xml_archive),
+        new(_("ISBN List (*.txt)"), ["*.txt"], :import_as_isbn_list),
+        new(_("GoodReads CSV"), ["*.csv"], :import_as_csv_file)
       ]
     end
 
@@ -54,64 +54,64 @@ module Alexandria
       filename = args[1]
       puts "Filename is #{filename} and ext is #{filename[-4..-1]}"
       puts "Beginning import: #{args[0]}, #{args[1]}"
-      if filename[-4..-1] == '.txt'
+      if filename[-4..-1] == ".txt"
         import_as_isbn_list(*args)
-      elsif ['.tc', '.bc'].include? filename[-3..-1]
+      elsif [".tc", ".bc"].include? filename[-3..-1]
         begin
           import_as_tellico_xml_archive(*args)
-        rescue StandardError => e
-          puts e.message
-          puts e.backtrace.join("\n>> ")
+        rescue StandardError => ex
+          puts ex.message
+          puts ex.backtrace.join("\n>> ")
         end
-      elsif ['.csv'].include? filename[-4..-1]
+      elsif [".csv"].include? filename[-4..-1]
         import_as_csv_file(*args)
       else
-        puts 'Bailing on this import!'
-        raise 'Not supported type'
+        puts "Bailing on this import!"
+        raise "Not supported type"
       end
     end
 
     def self.import_as_tellico_xml_archive(name, filename,
                                            on_iterate_cb, _on_error_cb)
-      puts 'Starting import_as_tellico_xml_archive... '
+      puts "Starting import_as_tellico_xml_archive... "
       return nil unless system("unzip -qqt \"#{filename}\"")
 
-      tmpdir = File.join(Dir.tmpdir, 'tellico_export')
+      tmpdir = File.join(Dir.tmpdir, "tellico_export")
       FileUtils.rm_rf(tmpdir) if File.exist?(tmpdir)
       Dir.mkdir(tmpdir)
       Dir.chdir(tmpdir) do
         begin
           system("unzip -qq \"#{filename}\"")
-          file = File.exist?('bookcase.xml') ? 'bookcase.xml' : 'tellico.xml'
+          file = File.exist?("bookcase.xml") ? "bookcase.xml" : "tellico.xml"
           xml = REXML::Document.new(File.open(file))
-          raise unless ['bookcase', 'tellico'].include? xml.root.name
+          raise unless ["bookcase", "tellico"].include? xml.root.name
           # FIXME: handle multiple collections
           raise unless xml.root.elements.size == 1
 
           collection = xml.root.elements[1]
-          raise unless collection.name == 'collection'
+          raise unless collection.name == "collection"
 
-          type = collection.attribute('type').value.to_i
+          type = collection.attribute("type").value.to_i
           raise unless (type == 2) || (type == 5)
 
           content = []
-          entries = collection.elements.to_a('entry')
+          entries = collection.elements.to_a("entry")
           (total = entries.size).times do |n|
             entry = entries[n]
             elements = entry.elements
             # Feed an array in here, tomorrow.
-            keys = ['isbn', 'publisher', 'pub_year', 'binding']
+            keys = ["isbn", "publisher", "pub_year", "binding"]
 
-            book_elements = [neaten(elements['title'].text)]
-            book_elements += if !elements['authors'].nil?
-                               [elements['authors'].elements.to_a.map \
+            book_elements = [neaten(elements["title"].text)]
+            book_elements += if !elements["authors"].nil?
+                               [elements["authors"].elements.to_a.map \
                                                  { |x| neaten(x.text) }]
                              else
                                [[]]
                              end
-            book_elements += keys.map { |key|
+            book_elements += keys.map do |key|
               neaten(elements[key].text) if elements[key]
-            }
+            end
             # isbn
             if book_elements[2].nil? || book_elements[2].strip.empty?
               book_elements[2] = nil
@@ -128,13 +128,13 @@ module Alexandria
             end
             book_elements[4] = book_elements[4].to_i unless book_elements[4].nil? # publishing_year
             puts book_elements.inspect
-            cover = (neaten(elements['cover'].text) if elements['cover'])
+            cover = (neaten(elements["cover"].text) if elements["cover"])
             puts cover
             book = Book.new(*book_elements)
-            if elements['rating'] && Book::VALID_RATINGS.member?(elements['rating'].text.to_i)
-              book.rating = 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']
+            book.notes = neaten(elements["comments"].text) if elements["comments"]
             content << [book, cover]
             on_iterate_cb&.call(n + 1, total)
           end
@@ -143,29 +143,29 @@ module Alexandria
           content.each do |book, cover|
             unless cover.nil?
               library.save_cover(book,
-                                 File.join(Dir.pwd, 'images',
+                                 File.join(Dir.pwd, "images",
                                            cover))
             end
             library << book
             library.save(book)
           end
           return [library, []]
-        rescue StandardError => e
-          puts e.message
+        rescue StandardError => ex
+          puts ex.message
           return nil
         end
       end
     end
 
     def self.import_as_csv_file(name, filename, on_iterate_cb, _on_error_cb)
-      require 'alexandria/import_library_csv'
+      require "alexandria/import_library_csv"
       books_and_covers = []
       line_count = IO.readlines(filename).reduce(0) { |count, _line| count + 1 }
 
       import_count = 0
       max_import = line_count - 1
 
-      reader = CSV.open(filename, 'r')
+      reader = CSV.open(filename, "r")
       # Goodreads & LibraryThing now use csv header lines
       header = reader.shift
       importer = identify_csv_type(header)
@@ -204,11 +204,11 @@ module Alexandria
           # this is a hack to fix up such files
           data = File.read(filename)
           data.gsub!(/\,\=\"/, ',"')
-          csv_fixed = Tempfile.new('alexandria_import_csv_fixed_')
+          csv_fixed = Tempfile.new("alexandria_import_csv_fixed_")
           csv_fixed.write(data)
           csv_fixed.close
 
-          reader = CSV.open(csv_fixed.path, 'r')
+          reader = CSV.open(csv_fixed.path, "r")
           header = reader.shift
           importer = identify_csv_type(header)
 
@@ -230,14 +230,14 @@ module Alexandria
 
     def self.import_as_isbn_list(name, filename, on_iterate_cb,
                                  on_error_cb)
-      puts 'Starting import_as_isbn_list... '
+      puts "Starting import_as_isbn_list... "
       isbn_list = IO.readlines(filename).map do |line|
         puts "Trying line #{line}" if $DEBUG
         # Let's preserve the failing isbns so we can report them later.
         begin
           [line.chomp, canonicalise_isbn(line.chomp)] unless line == "\n"
-        rescue StandardError => e
-          puts e.message
+        rescue StandardError => ex
+          puts ex.message
           [line.chomp, nil]
         end
       end
@@ -257,8 +257,8 @@ module Alexandria
           else
             bad_isbns << isbn[0]
           end
-        rescue StandardError => e
-          puts e.message
+        rescue StandardError => ex
+          puts ex.message
           failed_lookup_isbns << isbn[1]
           puts "NOTE : ignoring on_error_cb #{on_error_cb}"
           # return nil unless

data/lib/alexandria/import_library_csv.rb

@@ -20,10 +20,10 @@
 # New CSV import code taken from Palatina and modified for
 # Alexandria. (29 Apr 2010)
 
-require 'csv'
-require 'date'
-require 'htmlentities'
-require 'tempfile'
+require "csv"
+require "date"
+require "htmlentities"
+require "tempfile"
 
 module Alexandria
   class CSVImport
@@ -47,21 +47,21 @@ module Alexandria
   class GoodreadsCSVImport < CSVImport
     def initialize(header)
       super(header)
-      @title = index_of('Title')
-      @author = index_of('Author')
-      @additional_authors = index_of('Additional Authors')
-      @isbn = index_of('ISBN')
-      @publisher = index_of('Publisher')
-      @publishing_year = index_of('Year Published')
-      @edition = index_of('Binding')
+      @title = index_of("Title")
+      @author = index_of("Author")
+      @additional_authors = index_of("Additional Authors")
+      @isbn = index_of("ISBN")
+      @publisher = index_of("Publisher")
+      @publishing_year = index_of("Year Published")
+      @edition = index_of("Binding")
 
       # optional extras
-      @notes = index_of('Private Notes')
-      @rating = index_of('My Rating')
-      @read_count = index_of('Read Count')
-      @date_read = index_of('Date Read')
-      @bookshelves = index_of('Bookshelves') # save names as tags
-      @mainshelf = index_of('Exclusive Shelf')
+      @notes = index_of("Private Notes")
+      @rating = index_of("My Rating")
+      @read_count = index_of("Read Count")
+      @date_read = index_of("Date Read")
+      @bookshelves = index_of("Bookshelves") # save names as tags
+      @mainshelf = index_of("Exclusive Shelf")
     end
 
     def row_to_book(row)
@@ -69,7 +69,7 @@ module Alexandria
       authors = []
       authors << normalize(row[@author])
       additional = row[@additional_authors]
-      additional.split(',').each do |add|
+      additional.split(",").each do |add|
         authors << normalize(add)
       end
       isbn = row[@isbn] # TODO: canonicalize_ean...
@@ -90,25 +90,25 @@ module Alexandria
         book.redd = true if count > 0
       end
       if row[@date_read]
-        date = Date.strptime(str, '%d/%m/%y') # e.g. "14/01/10" => 2010-01-14
+        date = Date.strptime(str, "%d/%m/%y") # e.g. "14/01/10" => 2010-01-14
         book.redd_when = date
         book.redd = true
       end
       if row[@mainshelf]
-        if row[@mainshelf] == 'read'
+        if row[@mainshelf] == "read"
           book.redd = true
-        elsif row[@mainshelf] == 'to-read'
+        elsif row[@mainshelf] == "to-read"
           book.redd = false
-          book.tags = ['to read']
-        elsif row[@mainshelf] == 'currently-reading'
+          book.tags = ["to read"]
+        elsif row[@mainshelf] == "currently-reading"
           book.redd = false
-          book.tags = ['currently reading']
+          book.tags = ["currently reading"]
         end
       end
       if row[@bookshelves]
         shelves = normalize(row[@bookshelves]).split
         shelves.each do |shelf|
-          tag = shelf.tr('-', ' ')
+          tag = shelf.tr("-", " ")
           book.tags << tag unless book.tags.include? tag
         end
       end
@@ -148,8 +148,8 @@ module Alexandria
       publisher = publisher_info
       publisher = Regexp.last_match[1] if publisher_info =~ /([^\(]+)\(/
       edition = publisher_info # binding
-      edition_info = publisher_info.split(',')
-      edition = publisher_info.split(',')[-2] if edition_info.size >= 3
+      edition_info = publisher_info.split(",")
+      edition = publisher_info.split(",")[-2] if edition_info.size >= 3
 
       year = row[@publishing_year].to_i
 
@@ -163,7 +163,7 @@ module Alexandria
 
       book.rating = row[@rating].to_i if row[@rating]
       if row[@tags]
-        tags = normalize(row[@tags]).split(',')
+        tags = normalize(row[@tags]).split(",")
         tags.each do |tag|
           book.tags << tag unless book.tags.include? tag
         end
@@ -186,7 +186,7 @@ module Alexandria
         if head == "'PUBLICATION INFO'"
           is_librarything = true
           break
-        elsif head == 'Year Published'
+        elsif head == "Year Published"
           is_goodreads = true
           break
         end
@@ -196,7 +196,7 @@ module Alexandria
       elsif is_goodreads
         return GoodreadsCSVImport.new(header)
       end
-      raise 'Not Recognized' unless is_librarything || is_goodreads
+      raise "Not Recognized" unless is_librarything || is_goodreads
     end
   end
 end

data/lib/alexandria/library_collection.rb

@@ -4,8 +4,8 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'observer'
-require 'singleton'
+require "observer"
+require "singleton"
 
 module Alexandria
   class LibraryCollection
@@ -22,11 +22,11 @@ module Alexandria
 
       ruined = []
       deleted = []
-      all_regular_libraries.each { |library|
+      all_regular_libraries.each do |library|
         ruined += library.ruined_books
         # make deleted books from each library accessible so we don't crash on smart libraries
         deleted += library.deleted_books
-      }
+      end
       @ruined_books = ruined
       @deleted_books = deleted
     end

data/lib/alexandria/library_sort_order.rb

@@ -36,7 +36,7 @@ module Alexandria
       end
 
       def to_s
-        'default order'
+        "default order"
       end
     end
   end

data/lib/alexandria/library_store.rb

@@ -9,10 +9,10 @@ module Alexandria
     include Logging
 
     FIX_BIGNUM_REGEX =
-      /loaned_since:\s*(\!ruby\/object\:Bignum\s*)?(\d+)\n/.freeze
+      %r{loaned_since:\s*(\!ruby/object\:Bignum\s*)?(\d+)\n}.freeze
 
     include GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     def initialize(dir)
       @dir = dir
@@ -23,7 +23,7 @@ module Alexandria
       begin
         Dir.entries(library_dir).each do |file|
           # Skip hidden files.
-          next if file =~ /^\./
+          next if /^\./.match?(file)
           # Skip non-directory files.
           next unless File.stat(File.join(library_dir, file)).directory?
 
@@ -34,7 +34,7 @@ module Alexandria
       end
       # Create the default library if there is no library yet.
 
-      a << load_library(_('My Library')) if a.empty?
+      a << load_library(_("My Library")) if a.empty?
 
       a
     end
@@ -45,7 +45,7 @@ module Alexandria
       library = Library.new(name, self)
       FileUtils.mkdir_p(library.path) unless File.exist?(library.path)
       Dir.chdir(library.path) do
-        Dir['*' + Library::EXT[:book]].each do |filename|
+        Dir["*" + Library::EXT[:book]].each do |filename|
           test[1] = filename if (test[0]).zero?
 
           unless File.size? test[1]
@@ -111,21 +111,21 @@ module Alexandria
         # '_medium.jpg' have been deprecated for a single medium
         # cover file named '.cover'.
 
-        Dir['*' + '_medium.jpg'].each do |medium_cover|
+        Dir["*" + "_medium.jpg"].each do |medium_cover|
           FileUtils.mv(medium_cover,
                        medium_cover.sub(/_medium\.jpg$/,
                                         Library::EXT[:cover]))
         end
 
-        Dir['*' + Library::EXT[:cover]].each do |cover|
-          next if cover[0] == 'g'
+        Dir["*" + Library::EXT[:cover]].each do |cover|
+          next if cover[0] == "g"
 
           md = /(.+)\.cover/.match(cover)
           ean = Library.canonicalise_ean(md[1]) || md[1]
           FileUtils.mv(cover, ean + Library::EXT[:cover]) unless cover == ean + Library::EXT[:cover]
         end
 
-        FileUtils.rm_f(Dir['*_small.jpg'])
+        FileUtils.rm_f(Dir["*_small.jpg"])
       end
       library.ruined_books = ruined_books
 
@@ -137,7 +137,7 @@ module Alexandria
       begin
         # Deserialize smart libraries.
         Dir.chdir(smart_library_dir) do
-          Dir['*' + SmartLibrary::EXT].each do |filename|
+          Dir["*" + SmartLibrary::EXT].each do |filename|
             # Skip non-regular files.
             next unless File.stat(filename).file?
 
@@ -164,7 +164,7 @@ module Alexandria
     end
 
     def smart_library_dir
-      File.join(@dir, '.smart_libraries')
+      File.join(@dir, ".smart_libraries")
     end
 
     private
@@ -177,9 +177,9 @@ module Alexandria
 
       # The string is removed on load, but can't make it stick, maybe has to do with cache
 
-      if text =~ /!str:Amazon::Search::Response/
+      if /!str:Amazon::Search::Response/.match?(text)
         log.debug { "Removing Ruby/Amazon strings from #{name}" }
-        text.gsub!('!str:Amazon::Search::Response', '')
+        text.gsub!("!str:Amazon::Search::Response", "")
       end
 
       # Backward compatibility with versions <= 0.6.0, where the
@@ -187,7 +187,7 @@ module Alexandria
       if (md = FIX_BIGNUM_REGEX.match(text))
         new_yaml = Time.at(md[2].to_i).to_yaml
         # Remove the "---" prefix.
-        new_yaml.sub!(/^\s*\-+\s*/, '')
+        new_yaml.sub!(/^\s*\-+\s*/, "")
         text.sub!(md[0], "loaned_since: #{new_yaml}\n")
       end