localcosmos-app-kit 0.9.15__py3-none-any.whl → 0.9.17__py3-none-any.whl

app_kit/taxonomy/lazy.py

@@ -115,14 +115,14 @@ class LazyTaxon(LazyTaxonBase):
                 
                 if db_lazy_taxon.taxon_nuid != self.taxon_nuid:
                     self.changed_taxon_nuid_in_reference = True
-                    self.reference_errors.append(_('Taxon %s has changed its position in %s') % (self, verbose_taxon_source))
+                    self.reference_errors.append(_('Taxon %(taxon)s has changed its position in %(tree)s') % {'taxon': self, 'tree': verbose_taxon_source})
         
                 if str(taxon.name_uuid) != str(self.name_uuid):
                     self.changed_name_uuid_in_reference = True
-                    self.reference_errors.append(_('Taxon %s has changed its identifier in %s') % (self, verbose_taxon_source))
+                    self.reference_errors.append(_('Taxon %(taxon)s has changed its identifier in %(tree)s') % {'taxon': self, 'tree': verbose_taxon_source})
                     
                 if tree_query.count() > 1:
-                    self.reference_errors.append(_('Taxon %s  found multiple times in %s') % (self, verbose_taxon_source))
+                    self.reference_errors.append(_('Taxon %(taxon)s  found multiple times in %(tree)s') % {'taxon': self, 'tree': verbose_taxon_source})
                     
             else:
                 synonyms_model = self.models.TaxonSynonymModel
@@ -135,11 +135,11 @@ class LazyTaxon(LazyTaxonBase):
                     self.reference_synonym = synonym
                     accepted_name = synonym.taxon
                     self.reference_accepted_name = LazyTaxon(instance=accepted_name)
-                    self.reference_errors.append(_('Taxon %s not found as accepted name, but as synonym of %s') % (self,
-                            accepted_name))
+                    self.reference_errors.append(_('Taxon %(taxon)s not found as accepted name, but as synonym of %(accepted_name)s') % {'taxon': self,
+                            'accepted_name': accepted_name})
                     
                 else:
