fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f216a52)
synchro
authorRadek Czajka <rczajka@rczajka.pl>
Wed, 19 Feb 2025 09:57:26 +0000 (10:57 +0100)
committerRadek Czajka <rczajka@rczajka.pl>
Wed, 19 Feb 2025 09:57:26 +0000 (10:57 +0100)
src/documents/templates/documents/base.html patch | blob | history
src/documents/templates/documents/synchro.html patch | blob | history
src/documents/views.py patch | blob | history

diff --git a/src/documents/templates/documents/base.html b/src/documents/templates/documents/base.html
index 53ed63a..9d7e3f7 100644 (file)
--- a/src/documents/templates/documents/base.html
+++ b/src/documents/templates/documents/base.html
@@ -3,7 +3,6 @@
 {% load static %}
 {% load documents %}
 {% load alerts %}
 {% load static %}
 {% load documents %}
 {% load alerts %}
-<!DOCTYPE html>
 <html>
 <head lang="{{ LANGUAGE_CODE }}">
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 <html>
 <head lang="{{ LANGUAGE_CODE }}">
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
diff --git a/src/documents/templates/documents/synchro.html b/src/documents/templates/documents/synchro.html
index bc44673..346c33c 100644 (file)
--- a/src/documents/templates/documents/synchro.html
+++ b/src/documents/templates/documents/synchro.html
@@ -3,47 +3,144 @@
 
 {% block content %}
 
 
 {% block content %}
 
-  <div class="row mb-4">
-    <div class="col-4">
-    </div>
-    <div class="col-8">
-      {% if not length_ok %}
-        <div class="alert alert-warning">
-          Liczba znalezionych części dokumentu nie zgadza się z liczbą części audiobooka.
-          Konieczna jest korekta za pomocą atrybutów <code>forcesplit</code> i <code>nosplit</code>.
-        </div>
-      {% else %}
-        <form method="post" action="">
-          {% csrf_token %}
-          <button class="btn btn-primary">
-            Zaplanuj synchronizację
-          </button>
-        </form>
-      {% endif %}
-
-    </div>
-  </div>
-
-  <table class="table">
+<h1>Wskazówki synchronizacji dla: <a href="{{ book.get_absolute_url }}">{{ book.title }}</a></h1>
+
+  
+  <table class="table" id="sync-table">
     <thead>
       <tr>
     <thead>
       <tr>
+        <th></th>
         <th>Nagłówek cięcia</th>
         <th>Audiobook</th>
       </tr>
     </thead>
         <th>Nagłówek cięcia</th>
         <th>Audiobook</th>
       </tr>
     </thead>
-    {% for h, m in table %}
-      <tr>
-        <td>
-          {% if h %}
-            <a target="_blank" href="{% url 'wiki_editor' book.slug %}#CodeMirrorPerspective">
-              {{ h.0 }} (linia {{ h.2 }})
-            </a>
-          {% else %}
-            —
-          {% endif %}
-        </td>
-        <td>{{ m|default_if_none:'—' }}</td>
-      </tr>
-    {% endfor %}
+    <tbody>
+    </tbody>
   </table>
   </table>
