Update FKF URL to MOHU Budapest

Author: amaximus

README.md

@@ -4,15 +4,15 @@
 
 # FKF Budapest Garbage Collection custom component for Home Assistant
 
-This custom component provides garbage collection schedule from FKF Budapest Department of Public
-for a configurable address. It also supports green garbage collection schedule (FKF Budapest treats
+This custom component provides garbage collection schedule from MOHU Budapest Department of Public
+for a configurable address. It also supports green garbage collection schedule (MOHU Budapest treats
 it differently)
 
 The state of the sensor will be the number of days to the first upcoming garbage collection date.
 
 The sensor will also report in an attribute the status of the latest data fetch.
 
-The FKF Garbage Collection sensors can also be added to appear in HASS calendar. Calendar entries will be prefixed
+The MOHU Budapest Garbage Collection sensors can also be added to appear in HASS calendar. Calendar entries will be prefixed
 with the friendly name of the sensor to support and distinguish schedule for multiple such sensors/addresses. Translation of
 the calendar entries is also available through the calendar_lang option; so far only Hungarian and English are supported.
 Language tags should follow [IANA subtag registry](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry).
@@ -24,8 +24,8 @@ search for <i>FKF Budapest Garbage</i> in the Integrations.<br />
 Sensors of this platform should be configured as per below information.
 
 #### Configuration:
-Define sensors with the following configuration parameters according to [FKF Hulladéknaptár](https://www.fkf.hu/hulladeknaptar/)
-for Budapest or [FKF Hulladéknaptár](https://www.fkf.hu/hulladeknaptar-budaors) for Budaörs.<br />
+Define sensors with the following configuration parameters according to [MOHU Budapest Hulladéknaptár](https://mohubudapest.hu/hulladeknaptar/)
+for Budapest or [MOHU Budapest Hulladéknaptár](https://mohubudapest.hu/hulladeknaptar-budaors) for Budaörs.<br />
 
 ---
 | Name | Optional | `Default` | Description |
@@ -36,15 +36,15 @@ for Budapest or [FKF Hulladéknaptár](https://www.fkf.hu/hulladeknaptar-budaors
 | publicplace | **N** | - | Name of public place |
 | housenr | **Y** | `1` | House number (only for Budapest) |
 | offsetdays | **Y** | `0` | Optional offset for the number of days left (usually 1) |
-| calendar | **Y** | `false` | Show FKF schedule in calendar |
+| calendar | **Y** | `false` | Show MOHU Budapest schedule in calendar |
 | calendar_lang | **Y** | `en` | Language to display garbage type in calendar |
 | green | **Y** | `false` | Include green garbage schedule as well |
 | greencolor | **Y** | `` | Use map color for districts that have different green garbage collecting days per region (see below) |
 ---
 
-For green garbage collection, `greencolor`, if defined, takes precedence over `publicplace`-`housenr`. Color name can be fetched from the source of the webpage `www.fkf.hu/kerti-zoldhulladek-korzetek-<districts_roman_number>-kerulet` and is one of these: `kek`, `lila`, `narancs`, `rozsaszin`, `sarga`. `greencolor` is not necessary if the whole district has green garbage collection on one specific day. `greencolor` has to be defined for Budapest districts.
+For green garbage collection, `greencolor`, if defined, takes precedence over `publicplace`-`housenr`. Color name can be fetched from the source of the webpage `mohubudapest.hu/kerti-zoldhulladek-korzetek-<districts_roman_number>-kerulet` and is one of these: `kek`, `lila`, `narancs`, `rozsaszin`, `sarga`. `greencolor` is not necessary if the whole district has green garbage collection on one specific day. `greencolor` has to be defined for Budapest districts.
 
-Green garbage collection related attribute will not be included when the green garbage collection service is suspended during winter time ([FKF Zöldhulladék](https://www.fkf.hu/kerti-zoldhulladek-gyujtes)).
+Green garbage collection related attribute will not be included when the green garbage collection service is suspended during winter time ([MOHU Budapest Zöldhulladék](https://mohubudapest.hu/kerti-zoldhulladek-gyujtes)).
 
 #### Example
 ```

custom_components/fkf-garbage-collection/const.py

@@ -2,3 +2,4 @@
 CALENDAR_PLATFORM = "calendar"
 DOMAIN = "fkf_garbage_collection"
 SENSOR_PLATFORM = "sensor"
+URL = "mohubudapest.hu"

custom_components/fkf-garbage-collection/manifest.json

@@ -5,7 +5,7 @@
   "dependencies": [],
   "config_flow": false,
   "codeowners": ["@amaximus"],
-  "version": "0.8.10",
+  "version": "0.9.0",
   "iot_class": "cloud_polling",
   "requirements": ["lxml", "voluptuous"]
 }

custom_components/fkf-garbage-collection/sensor.py

@@ -22,13 +22,14 @@
     CALENDAR_NAME,
     CALENDAR_PLATFORM,
     SENSOR_PLATFORM,
+    URL,
 )
 
 REQUIREMENTS = [ ]
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_ATTRIBUTION = "Data provided by fkf.hu"
+CONF_ATTRIBUTION = "Data provided by " + URL
 CONF_ZIPCODE = 'zipcode'
 CONF_PUBLICPLACE = 'publicplace'
 CONF_HOUSENR = 'housenr'
@@ -164,7 +165,7 @@ async def async_get_fkfdata(self):
       _LOGGER.debug("greencolor parameter not set for " + self._publicplace)
 
     if self._green and self._zipcode != ZIPCODE_BUDAORS:
-        url = 'https://www.fkf.hu/kerti-zoldhulladek-korzetek-' + _getRomanDistrictFromZip(self._zipcode) + '-kerulet'
+        url = 'https://' + URL + '/kerti-zoldhulladek-korzetek-' + _getRomanDistrictFromZip(self._zipcode) + '-kerulet'
         for i in range(MAX_RETRIES):
           try:
               async with _session.get(url, timeout=HTTP_TIMEOUT) as response:
@@ -215,22 +216,22 @@ async def async_get_fkfdata(self):
             if self._next_green_days == None:
               self._next_green_days = green_day_diff
 
-    url = 'https://www.fkf.hu/'
+    url = 'https://' + URL + '/'
     try:
         async with _session.get(url, timeout=HTTP_TIMEOUT) as response:
             r = await response.text()
             cookie = response.headers['Set-Cookie']
     except (aiohttp.ContentTypeError, aiohttp.ServerDisconnectedError, asyncio.TimeoutError):
-        _LOGGER.debug("Connection error to fkf.hu")
+        _LOGGER.debug("Connection error to " + URL)
 
     if self._zipcode == ZIPCODE_BUDAORS:
-      url = 'https://www.fkf.hu/hulladeknaptar-budaors'
+      url = 'https://' + URL + '/hulladeknaptar-budaors'
       payload_val = [self._publicplace]
       payload_key = ["publicPlace"]
       october_par = ["ajax/budaorsResults"]
       october_hnd = ["onSearch"]
     else:
-      url = 'https://www.fkf.hu/hulladeknaptar'
+      url = 'https://' + URL + '/hulladeknaptar'
       payload_val = [self._zipcode, self._publicplace, self._housenr]
       payload_key = ["district","publicPlace","houseNumber"]
       october_par = ["ajax/publicPlaces","ajax/houseNumbers","ajax/calSearchResults"]

info.md

@@ -4,15 +4,15 @@
 
 # FKF Budapest Garbage Collection custom component for Home Assistant
 
-This custom component provides garbage collection schedule from FKF Budapest Department of Public
-for a configurable address. It also supports green garbage collection schedule (FKF Budapest treats
+This custom component provides garbage collection schedule from MOHU Budapest Department of Public
+for a configurable address. It also supports green garbage collection schedule (MOHU Budapest treats
 it differently)
 
 The state of the sensor will be the number of days to the first upcoming garbage collection date.
 
 The sensor will also report in an attribute the status of the latest data fetch.
 
-The FKF Garbage Collection sensors can also be added to appear in HASS calendar. Calendar entries will be prefixed
+The MOHU Budapest Garbage Collection sensors can also be added to appear in HASS calendar. Calendar entries will be prefixed
 with the friendly name of the sensor to support and distinguish schedule for multiple such sensors/addresses. Translation of
 the calendar entries is also available through the calendar_lang option; so far only Hungarian and English are supported.
 Language tags should follow [IANA subtag registry](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry).
@@ -24,8 +24,8 @@ search for <i>FKF Budapest Garbage</i> in the Integrations.<br />
 Sensors of this platform should be configured as per below information.
 
 #### Configuration:
-Define sensors with the following configuration parameters according to [FKF Hulladéknaptár](https://www.fkf.hu/hulladeknaptar/)
-for Budapest or [FKF Hulladéknaptár](https://www.fkf.hu/hulladeknaptar-budaors) for Budaörs.<br />
+Define sensors with the following configuration parameters according to [MOHU Budapest Hulladéknaptár](https://mohubudapest.hu/hulladeknaptar/)
+for Budapest or [MOHU Budapest Hulladéknaptár](https://mohubudapest.hu/hulladeknaptar-budaors) for Budaörs.<br />
 
 ---
 | Name | Optional | `Default` | Description |
@@ -36,15 +36,15 @@ for Budapest or [FKF Hulladéknaptár](https://www.fkf.hu/hulladeknaptar-budaors
 | publicplace | **N** | - | Name of public place |
 | housenr | **Y** | `1` | House number (only for Budapest) |
 | offsetdays | **Y** | `0` | Optional offset for the number of days left (usually 1) |
-| calendar | **Y** | `false` | Show FKF schedule in calendar |
+| calendar | **Y** | `false` | Show MOHU Budapest schedule in calendar |
 | calendar_lang | **Y** | `en` | Language to display garbage type in calendar |
 | green | **Y** | `false` | Include green garbage schedule as well |
 | greencolor | **Y** | `` | Use map color for districts that have different green garbage collecting days per region (see below) |
 ---
 
-For green garbage collection, `greencolor`, if defined, takes precedence over `publicplace`-`housenr`. Color name can be fetched from the source of the webpage `www.fkf.hu/kerti-zoldhulladek-korzetek-<districts_roman_number>-kerulet` and is one of these: `kek`, `lila`, `narancs`, `rozsaszin`, `sarga`. `greencolor` is not necessary if the whole district has green garbage collection on one specific day. `greencolor` has to be defined for Budapest districts.
+For green garbage collection, `greencolor`, if defined, takes precedence over `publicplace`-`housenr`. Color name can be fetched from the source of the webpage `mohubudapest.hu/kerti-zoldhulladek-korzetek-<districts_roman_number>-kerulet` and is one of these: `kek`, `lila`, `narancs`, `rozsaszin`, `sarga`. `greencolor` is not necessary if the whole district has green garbage collection on one specific day. `greencolor` has to be defined for Budapest districts.
 
-Green garbage collection related attribute will not be included when the green garbage collection service is suspended during winter time ([FKF Zöldhulladék](https://www.fkf.hu/kerti-zoldhulladek-gyujtes)).
+Green garbage collection related attribute will not be included when the green garbage collection service is suspended during winter time ([MOHU Budapest Zöldhulladék](https://mohubudapest.hu/kerti-zoldhulladek-gyujtes)).
 
 #### Example
 ```

tracker.json

@@ -1,8 +1,8 @@
 {
   "fkf-garbage-collection": {
-    "version": "0.8.3",
-    "updated_at": "2024-03-25",
+    "version": "0.9.0",
+    "updated_at": "2025-01-16",
     "visit_repo": "https://github.com/amaximus/fkf-garbage-collection",
-    "changelog": "https://github.com/amaximus/fkf-garbage-collection/releases/0.8.3"
+    "changelog": "https://github.com/amaximus/fkf-garbage-collection/releases/0.9.0"
   }
 }