-                    self.reference_errors.append(_('Taxon %s not found in %s') % (self, verbose_taxon_source))
+                    self.reference_errors.append(_('Taxon %(taxon)s not found in %(tree)s') % {'taxon': self, 'tree': verbose_taxon_source})
                     
                 
                 taxon_latnames_query = self.models.TaxonTreeModel.objects.filter(

app_kit/taxonomy/sources/custom/forms.py

@@ -13,6 +13,7 @@ TAXON_RANK_CHOICES = (
     ('', '-----'),
     ('kingdom', _('Kingdom')),
     ('phylum', _('Phylum')),
+    ('subphylum', _('Subphylum')),
     ('class', _('Class')),
     ('order', _('Order')),
     ('family', _('Family')),

app_kit/taxonomy/views.py

@@ -79,7 +79,7 @@ class TaxonTreeView(TemplateView):
         if self.taxon:
             children_nuid_length = len(self.taxon.taxon_nuid) + 3
             taxa = self.models.TaxonTreeModel.objects.annotate(nuid_len=Length('taxon_nuid')).filter(
-                taxon_nuid__startswith=self.taxon.taxon_nuid, nuid_len=children_nuid_length)
+                taxon_nuid__startswith=self.taxon.taxon_nuid, nuid_len=children_nuid_length).order_by('taxon_latname')
             
         else:
             taxa = self.get_root_taxa()

app_kit/templates/app_kit/ajax/list_images_and_licences_content.html

@@ -0,0 +1,44 @@
+{% load i18n el_pagination_tags app_tags %}
+
+{% paginate 28 registry_entries %}
+
+{% show_pages %}
+
+<div class="row">
+    {% for entry in registry_entries %}
+        <div class="col-12 col-md-6 col-lg-3">
+            {% get_object_from_licence entry as licenced_object %}
+            {% if licenced_object.is_imagestore %}
+                <div class="row mb-2">
+                    <div class="col-6">
+                        {% if licenced_object.object %}
+                            <img src="{{ licenced_object.object.source_image.url }}" class="img-thumbnail img-fluid" alt="Content Image">
+                        {% else %}
+                            deleted image
+                        {% endif %}
+                    </div>
+                    <div class="col-6 p-1">
+                        <small>
+                            {% trans 'Author' %}: {{ entry.creator_name}}<br>
+                            {% trans 'Licence' %}: {{ entry.licence }} {{ entry.licence_version }}
+                            {% if entry.creator_link %}
+                                <br>(<a href="{{ entry.creator_link }}" target="_blank" rel="noopener noreferrer">{% trans 'Link to author' %}</a>)
+                            {% endif %}
+                            {% if entry.source_link %}
+                                <br>(<a href="{{ entry.source_link }}" target="_blank" rel="noopener noreferrer">{% trans 'Link to source' %}</a>)
+                            {% endif %}
+                            <br>
+                            {% if licenced_object.object %}
+                                <a class="btn btn-xs btn-outline-primary mt-2 xhr" ajax-target="ModalContent" href="{% url 'manage_content_licence' meta_app.id entry.id %}">{% trans 'Edit licence' %}</a>
+                            {% endif %}
+                        </small>
+                    </div>
+                </div>
+            {% else %}
+
+            {% endif %}
+        </div>
+    {% endfor %}
+</div>
+
+{% show_pages %}

app_kit/templates/app_kit/ajax/manage_content_licence.html

@@ -0,0 +1,25 @@
+{% extends 'localcosmos_server/modals/modal_form.html' %}
+{% load i18n localcosmos_tags %}
+
+{% block action %}
+    {% url 'manage_content_licence' meta_app.id registry_entry.id %}
+{% endblock %}
+
+{% block title %}
+	{% blocktrans %}Manage Licence{% endblocktrans %}
+{% endblock %}
+	
+
+{% block footer %}
+	{% include 'localcosmos_server/modals/footers/save.html' %}
+{% endblock %}
+
+{% block script %}
+	{% if success %}
+	
+		<script>
+			$("#LargeModal").modal("hide");
+            window.location.reload();
+		</script>
+	{% endif %}
+{% endblock %}

app_kit/templates/app_kit/list_images_and_licences.html

@@ -0,0 +1,25 @@
+{% extends 'app_kit/base.html' %}
+{% load i18n static app_tags localcosmos_tags %}
+
+{% block content %}
+<br>
+<div class="container">
+	<div class="row">
+		<div class="col-12">
+            <br>
+            <h3>
+                {% trans 'Images and Licences' %}
+            </h3>
+
+            <hr>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-12">
+            <div id="images-and-licences-content">
+                {% include 'app_kit/ajax/list_images_and_licences_content.html' %}
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

app_kit/templates/app_kit/manage_app.html

@@ -60,7 +60,16 @@
 
 
 {% block generic_content_specific %}
-	
+	<div>
+		<div class="card">
+		<div class="card-body">
+			<h5 class="card-title">{% trans 'Images and Licences' %}</h5>
+			<div>
+				<a href="{% url 'list_images_and_licences' meta_app.id %}" class="btn btn-outline-primary">{% trans 'Manage Images and Licences' %}</a>
+			</div>
+		</div>
+	</div>
+	</div>
 {% endblock %}
 
 {% block extra_script %}

app_kit/templatetags/app_tags.py

@@ -9,7 +9,7 @@ from django.contrib.staticfiles import finders
 from django.db.models import Q
 
 from app_kit.models import MetaApp, AppKitExternalMedia
-from localcosmos_server.models import EXTERNAL_MEDIA_TYPES
+from localcosmos_server.models import EXTERNAL_MEDIA_TYPES, ServerImageStore
 
 from app_kit.features.backbonetaxonomy.models import TaxonRelationship, TaxonRelationshipType
 
@@ -28,7 +28,7 @@ def ranged(number):
     return range(1,int(number)+1)
 
 
-from app_kit.models import ContentImage
+from app_kit.models import ContentImage, ImageStore
 @register.simple_tag
 def content_image(instance, image_type=None):
 
@@ -310,4 +310,24 @@ def render_taxon_relationships(context, meta_app, lazy_taxon):
         'taxon_relationship_types': relationship_types,
     }
 
