alexandria-book-collection-manager 0.7.9 → 0.7.11

data/doc/dependency_decisions.yml

@@ -1,80 +1,86 @@
 ---
 - - :permit
   - LGPL-3+
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2017-07-23 05:51:53.629753437 Z
 - - :permit
   - LGPL-2.1+
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2017-07-23 05:52:02.088395832 Z
 - - :permit
   - MIT
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2017-07-23 05:52:06.806192042 Z
 - - :permit
   - LGPLv2+
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2017-07-23 05:52:24.618189811 Z
 - - :permit
   - ruby
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2017-07-23 05:52:36.986497403 Z
 - - :approve
   - alexandria-book-collection-manager
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2017-07-23 05:53:02.657760962 Z
 - - :approve
   - unf
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2017-07-23 05:54:45.171526986 Z
 - - :approve
   - gettext
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2017-07-23 05:54:51.349832715 Z
 - - :approve
   - cairo
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2017-07-23 05:54:54.822319735 Z
 - - :license
   - zoom
   - LGPL-2.1
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2020-07-30 06:44:22.960902375 Z
 - - :permit
   - Simplified BSD
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2020-07-30 06:45:58.599399721 Z
 - - :permit
   - Apache 2.0
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2020-07-30 06:46:08.280121582 Z
 - - :permit
   - LGPL-2.1
-  - :who: 
-    :why: 
+  - :who:
+    :why:
     :versions: []
     :when: 2020-07-30 06:46:32.729325577 Z
+- - :permit
+  - LGPL-2.1-or-later
+  - :who:
+    :why:
+    :versions: []
+    :when: 2025-04-19 19:30:36.770204331 Z

data/{bin → exe}/alexandria

@@ -8,16 +8,14 @@
 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]"
   opts.on("-l", "--list", "List libraries in numbered format") do
-    puts Alexandria.list_books_on_console
+    puts Alexandria::Console.list_books_on_console
     exit
   end
   opts.on("-d", "--debug", "Run in debug mode") do

data/lib/alexandria/about.rb

@@ -23,6 +23,7 @@ module Alexandria
   TITLE = "Alexandria"
   TEXTDOMAIN = "alexandria"
   extend GetText
+
   bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
   DESCRIPTION = _("A program to help you manage your book collection.")
   COPYRIGHT = "Copyright (C) 2004-2006 Laurent Sansonetti\n" \

data/lib/alexandria/book_providers/bl_provider.rb

@@ -22,6 +22,7 @@ module Alexandria
       unabstract
 
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize
@@ -34,10 +35,7 @@ module Alexandria
         prefs.read
       end
 
-      def url(book)
-        "http://copac.ac.uk/openurl?isbn=" + Library.canonicalise_isbn(book.isbn)
-      rescue StandardError => ex
-        log.warn { "Cannot create url for book #{book}; #{ex.message}" }
+      def url(_book)
         nil
       end
 
@@ -76,8 +74,8 @@ module Alexandria
           end
 
           if title # and !authors.empty?
-            book = Book.new(title, authors, isbn, (publisher || nil),
-                            (publish_year || nil), (edition || nil))
+            book = Book.new(title, authors, isbn, publisher || nil,
+                            publish_year || nil, edition || nil)
             results << [book]
           end
         end

data/lib/alexandria/book_providers/{douban.rb → douban_provider.rb}

@@ -9,7 +9,7 @@
 
 # Author: Sun Ning <classicning@gmail.com>, http://sunng.info/
 
-require "cgi"
+require "cgi/escape"
 require "alexandria/net"
 require "yaml"
 

data/lib/alexandria/book_providers/loc_provider.rb

@@ -13,6 +13,7 @@ module Alexandria
       unabstract
 
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize
@@ -25,12 +26,7 @@ module Alexandria
         prefs.read
       end
 
-      def url(book)
-        isbn = Library.canonicalise_isbn(book.isbn)
-        "http://catalog.loc.gov/cgi-bin/Pwebrecon.cgi?" \
-          "DB=local&CNT=25+records+per+page&CMD=isbn+#{isbn}"
-      rescue StandardError => ex
-        log.warn { "Cannot create url for book #{book}; #{ex.message}" }
+      def url(_book)
         nil
       end
     end

data/lib/alexandria/book_providers/sbn_provider.rb

@@ -14,6 +14,7 @@ module Alexandria
       unabstract
 
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize
@@ -27,18 +28,7 @@ module Alexandria
         prefs.read
       end
 
