alexandria-book-collection-manager 0.7.3 → 0.7.8

data/schemas/alexandria.schemas

@@ -203,7 +203,7 @@
         <long>Whether the publisher column should be visible in the list view.</long>
       </locale>
     </schema>
-    <schema>        
+    <schema>
       <key>/schemas/apps/alexandria/col_publish_date_visible</key>
       <applyto>/apps/alexandria/col_publish_date_visible</applyto>
       <owner>alexandria</owner>
@@ -214,6 +214,17 @@
         <long>Whether the publish date column should be visible in the list view.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/apps/alexandria/col_loaned_to_visible</key>
+      <applyto>/apps/alexandria/col_loaned_to_visible</applyto>
+      <owner>alexandria</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Loaned to visibility</short>
+        <long>Whether the loaned to column should be visible in the list view.</long>
+      </locale>
+    </schema>
     <schema>        
       <key>/schemas/apps/alexandria/col_rating_visible</key>
       <applyto>/apps/alexandria/col_rating_visible</applyto>
@@ -247,7 +258,7 @@
         <long>Whether the own column should be visible in the list view.</long>
       </locale>
     </schema>
-    <schema>        
+    <schema>
       <key>/schemas/apps/alexandria/col_want_visible</key>
       <applyto>/apps/alexandria/col_want_visible</applyto>
       <owner>alexandria</owner>
@@ -258,6 +269,17 @@
         <long>Whether the want column should be visible in the list view.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/apps/alexandria/col_tags_visible</key>
+      <applyto>/apps/alexandria/col_tags_visible</applyto>
+      <owner>alexandria</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Tags column visibility</short>
+        <long>Whether the tags column should be visible in the list view.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/apps/alexandria/cols_width</key>
       <applyto>/apps/alexandria/cols_width</applyto>

data/share/alexandria/glade/acquire_dialog__builder.glade

@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="acquire_dialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Acquire from Scanner</property>

data/share/alexandria/glade/book_properties_dialog__builder.glade

@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="book_properties_dialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>

data/share/alexandria/glade/main_app__builder.glade

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="main_app">
     <property name="can_focus">False</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="vbox1">
         <property name="visible">True</property>
@@ -135,14 +138,7 @@
                   </object>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">label</property>
-                  </object>
-                  <packing>
-                    <property name="tab_fill">False</property>
-                  </packing>
+                  <placeholder/>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow4">
@@ -165,15 +161,7 @@
                   </packing>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">label</property>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
+                  <placeholder/>
                 </child>
               </object>
               <packing>
@@ -228,8 +216,5 @@
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>

data/share/alexandria/glade/new_book_dialog__builder.glade

@@ -26,7 +26,7 @@
     </data>
   </object>
   <object class="GtkDialog" id="new_book_dialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">8</property>
     <property name="title" translatable="yes">Adding a Book</property>

data/share/alexandria/glade/preferences_dialog__builder.glade

@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="preferences_dialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Preferences</property>
     <property name="type_hint">dialog</property>

data/share/gnome/help/alexandria/C/introduction.xml

@@ -52,10 +52,6 @@
 	      <para><ulink url="http://www.internetbookshop.it">Internet Bookshop Italia</ulink></para>
 	    </listitem>
 
-	    <listitem>
-	      <para><ulink url="http://www.renaud-bray.com/">Renaud-Bray</ulink></para>
-	    </listitem>
-
 	    <listitem>
 	      <para><ulink url="http://www.loc.gov">US Library of Congress</ulink></para>
 	    </listitem>

data/share/gnome/help/alexandria/C/searching.xml

@@ -79,7 +79,7 @@
   <!-- ========= Finding out more online =========== -->
   <section id="searching-more-online">
     <title>Finding out more information about your books online</title>