-    return tag_context
+    return tag_context
+
+
+@register.simple_tag()
+def get_object_from_licence(licence_registry_entry):
+
+    content = licence_registry_entry.content
+    content_type = licence_registry_entry.content_type
+    
+    image_store_content_type = ContentType.objects.get_for_model(ImageStore)
+    server_image_store_content_type = ContentType.objects.get_for_model(ServerImageStore)
+    
+    licenced_object = {
+        'is_imagestore': False,
+        'object': content,
+    }
+    
+    if content_type == image_store_content_type or content_type == server_image_store_content_type:
+        licenced_object['is_imagestore'] = True
+    
+    return licenced_object

app_kit/tests/test_generic_content_zip_import.py

@@ -320,7 +320,7 @@ class TestGenericContentZipImporter(WithUser, WithMetaApp, TenantTestCase):
         self.assertEqual(licence.licence, 'CC BY-NC')
         self.assertEqual(licence.licence_version, '4.0')
         self.assertEqual(licence.source_link, 'https://imageworld.com/lacerta-agilis.jpg')
-        self.assertEqual(licence.creator_name, 'Art Vandeley')
+        self.assertEqual(licence.creator_name, 'New Author')
         self.assertEqual(content_image.alt_text, 'A new alt text')
         self.assertEqual(content_image.text, 'A new caption')
         self.assertEqual(content_image.title, 'Lizard')
@@ -421,6 +421,146 @@ class TestGenericContentZipImporter(WithUser, WithMetaApp, TenantTestCase):
         # No match for wrong author
         matches = importer.get_taxa_with_taxon_author_tolerance(taxon_source, taxon_latname, 'Smith')
         self.assertEqual(len(matches), 0)
