Merge branch 'reichelt_provider'

Author: jbtronics

.docker/symfony.conf

@@ -44,6 +44,7 @@
         PassEnv PROVIDER_MOUSER_KEY PROVIDER_MOUSER_SEARCH_OPTION PROVIDER_MOUSER_SEARCH_LIMIT PROVIDER_MOUSER_SEARCH_WITH_SIGNUP_LANGUAGE
         PassEnv PROVIDER_LCSC_ENABLED PROVIDER_LCSC_CURRENCY
         PassEnv PROVIDER_OEMSECRETS_KEY PROVIDER_OEMSECRETS_COUNTRY_CODE PROVIDER_OEMSECRETS_CURRENCY PROVIDER_OEMSECRETS_ZERO_PRICE PROVIDER_OEMSECRETS_SET_PARAM PROVIDER_OEMSECRETS_SORT_CRITERIA
+        PassEnv PROVIDER_REICHELT_ENABLED PROVIDER_REICHELT_CURRENCY PROVIDER_REICHELT_COUNTRY PROVIDER_REICHELT_LANGUAGE PROVIDER_REICHELT_INCLUDE_VAT
         PassEnv EDA_KICAD_CATEGORY_DEPTH
 
         # For most configuration files from conf-available/, which are

.env

@@ -216,6 +216,22 @@ PROVIDER_OEMSECRETS_SET_PARAM=1
 #If unset or set to any other value, no sorting is performed.
 PROVIDER_OEMSECRETS_SORT_CRITERIA=C
 
+
+# Reichelt provider:
+# Reichelt.com offers no official API, so this info provider webscrapes the website to extract info
+# It could break at any time, use it at your own risk
+
+# We dont require an API key for Reichelt, just set this to 1 to enable Reichelt support
+PROVIDER_REICHELT_ENABLED=0
+# The country to get prices for
+PROVIDER_REICHELT_COUNTRY=DE
+# The language to get results in (en, de, fr, nl, pl, it, es)
+PROVIDER_REICHELT_LANGUAGE=en
+# Include VAT in prices (set to 1 to include VAT, 0 to exclude VAT)
+PROVIDER_REICHELT_INCLUDE_VAT=1
+# The currency to get prices in (only for countries with countries other than EUR)
+PROVIDER_REICHELT_CURRENCY=EUR
+
 ##################################################################################
 # EDA integration related settings
 ##################################################################################

composer.json

@@ -54,6 +54,8 @@
         "symfony/apache-pack": "^1.0",
         "symfony/asset": "6.4.*",
         "symfony/console": "6.4.*",
+        "symfony/css-selector": "6.4.*",
+        "symfony/dom-crawler": "6.4.*",
         "symfony/dotenv": "6.4.*",
         "symfony/expression-language": "6.4.*",
         "symfony/flex": "^v2.3.1",
@@ -104,7 +106,6 @@
         "rector/rector": "^2.0.4",
         "roave/security-advisories": "dev-latest",
         "symfony/browser-kit": "6.4.*",
-        "symfony/css-selector": "6.4.*",
         "symfony/debug-bundle": "6.4.*",
         "symfony/maker-bundle": "^1.13",
         "symfony/phpunit-bridge": "6.4.*",

composer.lock

@@ -72,9 +72,9 @@ public static function parseValueField(string $name, string|float $value, ?strin
                 group: $group);
         }
 
-        //If the attribute contains "..." or a tilde we assume it is a range
-        if (preg_match('/(\.{3}|~)/', $value) === 1) {
-            $parts = preg_split('/\s*(\.{3}|~)\s*/', $value);
+        //If the attribute contains ".." or "..." or a tilde we assume it is a range
+        if (preg_match('/(\.{2,3}|~)/', $value) === 1) {
+            $parts = preg_split('/\s*(\.{2,3}|~)\s*/', $value);
             if (count($parts) === 2) {
                 //Try to extract number and unit from value (allow leading +)
                 if ($unit === null || trim($unit) === '') {

src/Services/InfoProviderSystem/DTOs/ParameterDTO.php

@@ -33,8 +33,8 @@
 final class PartInfoRetriever
 {
 
-    private const CACHE_DETAIL_EXPIRATION = 60 * 60 * 24 * 4; // 4 days
-    private const CACHE_RESULT_EXPIRATION = 60 * 60 * 24 * 7; // 7 days
+    private const CACHE_DETAIL_EXPIRATION = 5; // 4 days
+    private const CACHE_RESULT_EXPIRATION = 5; // 7 days
 
     public function __construct(private readonly ProviderRegistry $provider_registry,
         private readonly DTOtoEntityConverter $dto_to_entity_converter, private readonly CacheInterface $partInfoCache)

src/Services/InfoProviderSystem/PartInfoRetriever.php

@@ -76,7 +76,7 @@ private function queryDetail(string $id): PartDetailDTO
                 'Cookie' => new Cookie('currencyCode', $this->currency)
             ],
             'query' => [
-                'productCode' => $id,
+                'prductCode' => $id,
             ],
         ]);