-      def url(book)
-        "http://sbnonline.sbn.it/cgi-bin/zgw/BRIEF.pl?displayquery=" \
-        "%253CB%253E%253Cfont%2520color%253D%2523000064%253E" \
-        "Codice%2520ISBN%253C%2FB%253E%253C%2Ffont%253E%2520" \
-        "contiene%2520%2522%2520%253CFONT%2520COLOR%253Dred%253E" +
-          canonicalise_isbn_with_dashes(book.isbn) +
-          "%253C%2FFONT%253E%2522&session=&zurl=opac" \
-          "&zquery=%281%3D7+4%3D2+2%3D3+5%3D100+6%3D1+3%3D3+%22" +
-          canonicalise_isbn_with_dashes(book.isbn) +
-          "%22%29&language=it&maxentries=10&target=0&position=1"
-      rescue StandardError => ex
-        log.warn { "Cannot create url for book #{book}; #{ex.message}" }
+      def url(_book)
         nil
       end
 

data/lib/alexandria/book_providers/thalia_provider.rb

@@ -11,8 +11,8 @@
 # for Alexandria. (21 Dec 2009)
 
 require "net/http"
-require "cgi"
-require "alexandria/book_providers/web"
+require "cgi/escape"
+require "alexandria/book_providers/website_based_provider"
 
 module Alexandria
   class BookProviders
@@ -20,7 +20,7 @@ module Alexandria
       include Logging
 
       SITE = "https://www.thalia.de"
-      BASE_SEARCH_URL = "#{SITE}/shop/bde_bu_hg_startseite/suche/?%s=%s" # type,term
+      BASE_SEARCH_URL = "#{SITE}/shop/bde_bu_hg_startseite/suche/?%s=%s".freeze # type,term
 
       def initialize
         super("Thalia", "Thalia (Germany)")
@@ -116,10 +116,9 @@ module Alexandria
             title = div["data-titel"]
 
             if (author_p = doc % "p.aim-author")
-              authors = []
               author_links = author_p / :a
-              author_links.each do |a|
-                authors << a.inner_text.strip
+              authors = author_links.map do |a|
+                a.inner_text.strip
               end
             end
 

data/lib/alexandria/book_providers/{web.rb → website_based_provider.rb}

@@ -4,6 +4,25 @@
 #
 # See the file README.md for authorship and licensing information.
 
+# By default, Nokogiri will configure libxml2 to use Ruby's memory
+# management functions. This leads to the following sequence of events:
+#
+# - GC starts
+# - Ruby/GNOME traverses the known GObject objects
+# - Ruby/GNOME fetches properties for all objects
+# - One of the properties (I do not know which one) gets initialized to its default value
+# - As part of this process some SVG is parsed
+# - Do do this, some memory needs to be allocated
+# - Ruby does not want memory to be allocated during GC
+# - The process crashes
+#
+# To avoid this, before loading nokogiri, set an environment variable that
+# tells Nokogiri to leave libxml2's memory management alone.
+#
+# See https://github.com/sparklemotion/nokogiri/blob/main/adr/2023-04-libxml-memory-management.md
+#
+ENV["NOKOGIRI_LIBXML_MEMORY_MANAGEMENT"] = "default"
+
 require "nokogiri"
 require "htmlentities"
 
@@ -11,7 +30,7 @@ module Alexandria
   class BookProviders
     class WebsiteBasedProvider < GenericProvider
       def initialize(name, fullname = nil)
-        super(name, fullname)
+        super
         @htmlentities = HTMLEntities.new
       end
 

data/lib/alexandria/book_providers/{worldcat.rb → world_cat_provider.rb}

@@ -3,7 +3,6 @@
 # This file is part of Alexandria.
 #
 # See the file README.md for authorship and licensing information.
-# frozen_string_literal: true
 
 # http://en.wikipedia.org/wiki/WorldCat
 # See http://www.oclc.org/worldcat/policies/terms/
@@ -15,9 +14,9 @@
 # Updated from Palatina, to reflect changes in the worldcat website.
 # (1 Sep 2009)
 
-require "cgi"
+require "cgi/escape"
 require "alexandria/net"
-require "alexandria/book_providers/web"
+require "alexandria/book_providers/website_based_provider"
 
 module Alexandria
   class BookProviders
@@ -25,7 +24,7 @@ module Alexandria
       include Logging
 
       SITE = "https://www.worldcat.org"
