From ae549af6e8621449d52838f6bae90f00db77aba5 Mon Sep 17 00:00:00 2001
From: bittles <bauern.sc@gmail.com>
Date: Wed, 4 Jan 2023 14:52:22 -0500
Subject: [PATCH] consistent naming, version bump

---
 custom_components/ecovacs/__init__.py                      | 7 +++----
 custom_components/ecovacs/manifest.json                    | 2 +-
 custom_components/ecovacs/{sucksbumper.py => sucks.py}     | 4 ++--
 .../ecovacs/{mqtt_ecovacs.py => sucks_mqtt.py}             | 1 -
 .../ecovacs/{xmpp_ecovacs.py => sucks_xmpp.py}             | 0
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename custom_components/ecovacs/{sucksbumper.py => sucks.py} (99%)
 rename custom_components/ecovacs/{mqtt_ecovacs.py => sucks_mqtt.py} (99%)
 rename custom_components/ecovacs/{xmpp_ecovacs.py => sucks_xmpp.py} (100%)

diff --git a/custom_components/ecovacs/__init__.py b/custom_components/ecovacs/__init__.py
index 51b56c6..850b9a0 100644
--- a/custom_components/ecovacs/__init__.py
+++ b/custom_components/ecovacs/__init__.py
@@ -13,15 +13,14 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType
+import homeassistant.helpers.config_validation as cv
 import voluptuous as vol
-#just included the modified sucks in component
-from .sucksbumper import EcoVacsAPI, VacBot
+#use local sucks
+from .sucks import EcoVacsAPI, VacBot
 from .const import (
     ECOVACS_DEVICES,
     DOMAIN,
-
     CONF_CONTINENT,
     LOGGER
 )
diff --git a/custom_components/ecovacs/manifest.json b/custom_components/ecovacs/manifest.json
index 3b3118e..365aae9 100644
--- a/custom_components/ecovacs/manifest.json
+++ b/custom_components/ecovacs/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "ecovacs",
   "name": "Ecovacs Bumper",
-  "version": "1.3.7",
+  "version": "1.4.0",
   "documentation": "https://github.com/bittles/ha_ecovacs_bumper",
   "issue_tracker": "https://github.com/bittles/ha_ecovacs_bumper/issues",
   "requirements": ["sleekxmppfs==1.4.1", "requests>=2.18", "pycryptodome>=3.4", "pycountry-convert>=0.5", "paho-mqtt>=1.4", "stringcase>=1.2"],
diff --git a/custom_components/ecovacs/sucksbumper.py b/custom_components/ecovacs/sucks.py
similarity index 99%
rename from custom_components/ecovacs/sucksbumper.py
rename to custom_components/ecovacs/sucks.py
index cefe450..f42223d 100644
--- a/custom_components/ecovacs/sucksbumper.py
+++ b/custom_components/ecovacs/sucks.py
@@ -7,8 +7,8 @@
 from sleekxmppfs.xmlstream import ET
 from sleekxmppfs.exceptions import XMPPError
 
-from .mqtt_ecovacs import EcoVacsIOTMQ
-from .xmpp_ecovacs import EcoVacsXMPP
+from .sucks_mqtt import EcoVacsIOTMQ
+from .sucks_xmpp import EcoVacsXMPP
 
 from .const import LOGGER
 from .sucks_const import *
diff --git a/custom_components/ecovacs/mqtt_ecovacs.py b/custom_components/ecovacs/sucks_mqtt.py
similarity index 99%
rename from custom_components/ecovacs/mqtt_ecovacs.py
rename to custom_components/ecovacs/sucks_mqtt.py
index 953fc39..09ec826 100644
--- a/custom_components/ecovacs/mqtt_ecovacs.py
+++ b/custom_components/ecovacs/sucks_mqtt.py
@@ -1,5 +1,4 @@
 import time
-
 import sched
 import threading
 import ssl
diff --git a/custom_components/ecovacs/xmpp_ecovacs.py b/custom_components/ecovacs/sucks_xmpp.py
similarity index 100%
rename from custom_components/ecovacs/xmpp_ecovacs.py
rename to custom_components/ecovacs/sucks_xmpp.py