From e595e8d47ffcb9cc596fda8cc14b391ae31fabb6 Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 5 Sep 2022 21:11:59 +0200 Subject: [PATCH 1/3] track download --- zds/middlewares/matomomiddleware.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zds/middlewares/matomomiddleware.py b/zds/middlewares/matomomiddleware.py index 89a66b6e60..5f22be782f 100644 --- a/zds/middlewares/matomomiddleware.py +++ b/zds/middlewares/matomomiddleware.py @@ -19,6 +19,8 @@ tracked_status_code = [200] tracked_methods = ["GET"] excluded_paths = ["/contenus", "/mp", "/munin", "/api", "/static", "/media"] +# we track only public download +download_paths = ["/pdf/", "/epub/"] def _background_process(queue: Queue): @@ -37,6 +39,8 @@ def _background_process(queue: Queue): "m": data["datetime"].minute, "s": data["datetime"].second, } + if any(part in data["client_url"] for part in download_paths): + params["download"] = data["client_url"] if "search" in data: params["search"] = data["search"] params["search_cat"] = data["search_cat"] From a6efcf00ca9605ec9d72226f1c20be7b8e48f080 Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 5 Sep 2022 21:37:33 +0200 Subject: [PATCH 2/3] track suggestion --- templates/tutorialv2/contributions.html | 4 ++-- templates/tutorialv2/includes/content_item.part.html | 2 +- .../tutorialv2/includes/content_suggestion.part.html | 2 +- zds/middlewares/matomomiddleware.py | 12 +++++++++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/templates/tutorialv2/contributions.html b/templates/tutorialv2/contributions.html index bc400e3306..2638c36182 100644 --- a/templates/tutorialv2/contributions.html +++ b/templates/tutorialv2/contributions.html @@ -50,7 +50,7 @@

{% for contribution_tutorial in contribution_tutorials %} - {% include "tutorialv2/includes/content_item.part.html" with show_description=True public_content=contribution_tutorial.public_version content=contribution_tutorial%} + {% include "tutorialv2/includes/content_item.part.html" with show_description=True public_content=contribution_tutorial.public_version content=contribution_tutorial source="&src=contributor"%} {% endfor %}
@@ -63,7 +63,7 @@

{% for contribution_article in contribution_articles %} - {% include "tutorialv2/includes/content_item.part.html" with show_description=True public_content=contribution_article.public_version content=contribution_article show_reactions=True %} + {% include "tutorialv2/includes/content_item.part.html" with show_description=True public_content=contribution_article.public_version content=contribution_article show_reactions=True source="&src=contributor" %} {% endfor %}
diff --git a/templates/tutorialv2/includes/content_item.part.html b/templates/tutorialv2/includes/content_item.part.html index 911363f7ed..afaaf98a72 100644 --- a/templates/tutorialv2/includes/content_item.part.html +++ b/templates/tutorialv2/includes/content_item.part.html @@ -76,7 +76,7 @@

- + {{ content_title }}

diff --git a/templates/tutorialv2/includes/content_suggestion.part.html b/templates/tutorialv2/includes/content_suggestion.part.html index b41a865cd6..953d262f61 100644 --- a/templates/tutorialv2/includes/content_suggestion.part.html +++ b/templates/tutorialv2/includes/content_suggestion.part.html @@ -4,7 +4,7 @@

Ces contenus pourraient vous intéresser

{% for content_suggestion in content_suggestions %} - {% include "tutorialv2/includes/content_item.part.html" with public_content=content_suggestion.suggestion.public_version show_description=True show_reactions=True %} + {% include "tutorialv2/includes/content_item.part.html" with public_content=content_suggestion.suggestion.public_version show_description=True show_reactions=True source="&src=suggestion" %} {% endfor %} {% for i in col_number|times %}
diff --git a/zds/middlewares/matomomiddleware.py b/zds/middlewares/matomomiddleware.py index 5f22be782f..1e7618bfff 100644 --- a/zds/middlewares/matomomiddleware.py +++ b/zds/middlewares/matomomiddleware.py @@ -21,6 +21,7 @@ excluded_paths = ["/contenus", "/mp", "/munin", "/api", "/static", "/media"] # we track only public download download_paths = ["/pdf/", "/epub/"] +content_elements = ["tutoriels", "articles", "billets"] def _background_process(queue: Queue): @@ -41,7 +42,15 @@ def _background_process(queue: Queue): } if any(part in data["client_url"] for part in download_paths): params["download"] = data["client_url"] - if "search" in data: + elif ( + any("/" + part + "/" in data["client_url"] for part in content_elements) + and "src" in data["get_params"] + ): + params["e_c"] = data["get_params"]["src"] + params["e_a"] = "clicked" + params["e_n"] = list("/" + part + "/" in data["client_url"] for part in content_elements)[0] + params["e_v"] = 1 + elif "search" in data: params["search"] = data["search"] params["search_cat"] = data["search_cat"] params["search_count"] = data["search_count"] @@ -94,6 +103,7 @@ def matomo_track(self, request, search_data=None): "datetime": datetime.now().time(), "r_path": request.path, "address_ip": get_client_ip(request), + "get_params": dict(**requests.GET), } if search_data: tracking_params.update(search_data) From f9a8e6e1d5f407b49eda717062cc9f43277359d6 Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 5 Sep 2022 21:50:35 +0200 Subject: [PATCH 3/3] lint --- zds/middlewares/matomomiddleware.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/zds/middlewares/matomomiddleware.py b/zds/middlewares/matomomiddleware.py index 1e7618bfff..320bf19549 100644 --- a/zds/middlewares/matomomiddleware.py +++ b/zds/middlewares/matomomiddleware.py @@ -42,10 +42,7 @@ def _background_process(queue: Queue): } if any(part in data["client_url"] for part in download_paths): params["download"] = data["client_url"] - elif ( - any("/" + part + "/" in data["client_url"] for part in content_elements) - and "src" in data["get_params"] - ): + elif any("/" + part + "/" in data["client_url"] for part in content_elements) and "src" in data["get_params"]: params["e_c"] = data["get_params"]["src"] params["e_a"] = "clicked" params["e_n"] = list("/" + part + "/" in data["client_url"] for part in content_elements)[0]