-      BASE_SEARCH_URL = "#{SITE}/search?q=%s%s&qt=advanced" # type, term
+      BASE_SEARCH_URL = "#{SITE}/search?q=%s%s&qt=advanced".freeze # type, term
 
       def initialize
         super("WorldCat", "WorldCat")

data/lib/alexandria/book_providers/z3950_provider.rb

@@ -5,7 +5,7 @@
 # See the file README.md for authorship and licensing information.
 
 require "zoom"
-require "alexandria/book_providers/pseudomarc"
+require "alexandria/pseudo_marc_parser"
 require "marc"
 
 module Alexandria
@@ -13,6 +13,7 @@ module Alexandria
     class Z3950Provider < AbstractProvider
       include Logging
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(name = "Z3950", fullname = "Z39.50")
@@ -80,19 +81,7 @@ module Alexandria
       end
 
       def marc_to_book(marc_txt, isbn)
-        begin
-          marc = MARC::Record.new_from_marc(marc_txt, forgiving: true)
-        rescue StandardError => ex
-          log.error { ex.message }
-          log.error { ex.backtrace.join("> \n") }
-          begin
-            marc = MARC::Record.new(marc_txt)
-          rescue StandardError => ex
-            log.error { ex.message }
-            log.error { ex.backtrace.join("> \n") }
-            raise ex
-          end
-        end
+        marc = MARC::Record.new_from_marc(marc_txt, forgiving: true)
 
         log.debug do
           msg = "Parsing MARC"
@@ -112,9 +101,9 @@ module Alexandria
 
         Book.new(marc.title, marc.authors,
                  isbn,
-                 (marc.publisher || ""),
+                 marc.publisher || "",
                  marc.respond_to?(:publish_year) ? marc.publish_year.to_i : nil,
-                 (marc.edition || ""))
+                 marc.edition || "")
       end
 
       def books_from_marc(resultset, isbn)
@@ -151,19 +140,11 @@ module Alexandria
       end
 
       def search_records(criterion, type, conn_count)
-        options = {}
-        unless prefs["username"].empty? || prefs["password"].empty?
-          options["user"] = prefs["username"]
-          options["password"] = prefs["password"]
-        end
-        hostname = prefs["hostname"]
-        port = prefs["port"].to_i
-        log.debug { "hostname #{hostname} port #{port} options #{options}" }
-        conn = ZOOM::Connection.new(options).connect(hostname, port)
+        conn = connect_to_server
         conn.database_name = prefs["database"]
-
         conn.preferred_record_syntax = prefs["record_syntax"]
         conn.element_set_name = "F"
+
         conn.count = conn_count
         attr = case type
                when SEARCH_BY_ISBN     then [7]
@@ -183,7 +164,7 @@ module Alexandria
           end
           conn.search(pqf)
         rescue StandardError => ex
-          if /1005/.match?(ex.message) &&
+          if ex.message.include?("1005") &&
               prefs.variable_named("piggyback") && prefs["piggyback"]
             log.error { "Z39.50 search failed:: #{ex.message}" }
             log.info { "Turning off piggybacking for this provider" }
@@ -194,6 +175,23 @@ module Alexandria
           raise ex
         end
       end
+
+      def connect_to_server
+        options = {}
+        unless prefs["username"].empty? || prefs["password"].empty?
+          options["user"] = prefs["username"]
+          options["password"] = prefs["password"]
+        end
+        hostname = prefs["hostname"]
+        port = prefs["port"].to_i
+        log.debug { "hostname #{hostname} port #{port} options #{options}" }
+
+        ZOOM::Connection.new(options).connect(hostname, port)
+      rescue RuntimeError => ex
+        raise ConnectionError if ex.message.include?("10007")
+
+        raise ex
+      end
     end
   end
 end

data/lib/alexandria/book_providers.rb

@@ -29,6 +29,7 @@ module Alexandria
     include Singleton
     include Observable
     include GetText
+
     GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     SEARCH_BY_ISBN, SEARCH_BY_TITLE, SEARCH_BY_AUTHORS,
@@ -36,6 +37,8 @@ module Alexandria
 
     class SearchError < StandardError; end
 
+    class ConnectionError < SearchError; end
+
     class NoResultsError < SearchError; end
 
     class TooManyResultsError < SearchError; end
@@ -138,7 +141,6 @@ module Alexandria
 
         def initialize(provider, name, description, default_value,
                        possible_values = nil, mandatory = true)
