alexandria-book-collection-manager 0.7.2 → 0.7.3

data/TODO.md

@@ -1,7 +1,15 @@
 Alexandria's TODO list
 ======================
 
-This is an old list of TODO's.
+## New TODOs
+
+* [ ] Clean up broken providers
+* [ ] Add openlibrary provider
+* [ ] Allow searching for cover image for existing books
+
+## Old TODOs
+
+This is an old list of TODO's that should be cleaned up.
 
 For the next release:
 

data/alexandria-book-collection-manager.gemspec

@@ -45,14 +45,15 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--main', 'README.md']
 
   s.add_runtime_dependency('gettext', ['~> 3.1'])
-  s.add_runtime_dependency('gstreamer', ['3.2.1'])
-  s.add_runtime_dependency('gtk3', ['3.2.1'])
+  s.add_runtime_dependency('gstreamer', ['~> 3.3.0'])
+  s.add_runtime_dependency('gtk3', ['~> 3.3.0'])
   s.add_runtime_dependency('hpricot', ['~> 0.8.5'])
   s.add_runtime_dependency('htmlentities', ['~> 4.3'])
-  s.add_runtime_dependency('image_size', ['~> 1.5.0'])
+  s.add_runtime_dependency('image_size', ['~> 2.0'])
   s.add_runtime_dependency('marc', ['~> 1.0.0'])
   s.add_runtime_dependency('zoom', ['~> 0.5.0'])
 
+  s.add_development_dependency('gnome_app_driver', ['~> 0.2.1'])
   s.add_development_dependency('minitest', ['~> 5.0'])
   s.add_development_dependency('rake', ['~> 12.0'])
   s.add_development_dependency('rspec', ['~> 3.0'])

data/bin/alexandria

@@ -1,31 +1,18 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2007, 2008 Joseph Method
-# Copyright (C) 2007, 2009 Cathal Mc Ginley
-# Copyright (C) 2014, 2015 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# 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
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
 require 'gettext'
 require 'alexandria'
 require 'optparse'
 require 'ostruct'
 
+store = Alexandria::LibraryStore.new(Alexandria::Library::DEFAULT_DIR)
+Alexandria::LibraryCollection.instance.library_store = store
+
 # options = OpenStruct.new
 OptionParser.new do |opts|
   opts.banner = 'Usage: alexandria [options]'
@@ -58,21 +45,21 @@ end.parse!
 
 begin
   Alexandria.main
