improving book functions and URL display

web/app/practice.py

@@ -28,6 +28,7 @@ def get_practices():
 def show_practice(practice_id):
     practice = get_resource(practice_id)
     relationships = get_relationships(practice_id)
+    practice.references = replace_urls(practice.references)
     return render_template('resource.html', resource=practice, relationships=relationships)
 
 # route for editing a single practice based on the ID in the database

web/app/resources.py

@@ -4,6 +4,8 @@
 # @author: Simon Bowie <ad7588@coventry.ac.uk>
 # @purpose: functions for resources
 # @acknowledgements:
+# isbntools: https://pypi.org/project/isbntools/
+# regex for URLs: https://gist.github.com/gruber/249502
 
 from flask import Blueprint, render_template, request, flash, redirect, url_for
 from .models import Resource
@@ -11,6 +13,7 @@ from werkzeug.exceptions import abort
 from . import db
 from isbntools.app import *
 import requests
+import re
 
 # function to retrieve data about a single resource from the database
 def get_resource(resource_id):
@@ -42,6 +45,7 @@ def get_filter_values(field, type):
     field_filter = sorted(field_filter)
     return field_filter
 
+# function to get book data including metadata and covers 
 def get_book_data(isbn):
     try:
         book = meta(isbn)
@@ -57,4 +61,11 @@ def get_book_data(isbn):
             book.update(book_cover)
         return book
     except: 
-        pass
+        pass
+
+# function to replace embedded URL strings with href links
+def replace_urls(input):
+    regex = '((?:https?:(?:/{1,3}|[a-z0-9%])|[a-z0-9.\-]+[.](?:com|net|org|edu|gov|mil|aero|asia|biz|cat|coop|info|int|jobs|mobi|museum|name|post|pro|tel|travel|xxx|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|dd|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|Ja|sk|sl|sm|sn|so|sr|ss|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)/)(?:[^\s()<>{}\[\]]+|\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\))+(?:\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\)|[^\s`!()\[\]{};:\'\".,<>?«»“”‘’])|(?:(?<!@)[a-z0-9]+(?:[.\-][a-z0-9]+)*[.](?:com|net|org|edu|gov|mil|aero|asia|biz|cat|coop|info|int|jobs|mobi|museum|name|post|pro|tel|travel|xxx|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|dd|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|Ja|sk|sl|sm|sn|so|sr|ss|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)\b/?(?!@)))'
+    replacement = '<a href=\\1>\\1</a>'
+    output = re.sub(regex, replacement, input)
+    return output

web/app/templates/book.html

@@ -52,7 +52,7 @@
                             </th>
                             <td>
                                 {% for author in book['Authors'] %}
-                                    {{ author }}
+                                    {{ author }}</br>
                                 {% endfor %}
                             </td>
                             {% else %}

web/app/templates/resource.html

@@ -166,7 +166,7 @@
                             How is this / Can this be an experimental practice?
                         </th>
                         <td>
-                            {{ resource['experimental'] }}
+                            {{ resource['experimental']|safe }}
                         </td>
                     </tr>
                     {% endif %}
@@ -176,7 +176,7 @@
                             How has it been applied experimentally (lessons learned for authors and publishers)?
                         </th>
                         <td>
-                            <p style="white-space: pre-line">{{ resource['lessonsLearned'] }}</p>
+                            <p style="white-space: pre-line">{{ resource['lessonsLearned']|safe }}</p>
                         </td>
                     </tr>
                     {% endif %}
@@ -186,7 +186,7 @@
                             References:
                         </th>
                         <td>
-                            <p style="white-space: pre-line">{{ resource['references'] }}</p>
+                            <p style="white-space: pre-line">{{ resource['references']|safe }}</p>
                         </td>
                     </tr>
                     {% endif %}

web/app/templates/resources.html

@@ -140,18 +140,24 @@
                 <a href="{{ url_for('tool.show_tool', tool_id=resource['id']) }}">
                     <h3 class="card-title text-center text-dark">{{ resource['name'] }}</h3>
                 </a>
+                <p class="card-text">
+                  {{ resource['description']|truncate(100) }}
+                </p>
                 {% elif resource['type'] == 'practice' %}
                 <a href="{{ url_for('practice.show_practice', practice_id=resource['id']) }}">
                     <h3 class="card-title text-center text-dark">{{ resource['name'] }}</h3>
                 </a>
+                <p class="card-text">
+                  {{ resource['description']|truncate(100) }}
+                </p>
                 {% elif resource['type'] == 'book' %}
                 <a href="{{ url_for('book.show_book', book_id=resource['id']) }}">
                     <h3 class="card-title text-center text-dark">{{ resource['name'] }}</h3>
                 </a>
-                {% endif %}
-                <p class="card-text">
-                    {{ resource['description']|truncate(100) }}
+                <p class="card-text text-center">
+                  {{ resource['author']|truncate(100) }}
                 </p>
+                {% endif %}
                 {% if current_user.is_authenticated %}
                   {% if resource['type'] == 'tool' %}
                   <a href="{{ url_for('tool.edit_tool', tool_id=resource['id']) }}">