+
+    # External Media URL validation
+    @test_settings
+    def test_validate_external_media_type_youtube_valid_urls(self):
+        importer = self.get_zip_importer()
+        importer.load_workbook()
+        importer.errors = []
+
+        valid_urls = [
+            'https://youtu.be/dQw4w9WgXcQ',
+            'http://youtu.be/dQw4w9WgXcQ',
+            'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
+            'https://youtube.com/watch?v=dQw4w9WgXcQ',
+            'https://www.youtube.com/embed/dQw4w9WgXcQ',
+            'https://www.youtube.com/v/dQw4w9WgXcQ',
+            'https://www.youtube.com/shorts/dQw4w9WgXcQ',
+        ]
+
+        for url in valid_urls:
+            importer.validate_external_media_type_youtube({'url': url}, importer.external_media_sheet_name, 2)
+        self.assertEqual(importer.errors, [])
+
+    @test_settings
+    def test_validate_external_media_type_youtube_invalid_urls(self):
+        importer = self.get_zip_importer()
+        importer.load_workbook()
+        importer.errors = []
+
+        # Empty URL
+        importer.validate_external_media_type_youtube({'url': ''}, importer.external_media_sheet_name, 2)
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid YouTube URL: empty value', importer.errors)
+
+        # Invalid scheme
+        bad_url = 'ftp://youtu.be/dQw4w9WgXcQ'
+        importer.validate_external_media_type_youtube({'url': bad_url}, importer.external_media_sheet_name, 2)
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid YouTube URL (scheme must be http/https): ftp://youtu.be/dQw4w9WgXcQ', importer.errors)
+
+        # No video id
+        bad_url = 'https://www.youtube.com/watch?v='
+        importer.validate_external_media_type_youtube({'url': bad_url}, importer.external_media_sheet_name, 2)
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid YouTube URL or video id not found: https://www.youtube.com/watch?v=', importer.errors)
+
+    @test_settings
+    def test_validate_external_media_type_vimeo_valid_urls(self):
+        importer = self.get_zip_importer()
+        importer.load_workbook()
+        importer.errors = []
+
+        valid_urls = [
+            'https://vimeo.com/123456789',
+            'http://vimeo.com/123456789',
+            'https://player.vimeo.com/video/123456789',
+            'https://www.vimeo.com/123456789',
+        ]
+
+        for url in valid_urls:
+            importer.validate_external_media_type_vimeo({'url': url}, importer.external_media_sheet_name, 2)
+        self.assertEqual(importer.errors, [])
+
+    @test_settings
+    def test_validate_external_media_type_vimeo_invalid_urls(self):
+        importer = self.get_zip_importer()
+        importer.load_workbook()
+        importer.errors = []
+
+        # Empty URL
+        importer.validate_external_media_type_vimeo({'url': ''}, importer.external_media_sheet_name, 2)
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid Vimeo URL: empty value', importer.errors)
+
+        # Invalid scheme
+        bad_url = 'ftp://vimeo.com/123456789'
+        importer.validate_external_media_type_vimeo({'url': bad_url}, importer.external_media_sheet_name, 2)
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid Vimeo URL (scheme must be http/https): ftp://vimeo.com/123456789', importer.errors)
+
+        # No video id
+        bad_url = 'https://vimeo.com/'
+        importer.validate_external_media_type_vimeo({'url': bad_url}, importer.external_media_sheet_name, 2)
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid Vimeo URL or video id not found: https://vimeo.com/', importer.errors)
+
+    @test_settings
+    def test_validate_external_media_type_image_url_extension(self):
+        importer = self.get_zip_importer()
+        importer.load_workbook()
+        importer.errors = []
+
+        # Valid image URL
+        importer.validate_external_media_type_image({'url': 'https://example.com/pic.jpg'}, importer.external_media_sheet_name, 2)
+        # Invalid image URL extension
+        importer.validate_external_media_type_image({'url': 'https://example.com/pic.bmp'}, importer.external_media_sheet_name, 2)
+
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid image format in URL: .bmp. Valid formats are: .jpg, .jpeg, .png, .webp, .gif', importer.errors)
+
+    @test_settings
+    def test_validate_external_media_type_audio_pdf(self):
+        importer = self.get_zip_importer()
+        importer.load_workbook()
+        importer.errors = []
+
+        # mp3
+        importer.validate_external_media_type_mp3({'url': 'https://example.com/audio.txt'}, importer.external_media_sheet_name, 2)
+        importer.validate_external_media_type_mp3({'url': 'https://example.com/audio.mp3'}, importer.external_media_sheet_name, 2)
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid mp3 format in URL: https://example.com/audio.txt. URL has to end with .mp3', importer.errors)
+
+        # wav
+        importer.validate_external_media_type_wav({'url': 'https://example.com/audio.txt'}, importer.external_media_sheet_name, 2)
+        importer.validate_external_media_type_wav({'url': 'https://example.com/audio.wav'}, importer.external_media_sheet_name, 2)
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid wav format in URL: https://example.com/audio.txt. URL has to end with .wav', importer.errors)
+
+        # pdf
+        importer.validate_external_media_type_pdf({'url': 'https://example.com/doc.txt'}, importer.external_media_sheet_name, 2)
+        importer.validate_external_media_type_pdf({'url': 'https://example.com/doc.pdf'}, importer.external_media_sheet_name, 2)
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid pdf format in URL: https://example.com/doc.txt. URL has to end with .pdf', importer.errors)
+
+    @test_settings
+    def test_validate_external_media_type_website(self):
+        importer = self.get_zip_importer()
+        importer.load_workbook()
+        importer.errors = []
+
+        # Invalid: ends with file extension
+        importer.validate_external_media_type_website({'url': 'https://example.com/image.jpg'}, importer.external_media_sheet_name, 2)
+        # Valid: no file extension
+        importer.validate_external_media_type_website({'url': 'https://example.com/some/path?query=x'}, importer.external_media_sheet_name, 2)
+        # Valid: domain-only with TLD
+        importer.validate_external_media_type_website({'url': 'https://example.com'}, importer.external_media_sheet_name, 2)
+
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid website format in URL: https://example.com/image.jpg. URL should not end with a file extension.', importer.errors)
+
+    @test_settings
+    def test_validate_external_media_type_file(self):
+        importer = self.get_zip_importer()
+        importer.load_workbook()
+        importer.errors = []
+
+        # Invalid: no file extension
+        importer.validate_external_media_type_file({'url': 'https://example.com/download/'}, importer.external_media_sheet_name, 2)
+        # Valid: has file extension
+        importer.validate_external_media_type_file({'url': 'https://example.com/download.zip'}, importer.external_media_sheet_name, 2)
+
+        self.assertIn('[Generic Content.xlsx][Sheet:External Media][cell:A3] Invalid file format in URL: https://example.com/download/. URL has to end with a file extension.', importer.errors)
         
         # real world test
         # algaebase entry is : Desmarestia viridis (O.F.Müller) J.V.Lamouroux 1813
