Merge branch 'main' into production

bookwyrm/connectors/abstract_connector.py

@@ -217,6 +217,10 @@ def dict_from_mappings(data, mappings):
     the subclass"""
     result = {}
     for mapping in mappings:
+        # sometimes there are multiple mappings for one field, don't
+        # overwrite earlier writes in that case
+        if mapping.local_field in result and result[mapping.local_field]:
+            continue
         result[mapping.local_field] = mapping.get_value(data)
     return result
 

bookwyrm/connectors/inventaire.py

@@ -21,6 +21,7 @@ class Connector(AbstractConnector):
         ]
         self.book_mappings = [
             Mapping("title", remote_field="wdt:P1476", formatter=get_first),
+            Mapping("title", remote_field="labels", formatter=get_language_code),
             Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first),
             Mapping("inventaireId", remote_field="uri"),
             Mapping(
@@ -211,4 +212,8 @@ class Connector(AbstractConnector):
 
 def get_language_code(options, code="en"):
     """when there are a bunch of translation but we need a single field"""
-    return options.get(code)
+    result = options.get(code)
+    if result:
+        return result
+    values = list(options.values())
+    return values[0] if values else None

bookwyrm/templates/book/book.html

@@ -155,9 +155,12 @@
             </div>
 
             {% if user_authenticated %}
+            <hr aria-hidden="true">
             <section class="block">
                 <header class="columns">
-                    <h2 class="column title is-5 mb-1">{% trans "Your reading activity" %}</h2>
+                    <div class="column">
+                    <h2 class="title is-5">{% trans "Your reading activity" %}</h2>
+                    </div>
                     <div class="column is-narrow">
                         {% trans "Add read dates" as button_text %}
                         {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" class="is-small" controls_text="add-readthrough" %}
@@ -184,11 +187,88 @@
                 {% include 'snippets/readthrough.html' with readthrough=readthrough %}
                 {% endfor %}
             </section>
+            <hr aria-hidden="true">
 
             <section class="box">
                 {% include 'snippets/create_status.html' with book=book hide_cover=True %}
             </section>
             {% endif %}
+            <div class="block" id="reviews">
+                {% if request.user.is_authenticated %}
+                {% if user_statuses.review_count or user_statuses.comment_count or user_stuatses.quotation_count %}
+                <nav class="tabs">
+                    <ul>
+                        {% url 'book' book.id as tab_url %}
+                        <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                            <a href="{{ tab_url }}">{% trans "Reviews" %} ({{ review_count }})</a>
+                        </li>
+                        {% if user_statuses.review_count %}
+                        {% url 'book-user-statuses' book.id 'review' as tab_url %}
+                        <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                            <a href="{{ tab_url }}">{% trans "Your reviews" %} ({{ user_statuses.review_count }})</a>
+                        </li>
+                        {% endif %}
+                        {% if user_statuses.comment_count %}
+                        {% url 'book-user-statuses' book.id 'comment' as tab_url %}
+                        <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                            <a href="{{ tab_url }}">{% trans "Your comments" %} ({{ user_statuses.comment_count }})</a>
+                        </li>
+                        {% endif %}
+                        {% if user_statuses.quotation_count %}
+                        {% url 'book-user-statuses' book.id 'quote' as tab_url %}
+                        <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                            <a href="{{ tab_url }}">{% trans "Your quotes" %} ({{ user_statuses.quotation_count }})</a>
+                        </li>
+                        {% endif %}
+                    </ul>
+                </nav>
+                {% endif %}
+                {% endif %}
+
+                {% for review in statuses %}
+                    <div
+                        class="block"
+                        itemprop="review"
+                        itemscope
+                        itemtype="https://schema.org/Review"
+                    >
+                        {% with status=review hide_book=True depth=1 %}
+                            {% include 'snippets/status/status.html' %}
+                        {% endwith %}
+                    </div>
+                {% endfor %}
+
+                <div class="block is-flex is-flex-wrap-wrap">
+                    {% for rating in ratings %}
+                        {% with user=rating.user %}
+                            <div class="block mr-5">
+                                <div class="media">
+                                    <div class="media-left">
+                                        {% include 'snippets/avatar.html' %}
+                                    </div>
+
+                                    <div class="media-content">
+                                        <div>
+                                            <a href="{{ user.local_path }}">{{ user.display_name }}</a>
+                                        </div>
+                                        <div class="is-flex">
+                                            <p class="mr-1">{% trans "rated it" %}</p>
+
+                                            {% include 'snippets/stars.html' with rating=rating.rating %}
+                                        </div>
+                                        <div>
+                                            <a href="{{ rating.remote_id }}">{{ rating.published_date | naturaltime }}</a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        {% endwith %}
+                    {% endfor %}
+                </div>
+                <div class="block">
+                    {% include 'snippets/pagination.html' with page=statuses path=request.path anchor="#reviews" %}
+                </div>
+            </div>
         </div>
         <div class="column is-one-fifth">
             {% if book.subjects %}
@@ -247,80 +327,6 @@
         </div>
     </div>
 
-    <div class="block" id="reviews">
-        {% if request.user.is_authenticated %}
-        <nav class="tabs">
-            <ul>
-                {% url 'book' book.id as tab_url %}
-                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
-                    <a href="{{ tab_url }}">{% trans "Reviews" %} ({{ review_count }})</a>
-                </li>
-                {% if user_statuses.review_count %}
-                {% url 'book-user-statuses' book.id 'review' as tab_url %}
-                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
-                    <a href="{{ tab_url }}">{% trans "Your reviews" %} ({{ user_statuses.review_count }})</a>
-                </li>
-                {% endif %}
-                {% if user_statuses.comment_count %}
-                {% url 'book-user-statuses' book.id 'comment' as tab_url %}
-                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
-                    <a href="{{ tab_url }}">{% trans "Your comments" %} ({{ user_statuses.comment_count }})</a>
-                </li>
-                {% endif %}
-                {% if user_statuses.quotation_count %}
-                {% url 'book-user-statuses' book.id 'quote' as tab_url %}
-                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
-                    <a href="{{ tab_url }}">{% trans "Your quotes" %} ({{ user_statuses.quotation_count }})</a>
-                </li>
-                {% endif %}
-            </ul>
-        </nav>
-        {% endif %}
-
-        {% for review in statuses %}
-            <div
-                class="block"
-                itemprop="review"
-                itemscope
-                itemtype="https://schema.org/Review"
-            >
-                {% with status=review hide_book=True depth=1 %}
-                    {% include 'snippets/status/status.html' %}
-                {% endwith %}
-            </div>
-        {% endfor %}
-
-        <div class="block is-flex is-flex-wrap-wrap">
-            {% for rating in ratings %}
-                {% with user=rating.user %}
-                    <div class="block mr-5">
-                        <div class="media">
-                            <div class="media-left">
-                                {% include 'snippets/avatar.html' %}
-                            </div>
-
-                            <div class="media-content">
-                                <div>
-                                    <a href="{{ user.local_path }}">{{ user.display_name }}</a>
-                                </div>
-                                <div class="is-flex">
-                                    <p class="mr-1">{% trans "rated it" %}</p>
-
-                                    {% include 'snippets/stars.html' with rating=rating.rating %}
-                                </div>
-                                <div>
-                                    <a href="{{ rating.remote_id }}">{{ rating.published_date | naturaltime }}</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                {% endwith %}
-            {% endfor %}
-        </div>
-        <div class="block">
-            {% include 'snippets/pagination.html' with page=statuses path=request.path anchor="#reviews" %}
-        </div>
-    </div>
 </div>
 {% endwith %}
 {% endblock %}

bookwyrm/templates/snippets/readthrough.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load humanize %}
 {% load tz %}
-<div class="content block">
+<div class="content box is-shadowless has-background-white-bis">
     <div id="hide-edit-readthrough-{{ readthrough.id }}">
         <div class="columns">
             <div class="column">
@@ -48,7 +48,9 @@
                         {% endif %}
                     </li>
                     {% endif %}
+                    {% if readthrough.start_date %}
                     <li>{{ readthrough.start_date | localtime | naturalday }}: {% trans "started" %}</li>
+                    {% endif %}
                 </ul>
             </div>
             <div class="column is-narrow">

bookwyrm/templates/user/user.html

@@ -53,11 +53,6 @@
     <h2 class="title">{% now 'Y' %} Reading Goal</h2>
     {% include 'snippets/goal_progress.html' with goal=goal %}
 </div>
-{% elif user == request.user %}
-<div class="block">
-    {% now 'Y' as year %}
-    <h2 class="title is-4"><a href="{{ user.local_path }}/goal/{{ year }}">{% blocktrans %}Set a reading goal for {{ year }}{% endblocktrans %}</a></h2>
-</div>
 {% endif %}
 
 <div>

bookwyrm/tests/connectors/test_inventaire_connector.py

@@ -5,7 +5,7 @@ from django.test import TestCase
 import responses
 
 from bookwyrm import models
-from bookwyrm.connectors.inventaire import Connector
+from bookwyrm.connectors.inventaire import Connector, get_language_code
 
 
 class Inventaire(TestCase):
@@ -156,3 +156,18 @@ class Inventaire(TestCase):
             formatted.cover,
             "https://covers.inventaire.io/img/entities/12345",
         )
+
+    def test_get_language_code(self):
+        """get english or whatever is in reach"""
+        options = {
+            "de": "bip",
+            "en": "hi",
+            "fr": "there",
+        }
+        self.assertEqual(get_language_code(options), "hi")
+
+        options = {
+            "fr": "there",
+        }
+        self.assertEqual(get_language_code(options), "there")
+        self.assertIsNone(get_language_code({}))