+
+
+<form method="post" action="">
+  {% csrf_token %}
+  <input type="hidden" name="hints" id="hints">
+  <button class="btn btn-primary">
+    Zapisz wskazówki
+  </button>
+</form>
+
+{% endblock %}
+
+
+{% block add_js %}
+<script type="text/javascript">
+  $(function() {
+  
+      let hints = {{ hints|safe }};
+      let mp3 = {{ mp3|safe }};
+      let headers = {{ headers|safe }};
+      let headers_other = {{ headers_other|safe }};
+
+      let table = $("#sync-table tbody");
+
+      function showTable() {
+         $("#hints").val(JSON.stringify(hints));
+         
+         let mI = 0;
+         let hI = 0;
+         let row = 0;
+         let hint;
+         table.empty();
+         while (mI < mp3.length || hI < headers.length) {
+             let tr = $("<tr>");
+
+             if (row < hints.length) {
+                 hint = hints[row];
+             } else {
+                 hint = [];
+             }
+             tr.data('hint', hint);
+
+             let td = $("<td>");
+             if (headers_other.length) {
+                 td.append(
+                     $('<button class="btn btn-primary mr-1">').text('+').click(function() {
+                         hintAdd(tr);
+                     })
+                 );
+             }
+             td.append(
+                 $('<button class="btn btn-primary">').text('-').click(function() {
+                     hintRm(tr);
+                 })
+             );
+             td.appendTo(tr);
+             if (hint[0] == '+') {
+                 tr.addClass('hit-add');
+                 // select?
+                 let sel = $("<select>");
+                 sel.append($("<option>").text('wybierz'));
+                 $.each(headers_other, (i, e) => {
+                     let opt = $("<option>").text(
+                         e[1] + ' (' + e[0] + ')'
+                     ).val(i);
+                     if (i == hint[1]) {
+                         opt.attr('selected', 'selected')
+                     }
+                     sel.append(opt)
+                 });
+                 sel.change(function() {
+                     tr.data('hint', ['+', $(this).val()]);
+                     refreshTable();
+                 });
+
+                 $("<td>").append(sel).appendTo(tr);
+             } else {
+                 let td = $("<td>").text(headers[hI][1]).appendTo(tr);
+                 if (hint[0] == '-') {
+                     tr.addClass('text-muted');
+                 }
+                 hI ++;
+             }
+
+             if (hint[0] == '-') {
+                 $("<td>").appendTo(tr);
+             } else {
+                 $("<td>").text(mp3[mI]).appendTo(tr);
+                 mI ++;
+             }
+             table.append(tr);
+             row ++;
+         }
+      }
+
+      showTable();
+
+      function refreshTable() {
+         hints = [];
+         $("tr", table).each((i, e) => {
+             hint = $(e).data('hint')
+             if (hint !== null) {
+                 hints.push(hint)
+             }
+         });
+         showTable();
+      }
+      
+      function hintAdd(tr) {
+         $("<tr>").data('hint', ['+']).insertBefore(tr);
+         refreshTable();
+      }
+      function hintRm(tr) {
+         let $tr = $(tr);
+         let hint = $tr.data('hint');
+         if (hint[0] == '+') {
+             $tr.data('hint', null)
+         } else if (hint[0] == '-') {
+             $tr.data('hint', [])
+         } else {
+             $tr.data('hint', ['-'])
+         }
+         refreshTable();
+      }
+  });
+</script>
 {% endblock %}
 {% endblock %}
diff --git a/src/documents/views.py b/src/documents/views.py
index 97d2ad6..e87dc6d 100644 (file)
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -5,6 +5,7 @@ from collections import defaultdict
 from copy import deepcopy
 from datetime import datetime, date, timedelta
 from itertools import zip_longest
 from copy import deepcopy
 from datetime import datetime, date, timedelta
 from itertools import zip_longest
+import json
 import logging
 import os
 from urllib.parse import quote_plus, unquote, urlsplit, urlunsplit
 import logging
 import os
 from urllib.parse import quote_plus, unquote, urlsplit, urlunsplit
@@ -25,6 +26,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.decorators.http import require_POST
 from django_cas_ng.decorators import user_passes_test
 import requests
 from django.views.decorators.http import require_POST
 from django_cas_ng.decorators import user_passes_test
 import requests
+from lxml import etree
 
 from librarian import epubcheck
 from librarian.html import raw_printable_text
 
 from librarian import epubcheck
 from librarian.html import raw_printable_text
@@ -770,14 +772,29 @@ def mark_final_completed(request):
     return render(request, 'documents/mark_final_completed.html')
 
 
     return render(request, 'documents/mark_final_completed.html')
 
 
+@login_required
 def synchro(request, slug):
     book = get_object_or_404(Book, slug=slug)
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
 
 def synchro(request, slug):
     book = get_object_or_404(Book, slug=slug)
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
 
