0001-manager-use-ajax-to-display-tar-format-site-export-s.patch

Nicolas Roche, 26 juillet 2020 15:47

Voir les différences: en ligne côte à côte

Subject: [PATCH] manager: use ajax to display tar format site export size
 (#45466)

 combo/apps/assets/urls.py                     |  2 ++
 combo/apps/assets/views.py                    | 31 +++++++++++++++-
 combo/manager/forms.py                        |  4 ---
 .../manager/templates/combo/site_export.html  | 35 ++++++++++++++++++-
 combo/manager/views.py                        |  5 ++-
 5 files changed, 68 insertions(+), 9 deletions(-)

     urlpatterns = [
         url(r'^assets/(?P<key>[\w_:-]+)$', views.serve_asset),
         url(r'^manage/assets/', decorated_includes(manager_required,
             include(assets_manager_urls))),
         url(r'^api/assets/set/(?P<key>[\w_:-]+)/$', api_views.view_set,
             name='api-assets-set'),
         url(r'^ajax/asset-disk-space-usage/$',
             views.ajax_disk_space_usage, name='combo-assets-ajax-disk-space-usage'),
+    ]

     # GNU Affero General Public License for more details.
+    #
     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import json
     import tarfile
     import os
     import time
     from django.conf import settings
     from django.contrib import messages
     from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
     from django.core.files.storage import default_storage
     from django.urls import reverse, reverse_lazy
     from django.http import Http404, HttpResponse
     from django.http import Http404, HttpResponse, StreamingHttpResponse
     from django.shortcuts import get_object_or_404
     from django.shortcuts import redirect
     from django.utils.six import BytesIO
     from django.utils.translation import ugettext_lazy as _
     from django.views.generic import TemplateView, ListView, FormView
     import ckeditor
     from sorl.thumbnail.shortcuts import get_thumbnail
-...
             geometry_string += 'x%s' % height
         # no thumbnail whithout geometry_string or for a svg file
         if not geometry_string or asset.asset.name.endswith('svg'):
             return redirect(asset.asset.url)
         # get or create thumbnail and return url
         return redirect(get_thumbnail(asset.asset, geometry_string, **thumb_options).url)
     def ajax_disk_space_usage(request):
         response = StreamingHttpResponse(ajax_disk_space_usage_generator())
         response['X-Accel-Buffering'] = 'no'
         return response
     def ajax_disk_space_usage_generator():
         media_prefix = default_storage.path('')
         start = time.time()
         total = 0
         units = ['Bytes', 'Ko', 'Mo', 'Go']
         def get_message(size):
             unit = 0
             while unit < 3 and size > 1024:
                 size = int(size / 1024)
                 unit += 1
             return "<message>(%s %s)</message>" % (size, units[unit])
         for basedir, dirnames, filenames in os.walk(media_prefix):
             for filename in filenames:
                 time.sleep(0.5)  # to test progression (to remove)
                 total += os.stat(os.path.join(basedir, filename)).st_size
                 if time.time() - start > 0.5:
                     yield get_message(total)
         yield get_message(total)

                 self.instance.restricted_to_unlogged = True
                 self.instance.groups.set(self.cleaned_data['groups'])
             self.instance.save()
             return self.instance
     class SiteImportForm(forms.Form):
         site_file = forms.FileField(label=_('Site Export File'))
     class SiteExportForm(forms.Form):
         include_asset = forms.BooleanField(label=_('Include assets into the export'), required=False)

     {% block appbar %}
     <h2>{% trans "Site Export" %}</h2>
     {% endblock %}
     {% block content %}
     <form method="post">
       {% csrf_token %}
       {{ form.as_p }}
       <p>
         <input type="checkbox" name="include_asset" id="id_include_asset">
         {% trans 'Include assets into the export' %}
         <span id="asset-disk-space-usage-message"></span>
         </input>
       </p>
       <div class="buttons">
         <button>{% trans 'Export' %}</button>
         <a class="cancel" href="{% url 'combo-manager-homepage' %}">{% trans 'Cancel' %}</a>
       </div>
       <script>
         function renderMessage(text) {
           document.getElementById("asset-disk-space-usage-message").innerHTML = text;
+        }
         $(document).ready(function() {
           var xhReq = new XMLHttpRequest();
           var nextReadPos = 0;
           function pollLatestResponse() {
             var allMessages = xhReq.responseText;
             do {
               var unprocessed = allMessages.substring(nextReadPos);
               var messageXMLEndIndex = unprocessed.indexOf("</message>");
               if (messageXMLEndIndex!=-1) {
                 var endOfFirstMessageIndex = messageXMLEndIndex + "</message>".length;
                 var anUpdate = unprocessed.substring(0, endOfFirstMessageIndex);
                 renderMessage(anUpdate);
                 nextReadPos += endOfFirstMessageIndex;
+              }
             } while (messageXMLEndIndex != -1);
+          }
           xhReq.open("GET", "{% url 'combo-assets-ajax-disk-space-usage' %}", true);
           xhReq.send(null);
           pollTimer = setInterval(pollLatestResponse, 500);
         })
       </script>
     </form>
     {% endblock %}

             CreateView, UpdateView, ListView, DeleteView, FormView, TemplateView)
     from combo.data.models import Page, CellBase, ParentContentCell, PageSnapshot, LinkListCell
     from combo.data.library import get_cell_class
     from combo.data.utils import (export_site, export_site_tar, import_site, import_site_tar,
             ImportSiteError, MissingGroups)
     from combo import plugins
     from .forms import (PageEditTitleForm, PageVisibilityForm, SiteImportForm, SiteExportForm,
     from .forms import (PageEditTitleForm, PageVisibilityForm, SiteImportForm,
             PageEditRedirectionForm, PageSelectTemplateForm, PageEditSlugForm,
             PageEditPictureForm, PageEditIncludeInNavigationForm,
             PageEditDescriptionForm, CellVisibilityForm, PageDuplicateForm)
     class HomepageView(ListView):
         model = Page
         template_name = 'combo/manager_home.html'
-...
             context['extra_actions'] = plugins.get_extra_manager_actions()
             context['collapse_pages'] = settings.COMBO_MANAGE_HOME_COLLAPSE_PAGES
             return context
     homepage = HomepageView.as_view()
     class SiteExportView(FormView):
         form_class = SiteExportForm
     class SiteExportView(TemplateView):
         template_name = 'combo/site_export.html'
         def post(self, request, *args, **kwargs):
             if request.POST.get('include_asset'):
                 fd = BytesIO()
                 export_site_tar(fd)
                 response = HttpResponse(content=fd.getvalue(), content_type='application/x-tar')
                 response['Content-Disposition'] = 'attachment; filename="site-export.tar"'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-manager-use-ajax-to-display-tar-format-site-export-s.patch