-rescue => e
-  warn <<EOS
------------------------
-Alexandria just crashed
------------------------
-Timestamp: #{Time.now}
-Message: #{e.message}
-Backtrace:
-#{e.backtrace.join("\n")}
-Release: #{Alexandria::VERSION}(#{Alexandria::DISPLAY_VERSION})
-Uname -a: #{`uname -a`.chomp}
---
-Please report this dump to '#{Alexandria::BUGREPORT_URL}' with some additional
-information, such as the description of the crash and the steps to reproduce it
-(if it's possible).
-EOS
+rescue StandardError => e
+  warn <<~EOS
+    -----------------------
+    Alexandria just crashed
+    -----------------------
+    Timestamp: #{Time.now}
+    Message: #{e.message}
+    Backtrace:
+    #{e.backtrace.join("\n")}
+    Release: #{Alexandria::VERSION}(#{Alexandria::DISPLAY_VERSION})
+    Uname -a: #{`uname -a`.chomp}
+    --
+    Please report this dump to '#{Alexandria::BUGREPORT_URL}' with some additional
+    information, such as the description of the crash and the steps to reproduce it
+    (if it's possible).
+  EOS
   exit 1
 end

data/doc/FAQ

@@ -159,8 +159,6 @@ for public libraries, and very unlikely for commercial booksellers.
 It is useful if you choose a provider that allows to specify the ISBN in 
 the address, such as 
 http://www.internetbookshop.it/ame/ser/serdsp.asp?e=0060748222&shop=1
-or
-http://www.deastore.com/product.asp?isbn=9780060748227
 
 It is necessary that the HTML page of each provider is easily parsable, 
 that is, that the computer can easily find title, author(s), ISBN, 
@@ -184,8 +182,7 @@ information: title, author(s), ISBN, publisher, year of publication,
 binding. In case that one of these is missing, Alexandria will not get 
 it.
 
-It is easier, if the provider doesn't use cookies (however, provider
-Deastore uses cookies and has been implemented).
+It is easier, if the provider doesn't use cookies.
 
 After the choice of the provider, try by yourself to modify the file for 
 an already implemented provider. Probably it may be only required that 
@@ -293,7 +290,7 @@ Question: I prefer to have the field "Author" as "Surname, Name" instead
 of "Name Surname".
 
 Answer: Alexandria relies on what the providers say: 
-some providers report "Surname, Name": Deastore, Renaud, Mcu,
+some providers report "Surname, Name": Renaud,
 some "Surname Name": Webster.it, Ibs.it,
 some "Name Surname": Bn, Thalia, Bol.it, Adlibris, L Siciliano, Worldcat,
 and some without any rule: Amazon, Proxis.

data/lib/alexandria.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011, 2016 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# 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
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
 require 'gettext'
 
@@ -66,6 +52,8 @@ require 'alexandria/version'
 # end
 
 require 'alexandria/models/book'
+require 'alexandria/library_store'
+require 'alexandria/library_collection'
 require 'alexandria/models/library'
 
 require 'alexandria/smart_library'

data/lib/alexandria/book_providers.rb

@@ -69,7 +69,7 @@ module Alexandria
           instance.notify_observers(:found, factory.fullname) # new
           return results
         end
-      rescue => boom
+      rescue StandardError => boom
         if boom.is_a? NoResultsError
           unless boom.instance_of? ProviderSkippedError
             instance.changed
@@ -289,7 +289,6 @@ module Alexandria
       unabstract
     end
 
-    require 'alexandria/book_providers/mcu' # yep, still mostly works !
     require 'alexandria/book_providers/douban' # only requires YAML
 
     # require 'alexandria/book_providers/renaud'
@@ -301,7 +300,6 @@ module Alexandria
     # Website based providers
     require 'alexandria/book_providers/adlibris'
     require 'alexandria/book_providers/barnes_and_noble'
-    require 'alexandria/book_providers/deastore'
     require 'alexandria/book_providers/proxis'
     require 'alexandria/book_providers/siciliano'
     require 'alexandria/book_providers/thalia'
@@ -328,6 +326,7 @@ module Alexandria
       self.class.constants.each do |constant|
         md = /(.+)Provider$/.match(constant)
         next unless md
+
         klass = self.class.module_eval(constant.to_s)
         if klass.ancestors.include?(AbstractProvider) &&
             (klass != GenericProvider) &&
@@ -345,11 +344,14 @@ module Alexandria
         ary.each do |name|
           md = /^(.+)_/.match(name)
           next unless md
+
           klass_name = md[1] + 'Provider'
           klass = @abstract_classes.find { |x| x.name.include?(klass_name) }
           next unless klass
+
           fullname = @prefs.send(name.downcase + '_name')
           next unless fullname
+
           instance = klass.new
           instance.name = name
           instance.fullname = fullname
@@ -388,10 +390,6 @@ module Alexandria
           priority.uniq! # remove any other "Amazon" from the list
           changed = true
         end
-        if (deastore_index = priority.index('DeaStore_it'))
-          priority[deastore_index] = 'DeaStore'
-          changed = true
-        end
         if (worldcat_index = priority.index('Worldcat'))
           priority[worldcat_index] = 'WorldCat'
           changed = true

data/lib/alexandria/book_providers/adlibris.rb

@@ -67,7 +67,7 @@ module Alexandria
       ## url
       def url(book)
         create_search_uri(SEARCH_BY_ISBN, book.isbn)
-      rescue => ex
+      rescue StandardError => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
       end
@@ -80,7 +80,7 @@ module Alexandria
         else
           (search_type_code = {
             SEARCH_BY_AUTHORS => 'author',
-            SEARCH_BY_TITLE => 'title',
+            SEARCH_BY_TITLE   => 'title',
             SEARCH_BY_KEYWORD => 'keyword'
           }[search_type]) || 'keyword'
           search_term_encoded = CGI.escape(search_term)
@@ -185,6 +185,7 @@ module Alexandria
           isbn_tds.each do |isbn_td|
             isbn = isbn_td.inner_text
             next unless isbn =~ /[0-9x]{10,13}/i
+
             isbn.gsub(/(\n|\r)/, ' ')
             isbn = Regexp.last_match[1] if isbn =~ /:[\s]*([0-9x]+)/i
             isbns << isbn
@@ -211,8 +212,9 @@ module Alexandria
           book = Book.new(title, authors, isbn, publisher, year, binding)
 
           return [book, image_url]
-        rescue => ex
+        rescue StandardError => ex
           raise ex if ex.instance_of? NoResultsError
+
           trace = ex.backtrace.join("\n> ")
           log.warn {
             'Failed parsing search results for AdLibris ' \

data/lib/alexandria/book_providers/amazon_aws.rb

@@ -169,6 +169,7 @@ module Alexandria
         results = []
         products.each do |item|
           next unless item.get('itemattributes/productgroup') == 'Book'
+
           atts = item.search_and_convert('itemattributes')
           title = normalize(atts.get('title'))
 
@@ -201,6 +202,7 @@ module Alexandria
               book = rslt[0]
               book_isbn_canon = Library.canonicalise_ean(book.isbn)
               return rslt if query_isbn_canon == book_isbn_canon
+
               log.debug { "rejected possible result #{book}" }
             end
             # gone through all and no ISBN match, so just return first result
@@ -229,7 +231,7 @@ module Alexandria
                 'http://www.amazon.com/exec/obidos/ASIN/%s'
               end
         url % isbn
-      rescue => ex
+      rescue StandardError => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
       end

data/lib/alexandria/book_providers/amazon_ecs_util.rb

@@ -80,6 +80,7 @@ module Amazon
 
     def self.configure(&_proc)
       raise ArgumentError, 'Block is required.' unless block_given?
+
       yield @@options
     end
 
@@ -123,6 +124,7 @@ module Amazon
       unless res.is_a? Net::HTTPSuccess
         raise Amazon::RequestError, "HTTP Response: #{res.code} #{res.message}"
       end
+
       Response.new(res.body)
     end
 
@@ -202,6 +204,7 @@ module Amazon
       qs = ''
       opts.each { |k, v|
         next unless v
+
         v = v.join(',') if v.is_a? Array
         qs << "&#{camelize(k.to_s)}=#{URI.encode(v.to_s)}"
       }
@@ -255,6 +258,7 @@ module Amazon
 
     def self.sign_request(request)
       raise AmazonNotConfiguredError unless @@secret_access_key
+
       # Step 0 : Split apart request string
       url_pattern = /http:\/\/([^\/]+)(\/[^\?]+)\?(.*$)/
       url_pattern =~ request
@@ -313,6 +317,7 @@ module Amazon
     def /(path)
       elements = @element / path
       return nil if elements.empty?
+
       elements
     end
 
@@ -321,8 +326,10 @@ module Amazon
     def search_and_convert(path)
       elements = self./(path)
       return unless elements
+
       elements = elements.map { |element| Element.new(element) }
       return elements.first if elements.size == 1
+
       elements
     end
 
@@ -349,6 +356,7 @@ module Amazon
     # Similar to #get, except an element object must be passed-in.
     def self.get(element, path = '')
       return unless element
+
       result = element.at(path)
       ## inner_html doesn't decode entities, hence bug #21659
       # result = result.inner_html if result

data/lib/alexandria/book_providers/barnes_and_noble.rb

@@ -57,6 +57,7 @@ module Alexandria
 
       def fetch_redirectly(uri_str, limit = 5)
         raise NoResultsError, 'HTTP redirect too deep' if limit.zero?
+
         if limit < 10
           sleep 0.1
           log.debug { "Redirectly :: #{uri_str}" }
@@ -93,7 +94,7 @@ module Alexandria
 
       def url(book)
         create_search_uri(SEARCH_BY_ISBN, book.isbn)
-      rescue => ex
+      rescue StandardError => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
       end
@@ -101,7 +102,7 @@ module Alexandria
       def create_search_uri(search_type, search_term)
         (search_type_code = {
           SEARCH_BY_AUTHORS => 'ATH',
-          SEARCH_BY_TITLE => 'TTL',
+          SEARCH_BY_TITLE   => 'TTL',
           SEARCH_BY_KEYWORD => 'WRD' # SEARCH_BY_PUBLISHER => 'PBL' # not implemented
         }[search_type]) || ''
         if search_type == SEARCH_BY_ISBN
@@ -134,7 +135,7 @@ module Alexandria
 
             book_search_results << result
           end
-        rescue => ex
+        rescue StandardError => ex
           trace = ex.backtrace.join("\n> ")
           log.warn {
             'Failed parsing search results for Barnes & Noble ' \
@@ -170,6 +171,7 @@ module Alexandria
             attrs = it.attributes
             property = attrs['property']
             next unless property
+
             case property
             when 'og:title'
               book_data[:title] = attrs['content']
@@ -191,8 +193,9 @@ module Alexandria
                           book_data[:publication_year],
                           book_data[:binding])
           return [book, book_data[:image_url]]
-        rescue => ex
+        rescue StandardError => ex
           raise ex if ex.instance_of? NoResultsError
+
           trace = ex.backtrace.join("\n> ")
           log.warn {
             'Failed parsing search results for BarnesAndNoble ' \

data/lib/alexandria/book_providers/douban.rb

@@ -115,7 +115,7 @@ module Alexandria
               book_search_results << [book, image_url]
             end
           end
-        rescue => ex
+        rescue StandardError => ex
           log.warn(ex.backtrace.join('\n'))
         end
         book_search_results

data/lib/alexandria/book_providers/proxis.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2009 Cathal Mc Ginley
-# Copyright (C) 2014-2016 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# 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
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
 # New Proxis provider, taken from Palatina MetaDataSource and modified
 # for Alexandria. (20 Dec 2009)
@@ -56,6 +42,7 @@ module Alexandria
 
         results = parse_search_result_data(html_data.body)
         raise NoResultsError if results.empty?
+
         if type == SEARCH_BY_ISBN
           get_book_from_search_result(results.first)
         else
@@ -85,18 +72,15 @@ module Alexandria
       def text_of(node)
         if node.nil?
           nil
-        else
-          if node.text?
-            node.to_html
-          elsif node.elem?
-            if node.children.nil?
-              nil
-            else
-              node_text = node.children.map { |n| text_of(n) }.join
-              node_text.strip.squeeze(' ')
-            end
+        elsif node.text?
+          node.to_html
+        elsif node.elem?
+          if node.children.nil?
+            nil
+          else
+            node_text = node.children.map { |n| text_of(n) }.join
+            node_text.strip.squeeze(' ')
           end
-          # node.inner_html.strip
         end
       end