-    document = book.wldocument(librarian2=True)
+    if request.method == 'POST':
+        #hints = json.loads(request.POST.get('hints'))
+        chunk = book[0]
+        tree = etree.fromstring(chunk.head.materialize())
+        m = tree.find('.//meta[@id="synchro"]')
+        if m is None:
+            rdf = tree.find('.//{http://www.w3.org/1999/02/22-rdf-syntax-ns#}Description')
+            m = etree.SubElement(rdf, 'meta', id="synchro")
+            m.tail = '\n'
+        m.text = request.POST.get('hints')
+        text = etree.tostring(tree, encoding='unicode')
+        chunk.commit(text, author=request.user, description='Synchronizacja')
+        return HttpResponseRedirect('')
+    
+    document = book.wldocument(librarian2=True, publishable=False)
+
     slug = document.meta.url.slug
     slug = document.meta.url.slug
-    print(f'https://audio.wolnelektury.pl/archive/book/{slug}.json')
     error = None
     try:
         items = requests.get(f'https://audio.wolnelektury.pl/archive/book/{slug}.json').json()['items']
     error = None
     try:
         items = requests.get(f'https://audio.wolnelektury.pl/archive/book/{slug}.json').json()['items']
@@ -792,59 +809,49 @@ def synchro(request, slug):
     split_on = (
         'naglowek_rozdzial',
         'naglowek_scena',
     split_on = (
         'naglowek_rozdzial',
         'naglowek_scena',
-        )
-    
-    if split_on:
-        documents = []
-        headers = [('Początek', 0, 0)]
-        present = True
-        n = 0
-        while present:
-            present = False
-            n += 1
-            newdoc = deepcopy(document)
-            newdoc.tree.getroot().document = newdoc
-            
-            master = newdoc.tree.getroot()[-1]
-            i = 0
-            for item in list(master):
-                #chunkno, sourceline = 0, self.sourceline
-                #if builder.splits:
-                #    chunkno, sourceline = len(builder.splits), sourceline - builder.splits[-1]
-
-                if 'forcesplit' in item.attrib or (item.tag in split_on and 'nosplit' not in item.attrib):
-                    # TODO: clear
-                    i += 1
-                    if n > 1 and i == n:
-                        headers.append((
-                            raw_printable_text(item),
-                            0,
-                            item.sourceline,
-                        ))
-                if i != n and not (n == 1 and not i):
-                    master.remove(item)
-                else:
-                    present = True
-                if present:
-                    documents.append(newdoc)
-    else:
-        documents = [document]
-        headers = [(
-            document.meta.title, 0 ,0
-        )]
-
-    length_ok = len(headers) == len(mp3)
-    table = zip_longest(headers, mp3)
-
+    )
+    split_other = (
+        'naglowek_czesc',
+        'naglowek_akt',
+        'naglowek_podrozdzial',
+        'srodtytul',
+    )
+
+    headers = []
+    headers_other = []
+    master = document.tree.getroot()[-1]
+    for item in master:
+        if item.tag in split_on:
+            headers.append([
+                item.tag,
+                raw_printable_text(item),
+                0,
+                item.sourceline,
+            ])
+        if item.tag in split_other:
+            headers_other.append([
+                item.tag,
+                raw_printable_text(item),
+                0,
+                item.sourceline,
+            ])
+
+    hints = []
+    m = document.tree.find('.//meta[@id="synchro"]')
+    if m is not None:
+        try:
+            hints = json.loads(m.text)
+        except:
+            raise
+            pass
     
     return render(request, 'documents/synchro.html', {
         'book': book,
     
     return render(request, 'documents/synchro.html', {
         'book': book,
-        'documents': documents,
         'headers': headers,
         'headers': headers,
+        'headers_other': headers_other,
         'mp3': mp3,
         'mp3': mp3,
-        'length_ok': length_ok,
-        'table': table,
         'error': error,
         'error': error,
+        'hints': hints,
     })
 
 
     })