@@ -587,4 +727,7 @@ class TestGenericContentZipImporterInvalidData(WithUser, WithMetaApp, TenantTest
         ignorin_importer.load_workbook()
         ignorin_importer.errors = []
         ignorin_importer.validate_listing_in_images_sheet('unlisted.jpg', 'A', 2)
-        self.assertEqual(ignorin_importer.errors, [])
+        self.assertEqual(ignorin_importer.errors, [])
+        
+        
+    

app_kit/views.py

@@ -22,7 +22,7 @@ from .forms import (AddLanguageForm, MetaAppOptionsForm, TagAnyElementForm, Gene
                     CreateGenericContentForm, AddExistingGenericContentForm, TranslateAppForm,
                     EditGenericContentNameForm, ManageContentImageWithTextForm,
                     ZipImportForm, BuildAppForm, CreateAppForm, ManageLocalizedContentImageForm,
-                    TranslateVernacularNamesForm)
+                    TranslateVernacularNamesForm, ManageContentLicenceForm)
 
 from django_tenants.utils import get_tenant_domain_model
 Domain = get_tenant_domain_model()
@@ -53,6 +53,8 @@ from django.db import connection
 # activate permission rules
 from .permission_rules import *
 
+from content_licencing.models import ContentLicenceRegistry
+
 LOCALCOSMOS_COMMERCIAL_BUILDER = getattr(settings, 'LOCALCOSMOS_COMMERCIAL_BUILDER', True)
 
 
@@ -1732,6 +1734,62 @@ class DeleteAppKitExternalMedia(MetaAppMixin, AjaxDeleteView):
         context = super().get_context_data(**kwargs)
         context['external_media_object'] = self.object.content_object
         return context
+
+
+class ListImagesAndLicences(MetaAppMixin, TemplateView):
+    
+    template_name = 'app_kit/list_images_and_licences.html'
+    ajax_template_name = 'app_kit/ajax/list_images_and_licences_content.html'
+    
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        registry_entries = ContentLicenceRegistry.objects.all().order_by('creator_name', 'pk')
+        context['registry_entries'] = registry_entries
+        return context
+
+
+class ManageContentLicence(MetaAppMixin, LicencingFormViewMixin, FormView):
+
+    form_class = ManageContentLicenceForm
+    
+    template_name = 'app_kit/ajax/manage_content_licence.html'
+    
+    @method_decorator(ajax_required)
+    def dispatch(self, request, *args, **kwargs):
+        self.set_instance(**kwargs)
+        return super().dispatch(request, *args, **kwargs)
+    
+    def set_instance(self, **kwargs):
+        self.licence_registry_entry = ContentLicenceRegistry.objects.get(pk=kwargs['registry_entry_id'])
+    
+    def get_form(self, form_class=None):
+        if form_class is None:
+            form_class = self.get_form_class()
+        return form_class(self.licence_registry_entry.model_field, **self.get_form_kwargs())
+        
+    def get_initial(self):
+        initial = super().get_initial()
+
+        licencing_initial = self.get_licencing_initial()
+        initial.update(licencing_initial)
+        
+        return initial
+    
+    
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['registry_entry'] = self.licence_registry_entry
+        return context
+    
+    def form_valid(self, form):
+        if self.licence_registry_entry.content:   
+            self.register_content_licence(form, self.licence_registry_entry.content, self.licence_registry_entry.model_field)
+        
+        context = self.get_context_data(**self.kwargs)
+        context['form'] = form
+        context['success'] = True
+        return self.render_to_response(context)
+    
     
 # LEGAL
 class IdentityMixin:
@@ -1759,4 +1817,5 @@ class PrivacyStatement(IdentityMixin, TemplateView):
     @method_decorator(csrf_exempt)
     @method_decorator(requires_csrf_token)
     def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)
+    

{localcosmos_app_kit-0.9.15.dist-info → localcosmos_app_kit-0.9.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localcosmos_app_kit
-Version: 0.9.15
+Version: 0.9.17
 Summary: LocalCosmos App Kit. Web Portal to build Android and iOS apps
 Home-page: https://github.com/localcosmos/app-kit
 Author: Thomas Uher
@@ -14,7 +14,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENCE
-Requires-Dist: localcosmos-server==0.24.10
+Requires-Dist: localcosmos-server==0.24.11
 Requires-Dist: localcosmos-cordova-builder==0.9.6
 Requires-Dist: django-tenants==3.7.0
 Requires-Dist: django-cleanup==9.0.0