-    <para>If you want to find out more information about your book, you can use &app; to open the web page of Amazon, Barnes and Noble, or one of the other online information providers and be taken directly to the relevant book. Simply select the book you wish to know more about, right-click on it, and from the menu <guimenuitem>Display Online Information</guimenuitem>, choose from either Amazon, Barnes and Nobel, Proxis, Spanish Culture Ministry, Amadeus Buch, Renaud-Bray or Internet Bookshop Italia.</para>
+    <para>If you want to find out more information about your book, you can use &app; to open the web page of Amazon, Barnes and Noble, or one of the other online information providers and be taken directly to the relevant book. Simply select the book you wish to know more about, right-click on it, and from the menu <guimenuitem>Display Online Information</guimenuitem>, choose from either Amazon, Barnes and Nobel, Proxis, Spanish Culture Ministry, Amadeus Buch or Internet Bookshop Italia.</para>
     <tip>
       <para>The <menuchoice><guimenu>Display Online Information</guimenu><guimenuitem>At Amazon</guimenuitem></menuchoice> choice will take you to the Amazon .com, .co.uk, .de, or jp site, as set up in the <xref linkend="alexandria-amazon-prefs"/>.</para>
     </tip>

data/share/gnome/help/alexandria/C/smart-libraries.xml

@@ -18,7 +18,7 @@
 
   <para>
     Smart Libraries are listed beneath the actual libraries in the
-    application side pane. They do not actually contain books, but
+    application sidepane. They do not actually contain books, but
     rather a set of rules describing which books you wish to see. The
     books from all libraries which satisfy the set of rules will be
     displayed. You cannot directly add books to a Smart Library.
@@ -58,7 +58,7 @@
     <para>
       An example will illustrate the use of Smart Libraries. Let us
       suppose you have a large collections of books by Terry
-      Practchett and you add the tag <quote>discworld</quote> to all
+      Pratchett and you add the tag <quote>discworld</quote> to all
       the books in the Discworld series. Let us create a Smart Library
       for all his non-Discworld books.
     </para>

data/share/gnome/help/alexandria/C/working-with-libraries.xml

@@ -12,7 +12,7 @@
   <para>Books stored in &app; can be grouped into different collections, called libraries. For instance, you may have
   one library for all your novels, and other for your programming manuals. &app; allows you to create, edit, and move books
   between libraries.</para>
-  <para>Available libraries are listed in the <guilabel>Library pane</guilabel> at the left of the main &app; window. If you cannot see the library pane, open it with <menuchoice><guimenu>View</guimenu><guimenuitem>Side Pane</guimenuitem></menuchoice>. You can close it again with the same menu option, or by clicking the <guibutton>Close</guibutton> icon in the top right of the library pane.</para>
+  <para>Available libraries are listed in the <guilabel>Library pane</guilabel> at the left of the main &app; window. If you cannot see the library pane, open it with <menuchoice><guimenu>View</guimenu><guimenuitem>Sidepane</guimenuitem></menuchoice>. You can close it again with the same menu option, or by clicking the <guibutton>Close</guibutton> icon in the top right of the library pane.</para>
   <figure id="library-pane-fig">
     <title>An &app; list of libraries</title>
     <screenshot>

data/share/gnome/help/alexandria/fr/alexandria.xml

@@ -1240,7 +1240,7 @@ Date : 30 décembre 2005
 		open it with 
 		<menuchoice>
 		<guimenu>View</guimenu>
-		<guimenuitem>Side Pane</guimenuitem>
+		<guimenuitem>Sidepane</guimenuitem>
 		</menuchoice>.
 		You can close it again with the same menu option, or by clicking
 		the <guibutton>Close</guibutton> icon in the top right of the 

data/share/gnome/help/alexandria/ja/introduction.xml

@@ -44,10 +44,6 @@
 	      <para><ulink url="http://www.internetbookshop.it">Internet Bookshop Italia</ulink></para>
 	    </listitem>
 
-	    <listitem>
-	      <para><ulink url="http://www.renaud-bray.com/">Renaud-Bray</ulink></para>
-	    </listitem>
-
 	    <listitem>
 	      <para><ulink url="http://www.loc.gov">米国国会図書館</ulink></para>
 	    </listitem>

data/share/gnome/help/alexandria/ja/smart-libraries.xml

@@ -44,7 +44,7 @@
     
 
     <para>
