Commit 164eb659 authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

minor tweaks

parent 15fec44d

src/jama/templates/common.html

+21 −14
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 
    <meta charset="UTF-8">

    <meta name="viewport" content="width=device-width, initial-scale=1.0">

    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">

    <script src="https://cdn.jsdelivr.net/npm/unpoly@3.14.1/unpoly.min.js"></script>

    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/unpoly@3.14.1/unpoly.min.css">

    <style>

        @view-transition {

            navigation: auto;

        }

    </style>

    <title>Jama - {% block title %}Page inconnue{% endblock %}</title>

</head>

<body>

src/jama/templates/task_result_details.html

+5 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
    Task Result Details

{% endblock %}

{% block content %}

    <main>

    <style>

        body {

            max-width: unset;
@@ -13,19 +14,20 @@ 
        }

        .task-result-details-wrapper table {

            width: 100%;

            table-layout: fixed;

        }

        .task-result-details-wrapper th,

        .task-result-details-wrapper td {

            vertical-align: top;

        }

    </style>

    <!--

    <div class="task-result-details-wrapper">

    <h1>DB Task Result Details</h1>

    <p>

        <a href="{% url 'task_results' %}">← Retour à la liste</a>

    </p>

    <table>

    -->

    <table style="table-layout: auto;">

        <thead>

        <tr>

            <th>champ</th>
@@ -42,4 +44,5 @@ 
        </tbody>

    </table>

    </div>

    </main>

{% endblock %}

src/jama/templates/task_results.html

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ 
                        {% for value in row %}

                            <td>

                                {% if forloop.first %}

                                    <a href="{{ value }}"><button type="button">details</button></a>

                                    <a href="{{ value }}" up-layer="new" up-size="large" up-history="false"><button type="button">details</button></a>

                                {% else %}

                                    <pre style="margin:0;white-space:pre-wrap;">{{ value }}</pre>

                                {% endif %}

src/jama/views.py

+9 −2
Original line number Diff line number Diff line
@@ -252,10 +252,17 @@ def task_results(request: HttpRequest) -> HttpResponse: 
@user_passes_test(lambda user: user.is_superuser)

def task_result_details(request: HttpRequest, task_result_id) -> HttpResponse:

    task_result = get_object_or_404(DBTaskResult, pk=task_result_id)

    detail_rows = []

    preferred_order = ["id", "task_path", "status", "enqueued_at"]

    fields_by_name = {field.name: field for field in DBTaskResult._meta.fields}

    ordered_field_names = [name for name in preferred_order if name in fields_by_name]

    for field in DBTaskResult._meta.fields:

        if field.name not in ordered_field_names:

            ordered_field_names.append(field.name)



    detail_rows = []

    for field_name in ordered_field_names:

        detail_rows.append(

            {"name": field.name, "value": getattr(task_result, field.name, None)}

            {"name": field_name, "value": getattr(task_result, field_name, None)}

        )

    return render(

        request,

src/resources/tasks.py

+9 −6
Original line number Diff line number Diff line
@@ -17,32 +17,34 @@ logger = logging.getLogger(__name__) 




@task

def exif_task(file_id: int):

def exif_task(file_id: int) -> int:

    from resources.models import File

    from resources.helpers import set_exif_metas



    try:

        f = File.objects.get(pk=file_id)

        set_exif_metas(f)

        return set_exif_metas(f)

    except File.DoesNotExist:

        logger.info(f"exif_task stopped: no file with id {file_id}")

        return

        return 0

    except Exception as e:

        logger.warning("exit_task({}) failed".format(file_id))

        logger.info(repr(e))

        return 0





@task

def iiif_task(file_id: int):

def iiif_task(file_id: int) -> bool:

    from resources.models import File

    from resources.helpers import make_iiif



    try:

        f = File.objects.get(pk=file_id)

        make_iiif(f, True)

        return True

    except File.DoesNotExist:

        logger.info(f"iiif_task stopped: no file with id {file_id}")

        return

        return False

    except Exception as e:

        logger.warning("iiif_task({}) failed: {}".format(file_id, repr(e)))

        raise e
@@ -56,9 +58,10 @@ def hls_task(file_id: int): 
    try:

        f = File.objects.get(pk=file_id)

        make_hls(f, True)

        return True

    except File.DoesNotExist:

        logger.info(f"hls_task stopped: no file with id {file_id}")

        return

        return False

    except Exception as e:

        logger.warning("hls_task({}) failed: {}".format(file_id, repr(e)))

        raise e