Skip to content

[EdfPricesBridge] Update bridge due to dom changes #4832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
floviolleau wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[EdfPricesBridge] Update bridge due to dom changes #4832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e4778d
[EdfPricesBridge] Update bridge due to dom changes
floviolleau Nov 22, 2025
02b5a2d
[EdfPricesBridge] Lint
floviolleau Nov 22, 2025
f1f9d31
[EdfPricesBridge] Lint
floviolleau Nov 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions bridges/AtmoOccitanieBridge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,12 @@ public function collectData()
$indice = $lastRecommendationsDom->find('.current-indice .indice div', 0)->innertext;
$informationDescriptionMessage = $lastRecommendationsDom->find('.current-indice .description p', 0)->innertext;

$message = "$generalMessage L'indice est de $indice/10. $informationDescriptionMessage. $recommendationsMessage";
$message = "$generalMessage L'indice est de " . (6 - $indice) . "/6. $informationDescriptionMessage. $recommendationsMessage";
$city = $this->getInput('city');

$item['uri'] = $uri;
$today = date('d/m/Y');
$item['title'] = "Bulletin de l'air du $today pour la ville : $city.";
//$item['title'] .= ' Retrouvez plus d\'informations en allant sur atmo-occitanie.org #QualiteAir. ' . $message;
$item['title'] .= ' #QualiteAir. ' . $message;
$item['author'] = 'floviolleau';
$item['content'] = $message;
Expand Down
41 changes: 35 additions & 6 deletions bridges/EdfPricesBridge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,25 @@ class EdfPricesBridge extends BridgeAbstract
];
const CACHE_TIMEOUT = 7200; // 2h

private function removeEmojisAndSpecialSpaces(string $text): string
{
// This regex covers most common emoji ranges in Unicode
$regex = '/[\x{1F600}-\x{1F64F}' . // Emoticons
'\x{1F300}-\x{1F5FF}' . // Misc Symbols and Pictographs
'\x{1F680}-\x{1F6FF}' . // Transport and Map
'\x{1F700}-\x{1F77F}' . // Alchemical Symbols
'\x{1F780}-\x{1F7FF}' . // Geometric Shapes Extended
'\x{1F800}-\x{1F8FF}' . // Supplemental Arrows-C
'\x{1F900}-\x{1F9FF}' . // Supplemental Symbols and Pictographs
'\x{1FA00}-\x{1FA6F}' . // Chess Symbols, Symbols and Pictographs Extended-A
'\x{1FA70}-\x{1FAFF}' . // Symbols and Pictographs Extended-B
'\x{2600}-\x{26FF}' . // Misc symbols
'\x{2700}-\x{27BF}' . // Dingbats
']+/u';

return preg_replace($regex, '', str_replace(' ', '', $text));
}

/**
* @param simple_html_dom $html
* @param string $contractUri
Expand All @@ -47,15 +66,22 @@ class EdfPricesBridge extends BridgeAbstract
private function tempo(simple_html_dom $html, string $contractUri, int $power): void
{
// colors
$ulDom = $html->find('#tarif-de-l-offre-tempo-edf-template-date-now-y', 0)->nextSibling()->nextSibling()->nextSibling();
$elementsDom = $ulDom->find('li');
$ulDom = $html->find('#les-tarifs-du-kwh-tempo-pour-les-differentes-couleurs-et-heures-de-la-journee', 0)->nextSibling();
$elementsDom = $ulDom->children;

if ($elementsDom && count($elementsDom) === 3) {
// price per kWh is same for all powers
foreach ($elementsDom as $elementDom) {
$item = [];

$matches = [];
preg_match_all('/Jour (.*) : Heures (.*) : (.*) € \/ Heures (.*) : (.*) €/um', $elementDom->innertext, $matches, PREG_SET_ORDER, 0);
preg_match_all(
'/Jour (.*) :.*?Heures (.*) : (.*).*?€.*?Heures (.*) : (.*).*?€/um',
$this->removeEmojisAndSpecialSpaces($elementDom->plaintext),
$matches,
PREG_SET_ORDER,
0
);

// for tempo contract we have 2x3 colors
if ($matches && count($matches[0]) === 6) {
Expand All @@ -74,7 +100,7 @@ private function tempo(simple_html_dom $html, string $contractUri, int $power):
}

// add subscription power info
$tablePrices = $ulDom->nextSibling()->nextSibling()->nextSibling()->find('.table--responsive', 0);
$tablePrices = $ulDom->nextSibling()->nextSibling();
$this->addSubscriptionPowerInfo($tablePrices, $contractUri, $power, 7);
}

Expand Down Expand Up @@ -186,14 +212,17 @@ private function addSubscriptionPowerInfo(simple_html_dom_node $tablePrices, str
{
$prices = $tablePrices->find('.table tbody tr');

// 8 contracts for tempo: 6, 9, 12, 15, 18, 24, 30 and 36 kVA
// 7 contracts for tempo: 6, 9, 12, 15, 18, 30 and 36 kVA
// 9 contracts for base: 3, 6, 9, 12, 15, 18, 24, 30 and 36 kVA
// 8 contracts for HPHC: 6, 9, 12, 15, 18, 24, 30 and 36 kVA
// 5 contracts for EJP: 9, 12, 15, 18 and 36 kVA
if ($prices && count($prices) === $numberOfPrices) {
$powerFound = false;
foreach ($prices as $price) {
$powerText = $price->firstChild()->firstChild()->innertext;
$powerText = trim($price->children(0)->innertext);
if ($price->children(0)->children(0)) {
$powerText = trim($price->children(0)->children(0)->innertext);
}
$powerValue = (int)substr($powerText, 0, strpos($powerText, ' kVA'));

if ($powerValue !== $power) {
Expand Down