-高機能ライブラリの例を以下に示します。Terry Practchettという作者の本をたくさん持っていて、
+高機能ライブラリの例を以下に示します。Terry Pratchettという作者の本をたくさん持っていて、
 Discworldシリーズの本に<quote>discworld</quote>というタグをつけてあるとします。
 高機能ライブラリで、彼のDiscworldシリーズでない本を探してライブラリ化します。
     </para>

data/spec/alexandria/book_providers/thalia_provider_spec.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "spec_helper"
+
+RSpec.describe Alexandria::BookProviders::ThaliaProvider do
+  let(:normal_people_main) do
+    +<<~HTML
+      <!DOCTYPE html>
+      <html lang="de" data-environment="prod">
+        <head>
+          <title>Artikel von 0571334652 ansehen | Thalia</title>
+        </head>
+        <body data-mandant="2" data-version="20201112100740_528b0df" data-environment="prod">
+          <main class="suche-grid--main nur-suchergebnis">
+            <section class="suchergebnis">
+              <ul class="suchergebnis-liste no-bullets">
+                <li class="suchergebnis" data-seite="1"
+                                         data-ean="9780571334650"
+                                         data-id="134292338"
+                                         data-preis="9.49"
+                                         data-preis-reduziert="false"
+                                         data-alterpreis="">
+                  <a href="/shop/home/artikeldetails/ID134292338.html" class="layered-link">Normal People von Sally Rooney</a>
+
+                  <ul class="weitere-formate no-bullets" impression="product-variant">
+                    <li class="format aktiv">
+                      <a href="/shop/home/artikeldetails/ID134292338.html">Buch (Taschenbuch)</a>
+                    </li>
+                    <li class="format">
+                      <a href="/shop/home/artikeldetails/ID95227195.html">Weitere: Buch (Taschenbuch)</a>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </section>
+          </main>
+        </body>
+      </html>
+    HTML
+  end
+  let(:normal_people_details) do
+    +<<~HTML
+      <!DOCTYPE html>
+      <html class="no-js" id="ID-2" lang="de">
+        <head>
+          <title>Normal People von Sally Rooney - Taschenbuch - 978-0-571-33465-0 | Thalia</title>
+        </head>
+        <body>
+          <section class="artikel-medien imagesPreview">
+            <img src="https://assets.thalia.media/img/artikel/ae9934c90f2c7d595146807ea6253c99532043ec-00-00.jpeg" class='largeImg'>
+          </section>
+
+          <section class="artikel-infos" id="sbe-product-details"
+                                         data-shopid="2"
+                                         data-id="A1051452169"
+                                         data-id-alt="134292338"
+                                         data-titel="Normal People"
+                                         data-verfuegbarkeit="Sofort lieferbar"
+                                         data-preis-netto="9.02"
+                                         data-preis-brutto="9.49"
+                                         data-ean="9780571334650"
+                                         data-reduziert="false"
+                                         data-waehrung="EUR"
+                                         data-preis-liste="9.49"
+                                         data-hersteller="Faber &amp; Faber"
+                                         data-form="Taschenbuch"
+                                         data-verkaufsrang="5"
+                                         data-anzahlbewertungen="19"
+                                         data-durchschnittsbewertung="4.5"
+                                         data-preisbindung="false"
+                                         data-mandant="2"
+                                         data-environment="prod"
+                                         component="artikeldetails-produktdetails">
+
+            <h1 class="ncTitle">
+              Normal People
+            </h1>
+
+            <p class="aim-author">
+            <a href="https://www.thalia.de/shop/home/mehr-von-suche/ANY/sp/suche.html?mehrVon=Sally%20Rooney" interaction="autor-klick">Sally Rooney</a>
+            </p>
+          </section>
+
+          <section class="artikeldetails">
+            <table>
+              <tr> <th> Einband </th> <td> Taschenbuch </td> </tr>
+              <tr> <th> Erscheinungsdatum </th> <td> 02.05.2019 </td> </tr>
+              <tr> <th> ISBN </th> <td> 978-0-571-33465-0 </td> </tr>
+            </table>
+            <table>
+              <tr>
+                <th> Verlag </th>
+                <td>
+                  <a href="https://www.thalia.de/shop/home/mehr-von-suche/ANY/sv/suche.html?mehrVon=Faber%20%26%20Faber" interaction="auswahl">
+                    Faber &amp; Faber
+                  </a>
+                </td>
+              </tr>
+            </table>
+          </section>
+        </body>
+      </html>
+    HTML
+  end
+
+  it "works when searching by ISBN" do
+    stub_request(:get,
+                 "https://www.thalia.de/shop/bde_bu_hg_startseite/suche/?sq=0571334652")
+      .to_return(status: 200, body: normal_people_main, headers: {})
+    stub_request(:get, "https://www.thalia.de/shop/home/artikeldetails/ID134292338.html")
+      .to_return(status: 200, body: normal_people_details, headers: {})
+
+    assert_correct_search_result(described_class, "9780571334650")
+  end
+end

