Merge branch 'screenshot' into stage

Author: yvess

django/gsmap/admin.py

@@ -4,9 +4,9 @@
 from django_json_widget.widgets import JSONEditorWidget
 from django.utils.html import mark_safe
 from django.contrib import messages
+import requests
 from sortedm2m_filter_horizontal_widget.forms import SortedFilteredSelectMultiple
 from gsmap.models import Municipality, Snapshot, Workspace
-import requests
 
 
 class MunicipalityAdmin(admin.OSMGeoAdmin):
@@ -48,28 +48,44 @@ class SnapshotAdmin(admin.OSMGeoAdmin):
         },
     }
 
-    list_display = ('id', 'title', 'municipality', 'permission', 'is_showcase',
-                    'created', 'modified')
+    list_display = ('id', 'thumbnail_list_image', 'title', 'municipality',
+                    'permission', 'is_showcase', 'created', 'modified')
     list_filter = ('is_showcase', 'permission')
     search_fields = ['title', 'municipality__name', 'municipality__canton']
 
-    def _image_display(self, url, width=None):
-        return mark_safe(
-            '<a href="{url}" target="_blank">'
-            '<img src="{url}" width="{width}" height={height} />'
-            '</a>'.format(url=url, width=width, height='auto'))
+    def _image_display(self, obj, width=None, link=True):
+        if hasattr(obj, 'url'):
+            html = '<img src="{url}" width="{width}" height={height} />'.format(
+                url=obj.url, width=width, height='auto'
+            )
+            if link:
+                html = '<a href="{url}" target="_blank">{html}</a>'.format(url=obj.url, html=html)
+            return mark_safe(html)
+        else:
+            return '-'
 
     def screenshot_generated_image(self, obj):
-        return self._image_display(obj.screenshot_generated.url, width=300)
+        return self._image_display(obj.screenshot_generated, width=300)
 
     def thumbnail_generated_image(self, obj):
-        return self._image_display(obj.thumbnail_generated.url, width=200)
+        return self._image_display(obj.thumbnail_generated, width=200)
+
+    def thumbnail_list_image(self, obj):
+        if obj.thumbnail_generated or obj.thumbnail_manual:
+            return self._image_display(
+                obj.thumbnail_generated or obj.thumbnail_manual,
+                width=50, link=False
+            )
+        else:
+            return '-'
+
+    thumbnail_list_image.short_description = 'thumbnail'
 
     def screenshot_manual_image(self, obj):
-        return self._image_display(obj.screenshot_manual.url, width=300)
+        return self._image_display(obj.screenshot_manual, width=300)
 
     def thumbnail_manual_image(self, obj):
-        return self._image_display(obj.thumbnail_manual.url, width=200)
+        return self._image_display(obj.thumbnail_manual, width=200)
 
 
     def save_model(self, request, obj, form, change):

django/gsmap/models.py

@@ -160,7 +160,7 @@ def create_screenshot_file(self, is_thumbnail=False):
         if is_thumbnail:
             url += '&thumbnail'
             path = 'snapshot-thumbnails'
-        response = requests.get(url, timeout=(5, 30))
+        response = requests.get(url, timeout=(10, 50))
         date_suffix = timezone.now().strftime("%Y-%m-%d_%H-%M-%SZ")
         screenshot_file = SimpleUploadedFile(
             f'{path}/{self.pk}_{date_suffix}.png',
@@ -196,7 +196,9 @@ def save_screenshot():
         post_save.disconnect(save_screenshot_handler, sender=Snapshot)
         instance = kwargs.get('instance')
         # only create snapshot if data changed
-        if instance.data_changed(['data', 'screenshot_generated', 'thumbnail_generated']):
+        if instance.data_changed([
+                'data', 'screenshot_generated', 'thumbnail_generated'
+        ]) or not bool(instance.thumbnail_generated):
             if not 'resources' in instance.data:
                 return
             try:

django/main/urls.py

@@ -1,8 +1,8 @@
 from django.conf import settings
 from django.contrib import admin
 from django.urls import path
-from graphene_django.views import GraphQLView
 from django.views.decorators.csrf import csrf_exempt
+from graphene_django.views import GraphQLView
 
 urlpatterns = [
     path('gmanage/', admin.site.urls),