From ace509b2cf2abdaa367a7379a23aa486a9cfc9fa Mon Sep 17 00:00:00 2001
From: Bastien Le Querrec <blq@laquadrature.net>
Date: Tue, 19 Mar 2024 17:49:21 +0100
Subject: [PATCH] pref*: applique unquote sur l'ensemble de l'URL, pas
seulement le nom de fichier
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sinon ça donne des URL cassées lorsqu'elles sont déjà échappées. Ex : https://mamot.fr/@SurveillanceSpotter/112123206997390704
---
RAAspotter_ppparis.py | 8 ++++----
RAAspotter_pref06.py | 3 ++-
RAAspotter_pref13.py | 1 +
RAAspotter_pref35.py | 3 ++-
RAAspotter_pref62.py | 3 ++-
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/RAAspotter_ppparis.py b/RAAspotter_ppparis.py
index 39e8aa6..0e38dbc 100644
--- a/RAAspotter_ppparis.py
+++ b/RAAspotter_ppparis.py
@@ -40,10 +40,10 @@ class RAAspotter_ppparis(RAAspotter):
else:
url = a['href']
- name = a.find('span').get_text()
- date = datetime.datetime.strptime(a.find('div', class_="field--type-datetime").get_text().strip(), '%d/%m/%Y')
-
- filename = unquote(url.split('/')[-1])
+ url = unquote(url)
+ name = a.find('span').get_text()
+ date = datetime.datetime.strptime(a.find('div', class_="field--type-datetime").get_text().strip(), '%d/%m/%Y')
+ filename = url.split('/')[-1]
raa = RAAspotter.RAA(url, date, name, filename)
elements.append(raa)
diff --git a/RAAspotter_pref06.py b/RAAspotter_pref06.py
index 8acb864..9778d9a 100644
--- a/RAAspotter_pref06.py
+++ b/RAAspotter_pref06.py
@@ -88,9 +88,10 @@ class RAAspotter_pref06(RAAspotter):
else:
url = a['href']
+ url = unquote(url)
name = a.get_text().strip()
date = datetime.datetime.strptime(card.find('p', class_='fr-card__detail').get_text().replace('Publié le ', '').strip(), '%d/%m/%Y')
- filename = unquote(url.split('/')[-1])
+ filename = url.split('/')[-1]
raa = RAAspotter.RAA(url, date, name, filename)
elements.append(raa)
diff --git a/RAAspotter_pref13.py b/RAAspotter_pref13.py
index 0eae5f5..c4bc1a9 100644
--- a/RAAspotter_pref13.py
+++ b/RAAspotter_pref13.py
@@ -49,6 +49,7 @@ class RAAspotter_pref13(RAAspotter):
else:
url = a['href']
+ url = unquote(url)
name = a.find('span').previous_sibling.replace('Télécharger ', '').strip()
date = datetime.datetime.strptime(a.find('span').get_text().split(' - ')[-1].strip(), '%d/%m/%Y')
filename = unquote(url.split('/')[-1])
diff --git a/RAAspotter_pref35.py b/RAAspotter_pref35.py
index 23ac266..8594847 100644
--- a/RAAspotter_pref35.py
+++ b/RAAspotter_pref35.py
@@ -49,9 +49,10 @@ class RAAspotter_pref35(RAAspotter):
else:
url = a['href']
+ url = unquote(url)
name = a.find('span').previous_sibling.replace('Télécharger ', '').strip()
date = datetime.datetime.strptime(a.find('span').get_text().split(' - ')[-1].strip(), '%d/%m/%Y')
- filename = unquote(url.split('/')[-1])
+ filename = url.split('/')[-1]
raa = RAAspotter.RAA(url, date, name, filename)
elements.append(raa)
diff --git a/RAAspotter_pref62.py b/RAAspotter_pref62.py
index 983371c..5bdaaf0 100644
--- a/RAAspotter_pref62.py
+++ b/RAAspotter_pref62.py
@@ -81,9 +81,10 @@ class RAAspotter_pref62(RAAspotter):
else:
url = a['href']
+ url = unquote(url)
name = a.find('span').previous_sibling.replace('Télécharger ', '').strip()
date = datetime.datetime.strptime(a.find('span').get_text().split(' - ')[-1].strip(), '%d/%m/%Y')
- filename = unquote(url.split('/')[-1])
+ filename = url.split('/')[-1]
raa = RAAspotter.RAA(url, date, name, filename)
elements.append(raa)
--
GitLab