data/spec/alexandria/book_providers/world_cat_provider_spec.rb

@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "spec_helper"
+
+RSpec.describe Alexandria::BookProviders::WorldCatProvider do
+  let(:sky_catalog_main) do
+    <<~XHTML
+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+        <head></head>
+        <body id="worldcat">
+          <table class="table-results">
+            <tr class="menuElem">
+              <td class="result details">
+                <div class="name">
+                  <a id="result-1" href="/title/sky-catalogue-20000-ed-by-alan-hirshfeld-and-roger-w-sinnott/oclc/476534140&referer=brief_results"><strong>Sky catalogue 2000.0 ed. by Alan Hirshfeld and Roger W. Sinnott</strong></a>
+                </div>
+                <div class="type">
+                  <img class='icn' src='https://static1.worldcat.org/wcpa/rel20201014/images/icon-bks.gif' alt=' ' height='16' width='16' />&nbsp;<span class='itemType'>Print book</span>
+                </div>
+              </td>
+            </tr>
+            <tr class="menuElem">
+              <td class="result details">
+                <div class="name">
+                  <a id="result-2" href="/title/sky-catalogue-20000/oclc/7978015&referer=brief_results"><strong>Sky catalogue 2000.0</strong></a>
+                </div>
+                <div class="type">
+                  <img class='icn' src='https://static1.worldcat.org/wcpa/rel20201014/images/icon-bks.gif' alt=' ' height='16' width='16' />&nbsp;<span class='itemType'>Print book</span>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </body>
+      </html>
+    XHTML
+  end
+
+  let(:sky_catalog_details) do
+    <<~XHTML
+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+        <head></head>
+        <body id="worldcat">
+          <div id="bibdata">
+            <h1 class="title">Sky catalogue 2000.0 ed. by Alan Hirshfeld and Roger W. Sinnott</h1>
+            <table border="0" cellspacing="0" cellpadding="0">
+              <tr id="bib-author-row">
+                <th>Author:</th>
+                <td id="bib-author-cell">
+                  <a href='/search?q=au%3AHirshfeld+Alan&amp;qt=hot_author' title='Search for more by this author'>Hirshfeld Alan</a>;
+                  <a href='/search?q=au%3ASinnott+Roger+W.&amp;qt=hot_author' title='Search for more by this author'>Sinnott Roger W.</a>;
+                  <a href='/search?q=au%3ACambridge+Cambridge+University+Press+1982-&amp;qt=hot_author' title='Search for more by this author'>Cambridge Cambridge University Press 1982-</a>
+                </td>
+              </tr>
+              <tr id="bib-publisher-row">
+                <th>Publisher:</th>
+                <td id="bib-publisher-cell">1982</td>
+              </tr>
+            </table>
+          </div>
+          <table border="0" cellspacing="0">
+            <tr id="details-allauthors">
+              <th>All Authors / Contributors:</th>
+              <td>
+                <a href='/search?q=au%3AHirshfeld+Alan&amp;qt=hot_author' title='Search for more by this author'>Hirshfeld Alan</a>;
+                <a href='/search?q=au%3ASinnott+Roger+W.&amp;qt=hot_author' title='Search for more by this author'>Sinnott Roger W.</a>;
+                <a href='/search?q=au%3ACambridge+Cambridge+University+Press+1982-&amp;qt=hot_author' title='Search for more by this author'>Cambridge Cambridge University Press 1982-</a>
+              </td>
+            </tr>
+            <tr id="details-standardno">
+              <th>ISBN:</th>
+              <td>0521247101 9780521247108 0521289130 9780521289139 0521258189 9780521258180</td>
+            </tr>
+          </table>
+        </body>
+      </html>
+    XHTML
+  end
+
+  let(:florence_ru_details) do
+    <<~XHTML
+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+        <head></head>
+        <body id="worldcat">
+          <div id="bibdata">
+            <h1 class="title">
+              <div class="vernacular" lang="ru">Флоренс Аравийская : роман /</div>
+              Florens Araviĭskai︠a︡ : roman
+            </h1>
+            <table border="0" cellspacing="0" cellpadding="0">
+              <tr id="bib-author-row">
+                <th>Author:</th>
+                <td id="bib-author-cell">
+                  <span class="vernacular" lang="ru">Кристофер Бакли ; перевод с английского Андрея Геласимова.</span>
+                  <span class="vernacular" lang="ru">Геласимов, Андрей.</span> ;
+                  <a href="/search?q=au%3ABuckley%2C+Christopher%2C&amp;qt=hot_author" title="Search for more by this author">Christopher Buckley</a>;
+                  <a href="/search?q=au%3AGelasimov%2C+Andrei%CC%86.&amp;qt=hot_author" title="Search for more by this author">Andreĭ Gelasimov</a>
+                </td>
+              </tr>
+              <tr id="bib-publisher-row">
+                <th>Publisher:</th>
+                <td id="bib-publisher-cell"><span class="vernacular" lang="ru">Иностранка,</span>
+                  Moskva : Inostranka, 2006.
+                </td>
+              </tr>
+            </table>
+          </div>
+          <table border="0" cellspacing="0">
+            <tr id="details-allauthors">
+              <th>All Authors / Contributors:</th>
+              <td>
+                <span class="vernacular" lang="ru">Кристофер Бакли ; перевод с английского Андрея Геласимова.</span>
+                <span class="vernacular" lang="ru">Геласимов, Андрей.</span> ;
+                <a href="/search?q=au%3ABuckley%2C+Christopher%2C&amp;qt=hot_author" title="Search for more by this author">Christopher Buckley</a>;
+                <a href="/search?q=au%3AGelasimov%2C+Andrei%CC%86.&amp;qt=hot_author" title="Search for more by this author">Andreĭ Gelasimov</a>
+              </td>
+            </tr>
+            <tr id="details-standardno">
+              <th>ISBN:</th>
+              <td>5941454139 9785941454136</td>
+            </tr>
+          </table>
+        </body>
+      </html>
+    XHTML
+  end
+
+  it "works for an isbn with multiple results" do
+    stub_request(:get, "https://www.worldcat.org/search?q=isbn:9780521247108&qt=advanced")
+      .to_return(status: 200, body: +sky_catalog_main, headers: {})
+    stub_request(:get,
+                 "https://www.worldcat.org/title/" \
+                 "sky-catalogue-20000-ed-by-alan-hirshfeld-and-roger-w-sinnott" \
+                 "/oclc/476534140&referer=brief_results")
+      .to_return(status: 200, body: +sky_catalog_details, headers: {})
+    assert_correct_search_result(described_class, "9780521247108")
+  end
+
+  it "works with vernacular" do
+    stub_request(:get, "https://www.worldcat.org/search?q=isbn:9785941454136&qt=advanced")
+      .to_return(status: 200, body: +florence_ru_details, headers: {})
+    assert_correct_search_result(described_class, "9785941454136")
+  end
+
+  it "works with multiple authors" do
+    stub_request(:get, "https://www.worldcat.org/search?q=isbn:9785941454136&qt=advanced")
+      .to_return(status: 200, body: +florence_ru_details, headers: {})
+    results = assert_correct_search_result(described_class,
+                                           "9785941454136")
+    this_book = results.first
+    expect(this_book.authors).to be_instance_of(Array), "Not an array!"
+    expect(this_book.authors.length).to eq(2), "Wrong number of authors for this book!"
+  end
+end