Merged in lua-meta (pull request #22)

nginx lua meta

Author: yvess

django/Makefile

@@ -1,6 +1,6 @@
 GEMEINDESCAN_WEBUI_DJANGO=0.3.4
 DOCKER_EXEC=$(shell command -v docker > /dev/null && echo "docker-compose exec django")
-all: run-tests run-tests-dev
+all: dev run-tests run-tests-dev
 .PHONY: all
 default: dev
 
@@ -25,6 +25,9 @@ adminuser:
 collectstatic:
 	$(DOCKER_EXEC) python3 manage.py collectstatic --noinput
 
+symlinks:
+	$(DOCKER_EXEC) sh -c "cd /var/services/django; ln -s media downloads"
+
 migrate:
 	$(DOCKER_EXEC) python3 manage.py migrate
 	make collectstatic
@@ -45,6 +48,7 @@ import-gemeinden-json:
 	$(DOCKER_EXEC) rm ./tmp/gemeinden.geojson
 
 init:
+	make symlinks
 	make migrate
 	make adminuser
 	make import-gemeinden-json

django/gsmap/models.py

@@ -2,6 +2,7 @@
 import string
 from enum import IntFlag
 import requests
+import os
 from django.utils import timezone
 from django.db.models.signals import post_save
 from django.dispatch import receiver
@@ -11,11 +12,21 @@
 from django.contrib.sites.models import Site
 from django.utils.html import format_html
 from django.conf import settings
+from django.core.files.base import ContentFile
+from django.core.files.storage import FileSystemStorage
 from sortedm2m.fields import SortedManyToManyField
-from sorl.thumbnail import ImageField
+from sorl.thumbnail import ImageField, get_thumbnail
 from gsuser.models import User
 
 
+class OverwriteStorage(FileSystemStorage):
+    def get_available_name(self, name, max_length=None):
+        # If the filename already exists, remove it as if it was a true file system
+        if self.exists(name):
+            os.remove(os.path.join(settings.MEDIA_ROOT, name))
+        return name
+
+
 class Municipality(models.Model):
     class Meta:
         verbose_name_plural = 'municipalities'
@@ -146,8 +157,9 @@ def thumbnail(self):
 
     def get_absolute_link(self):
         domain = Site.objects.get_current().domain
+        proto = 'https' if settings.USE_HTTPS else 'http'
         return format_html(
-            f'<a href="//{domain}{self.get_absolute_url()}" target="_blank">'
+            f'<a href="{proto}://{domain}{self.get_absolute_url()}" target="_blank">'
             f'{domain}{self.get_absolute_url()}</a>'
         )
     get_absolute_link.short_description = "Snapshot Url"
@@ -183,6 +195,18 @@ def test_exists(pk):
 
         super().save(*args, **kwargs)
 
+    def image_twitter(self):
+        return get_thumbnail(
+            self.screenshot, '1200x630',
+            crop='bottom', format='PNG'
+        )
+
+    def image_facebook(self):
+        return get_thumbnail(
+            self.screenshot, '1200x630',
+            crop='bottom', format='PNG'
+        )
+
     def __str__(self):
         if self.municipality:
             return f'{self.municipality.fullname}, {self.title}, ' \
@@ -193,9 +217,10 @@ def __str__(self):
 
 @receiver(post_save, sender=Snapshot)
 def save_screenshot_handler(sender, **kwargs):
+    instance = kwargs.get('instance')
+
     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'
@@ -213,9 +238,27 @@ def save_screenshot():
             finally:
                 # always reconnect signal
                 post_save.connect(save_screenshot_handler, sender=Snapshot)
+
+    def save_meta(storage):
+        domain = Site.objects.get_current().domain
+        proto = 'https' if settings.USE_HTTPS else 'http'
+        meta = f'''name="og:title" content="{instance.title}"
+name="og:url" content="{instance.get_absolute_link()}"
+name="og:image" content="{proto}://{domain}/{instance.image_facebook()}"
+name="twitter:image" content="{proto}://{domain}/{instance.image_twitter()}"
+'''
+        storage.save(f'snapshot-meta/{instance.id}.html', ContentFile(meta))
+
     if hasattr(settings, 'SAVE_SCREENSHOT_ENABLED') and settings.SAVE_SCREENSHOT_ENABLED is True:
         save_screenshot()
 
+    if instance.screenshot:
+        storage = OverwriteStorage()
+        if instance.permission is int(SnapshotPermission.PUBLIC):
+            save_meta(storage)
+        else:
+            storage.delete(f'snapshot-meta/{instance.id}.html')
+
 
 class Workspace(models.Model):
     class Meta:
@@ -234,9 +277,10 @@ class Meta:
     snapshots = SortedManyToManyField(Snapshot)
 
     def get_absolute_link(self):
+        proto = 'https' if settings.USE_HTTPS else 'http'
         domain = Site.objects.get_current().domain
         return format_html(
-            f'<a href="//{domain}{self.get_absolute_url()}" target="_blank">'
+            f'<a href="{proto}://{domain}{self.get_absolute_url()}" target="_blank">'
             f'{domain}{self.get_absolute_url()}</a>'
         )
     get_absolute_link.short_description = "Workspace Url"
@@ -245,7 +289,6 @@ def get_absolute_url(self):
         first_id = self.snapshots.all().first().id
         return f'/{self.id}/{first_id}/'
 
-
     def save(self, *args, **kwargs):
         def test_exists(pk):
             if self.__class__.objects.filter(pk=pk):

django/gsmap/schema.py

@@ -8,7 +8,6 @@
 from graphene_django.types import DjangoObjectType
 from graphene_django.filter import DjangoFilterConnectionField
 from graphene_django.converter import convert_django_field
-from sorl.thumbnail import get_thumbnail
 from gsmap.models import Municipality, Snapshot, SnapshotPermission, Workspace
 
 
@@ -71,18 +70,10 @@ def resolve_thumbnail(self, info):
         return self.thumbnail
 
     def resolve_screenshot_facebook(self, info):
-        screenshot = get_thumbnail(self.screenshot,
-                                   '1200x630',
-                                   crop='bottom',
-                                   format='PNG')
-        return screenshot
+        return self.image_facebook()
 
     def resolve_screenshot_twitter(self, info):
-        screenshot = get_thumbnail(self.screenshot,
-                                   '1200x600',
-                                   crop='bottom',
-                                   format='PNG')
-        return screenshot
+        return self.image_twitter()
 
 
 class MunicipalityNode(DjangoObjectType):

docker-compose.yml

@@ -36,7 +36,6 @@ services:
     ports:
       # - "9222:9222" # debug chrome
       - "8079:8079" # snapshost service
-      - "8080:8080" # vue
       - "10001:10001" # vscode
 
   django:
@@ -63,18 +62,19 @@ services:
     links:
      - pdb
     ports:
-      - "8081:8081"
       - "10002:10002" # vscode
     # entrypoint: tail
     # command: -f /dev/null
 
-  # static:
-  #   image: nginx:1.16-alpine
-  #   hostname: static
-  #   volumes:
-  #     - ./etc/nginx:/etc/nginx/conf.d
-  #     - var-gemeindescan-webui:/var/services
-  #   links:
-  #     - django
-  #   ports:
-  #     - 80:80
+  www:
+    image: openresty/openresty:1.15.8.3-alpine
+    hostname: www
+    volumes:
+      - ./etc/nginx:/etc/nginx/conf.d
+      - var-gemeindescan-webui:/var/services
+    links:
+      - django
+      - vue
+    ports:
+      - 8080:80
+    command: tail -f /dev/null

etc/nginx/lang.lua

@@ -0,0 +1,87 @@
+-------------------------------------------------------------------------------
+-- HTTP Accept-Language header handler                                       --
+-- @originalAuthor: [email protected]                                   --
+-- @originalRepository: https://github.com/fghibellini/nginx-http-accept-lang--
+-- @modifiedBy: [email protected]                                    --
+-- @gist: https://gist.github.com/mauron85/47ed1075262d9e020fe2              --
+-- @license: MIT                                                             --
+-- @requires:                                                                --
+-- @description:                                                             --
+--     returns language with greatest quality                                --
+--     value according to RFC:2616                                           --
+-- @example configuration:                                                   --
+--                                                                           --
+--     server {                                                              --
+--         listen 8080 default_server;                                       --
+--         index index.html index.htm;                                       --
+--         server_name localhost;                                            --
+--                                                                           --
+--         root usr/share/nginx/html;                                        --
+--                                                                           --
+--         location = / {                                                    --
+--             # $lang_sup holds comma separated languages supported by site --
+--             # if no match first will be used (en) in this case            --
+--             set $lang_sup = "en,sk"                                       --
+--             set_by_lua_file $lang_accept /etc/nginx/lang.lua $lang_sup;   --
+--             rewrite (.*) $scheme://$server_name/$lang_accept$1;           --
+--         }                                                                 --
+--     }                                                                     --
+--                                                                           --
+-------------------------------------------------------------------------------
+
+function inTable(tbl, item)
+    for key, value in pairs(tbl) do
+        if value == item then return key end
+    end
+    return false
+end
+
+function string:split( inSplitPattern, outResults )
+   if not outResults then
+      outResults = { }
+   end
+   local theStart = 1
+   local theSplitStart, theSplitEnd = string.find( self, inSplitPattern, theStart )
+   while theSplitStart do
+      table.insert( outResults, string.sub( self, theStart, theSplitStart-1 ) )
+      theStart = theSplitEnd + 1
+      theSplitStart, theSplitEnd = string.find( self, inSplitPattern, theStart )
+   end
+   table.insert( outResults, string.sub( self, theStart ) )
+   return outResults
+end
+
+local lang_sup = {"en"}
+if ( ngx.arg[1] ~= nil ) then
+    lang_sup = ngx.arg[1]:split(",")
+end
+
+local lang_header = ngx.var.http_accept_language
+if ( lang_header == nil ) then
+    return lang_sup[1]
+end
+
+local cleaned = ngx.re.sub(lang_header, "^.*:", "")
+local options = {}
+local iterator, err = ngx.re.gmatch(cleaned, "\\s*([a-z]+(?:-[a-z])*)\\s*(?:;q=([0-9]+(.[0-9]*)?))?\\s*(,|$)", "i")
+for m, err in iterator do
+    local lang = m[1]
+    local priority = 1
+    if m[2] ~= nil then
+        priority = tonumber(m[2])
+        if priority == nil then
+        priority = 1
+        end
+    end
+    table.insert(options, {lang, priority})
+end
+
+table.sort(options, function(a,b) return b[2] < a[2] end)
+
+for index, lang in pairs(options) do
+    if inTable(lang_sup, lang[1]) then
+        return lang[1]
+    end
+end
+
+return lang_sup[1]