-
           @provider = provider
           @name = name
           @description = description
@@ -166,17 +168,17 @@ module Alexandria
         end
       end
 
-      def add(*args)
-        self << Variable.new(@provider, *args)
+      def add(*)
+        self << Variable.new(@provider, *)
       end
 
       def [](obj)
         case obj
         when String
           var = variable_named(obj)
-          var ? var.value : nil
+          var&.value
         when Integer
-          super(obj)
+          super
         end
       end
 
@@ -195,12 +197,13 @@ module Alexandria
 
     class AbstractProvider
       include GetText
+
       attr_reader :prefs
       attr_accessor :name, :fullname
 
       def initialize(name, fullname = nil)
         @name = name
-        @fullname = (fullname || name)
+        @fullname = fullname || name
         @prefs = Preferences.new(self)
         @prefs.add("enabled", _("Enabled"), true, [true, false])
       end
@@ -277,6 +280,7 @@ module Alexandria
       # FIXME: Clean up this complex abstract/concrete class system
       def self.unabstract
         include Singleton
+
         undef_method :reinitialize
         undef_method :name=
         undef_method :fullname=
@@ -288,11 +292,11 @@ module Alexandria
       unabstract
     end
 
-    require "alexandria/book_providers/douban" # only requires YAML
+    require "alexandria/book_providers/douban_provider"
 
     # Website based providers
     require "alexandria/book_providers/thalia_provider"
-    require "alexandria/book_providers/worldcat"
+    require "alexandria/book_providers/world_cat_provider"
 
     # Z39.50 based providers
     require "alexandria/book_providers/loc_provider"
@@ -351,7 +355,7 @@ module Alexandria
       end
       clear
       rejig_providers_priority
-      priority = (@prefs.providers_priority || [])
+      priority = @prefs.providers_priority || []
       priority.map!(&:strip)
       rest = providers.keys - priority
       priority.each { |pname| self << providers[pname] }
@@ -370,7 +374,7 @@ module Alexandria
     private
 
     def rejig_providers_priority
-      priority = (@prefs.providers_priority || [])
+      priority = @prefs.providers_priority || []
       return if priority.empty?
 
       changed = false

data/lib/alexandria/config.rb

@@ -3,8 +3,8 @@
 module Alexandria
   module Config
     SHARE_DIR = File.expand_path("../../share", File.dirname(__FILE__))
-    SOUNDS_DIR = "#{SHARE_DIR}/sounds/alexandria"
-    DATA_DIR = "#{SHARE_DIR}/alexandria"
+    SOUNDS_DIR = "#{SHARE_DIR}/sounds/alexandria".freeze
+    DATA_DIR = "#{SHARE_DIR}/alexandria".freeze
     MAIN_DATA_DIR = DATA_DIR
   end
 end

data/lib/alexandria/console.rb

@@ -5,16 +5,18 @@
 # See the file README.md for authorship and licensing information.
 
 module Alexandria
-  def self.list_books_on_console(_title = true, authors = true)
-    collection = Alexandria::LibraryCollection.instance
-    collection.reload
-    libraries = collection.all_regular_libraries
-    output_string = ""
-    @books = libraries.flatten
-    @books.each do |book|
-      book_authors = book.authors.join(" & ") if authors
-      output_string += [book.title, book_authors].join(", ") + "\n"
+  module Console
+    def self.list_books_on_console
+      collection = Alexandria::LibraryCollection.instance
+      collection.reload
+      libraries = collection.all_regular_libraries
+      output_string = ""
+      @books = libraries.flatten
+      @books.each do |book|
+        book_authors = book.authors.join(" & ")
+        output_string += [book.title, book_authors].join(", ") + "\n"
+      end
+      output_string
     end
-    output_string
   end
 end

data/lib/alexandria/export_format.rb

@@ -11,6 +11,7 @@ module Alexandria
     include GetText
     include Logging
     extend GetText
+
     bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     def self.all
@@ -25,10 +26,10 @@ module Alexandria
       ]
     end
 
-    def invoke(library, sort_order, filename, *args)
+    def invoke(library, sort_order, filename, *)
       sorted = ExportLibrary.new(library, sort_order)
       log.debug { "Exporting library sorted by #{sort_order}" }
-      sorted.send(@message, filename, *args)
+      sorted.send(@message, filename, *)
     end
 
     def needs_preview?