diff --git a/bumper/__init__.py b/bumper/__init__.py index fae5aad..bcbf2a6 100644 --- a/bumper/__init__.py +++ b/bumper/__init__.py @@ -9,7 +9,7 @@ from typing import Optional from bumper.confserver import ConfServer from bumper.db import * from bumper.models import * -from bumper.mqttserver import MQTTServer, MQTTHelperBot +from bumper.mqttserver import MQTTHelperBot, MQTTServer from bumper.util import get_logger, log_to_stdout from bumper.xmppserver import XMPPServer diff --git a/bumper/confserver.py b/bumper/confserver.py index e8fb066..b5859b3 100644 --- a/bumper/confserver.py +++ b/bumper/confserver.py @@ -11,6 +11,7 @@ from aiohttp import web from bumper import plugins from bumper.models import * + from .util import get_logger diff --git a/bumper/db.py b/bumper/db.py index 09e99ef..d22cd1d 100644 --- a/bumper/db.py +++ b/bumper/db.py @@ -4,18 +4,19 @@ import logging import os from datetime import datetime, timedelta -from tinydb import TinyDB, Query +from tinydb import Query, TinyDB import bumper -from .util import get_logger from bumper.models import ( - VacBotClient, - VacBotDevice, BumperUser, EcoVacsHomeProducts, OAuth, + VacBotClient, + VacBotDevice, ) +from .util import get_logger + bumperlog = get_logger("bumper") diff --git a/bumper/plugins.py b/bumper/plugins.py index e3934f3..dcc0fe8 100644 --- a/bumper/plugins.py +++ b/bumper/plugins.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import asyncio + from aiohttp import web diff --git a/bumper/plugins/bumper_confserver_portal_dim.py b/bumper/plugins/bumper_confserver_portal_dim.py index 9f4aa29..32da818 100644 --- a/bumper/plugins/bumper_confserver_portal_dim.py +++ b/bumper/plugins/bumper_confserver_portal_dim.py @@ -1,14 +1,15 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins -from datetime import datetime, timedelta -import string import random +import string +from datetime import datetime, timedelta + +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * class portal_api_dim(plugins.ConfServerApp): diff --git a/bumper/plugins/bumper_confserver_portal_iot.py b/bumper/plugins/bumper_confserver_portal_iot.py index 85c4e61..330d852 100644 --- a/bumper/plugins/bumper_confserver_portal_iot.py +++ b/bumper/plugins/bumper_confserver_portal_iot.py @@ -1,14 +1,15 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins -from datetime import datetime, timedelta -import string import random +import string +from datetime import datetime, timedelta + +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * class portal_api_iot(plugins.ConfServerApp): diff --git a/bumper/plugins/bumper_confserver_portal_neng.py b/bumper/plugins/bumper_confserver_portal_neng.py index a591006..7ffb7a7 100644 --- a/bumper/plugins/bumper_confserver_portal_neng.py +++ b/bumper/plugins/bumper_confserver_portal_neng.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins from datetime import datetime, timedelta +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * + class portal_api_neng(plugins.ConfServerApp): def __init__(self): diff --git a/bumper/plugins/bumper_confserver_portal_rapp.py b/bumper/plugins/bumper_confserver_portal_rapp.py index 44ca250..0b0ac3b 100644 --- a/bumper/plugins/bumper_confserver_portal_rapp.py +++ b/bumper/plugins/bumper_confserver_portal_rapp.py @@ -1,8 +1,10 @@ #!/usr/bin/env python3 -from aiohttp import web import logging -from bumper.models import * + +from aiohttp import web + from bumper import plugins +from bumper.models import * class api_rapp(plugins.ConfServerApp): diff --git a/bumper/plugins/bumper_confserver_portal_users.py b/bumper/plugins/bumper_confserver_portal_users.py index 3c20182..3118abc 100644 --- a/bumper/plugins/bumper_confserver_portal_users.py +++ b/bumper/plugins/bumper_confserver_portal_users.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins from datetime import datetime, timedelta +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * + class portal_api_users(plugins.ConfServerApp): def __init__(self): diff --git a/bumper/plugins/bumper_confserver_upload_global.py b/bumper/plugins/bumper_confserver_upload_global.py index ed7447e..5ab1aae 100644 --- a/bumper/plugins/bumper_confserver_upload_global.py +++ b/bumper/plugins/bumper_confserver_upload_global.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins -from datetime import datetime, timedelta import os +from datetime import datetime, timedelta + +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * class upload_global(plugins.ConfServerApp): diff --git a/bumper/plugins/bumper_confserver_v1_global_auth.py b/bumper/plugins/bumper_confserver_v1_global_auth.py index ffb94b5..3650647 100644 --- a/bumper/plugins/bumper_confserver_v1_global_auth.py +++ b/bumper/plugins/bumper_confserver_v1_global_auth.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins from datetime import datetime, timedelta +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * + class v1_global_auth(plugins.ConfServerApp): def __init__(self): diff --git a/bumper/plugins/bumper_confserver_v1_private_ad.py b/bumper/plugins/bumper_confserver_v1_private_ad.py index 000d85b..36869e3 100644 --- a/bumper/plugins/bumper_confserver_v1_private_ad.py +++ b/bumper/plugins/bumper_confserver_v1_private_ad.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins from datetime import datetime, timedelta +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * + class v1_private_ad(plugins.ConfServerApp): def __init__(self): diff --git a/bumper/plugins/bumper_confserver_v1_private_campaign.py b/bumper/plugins/bumper_confserver_v1_private_campaign.py index da097a3..d0ce35d 100644 --- a/bumper/plugins/bumper_confserver_v1_private_campaign.py +++ b/bumper/plugins/bumper_confserver_v1_private_campaign.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins from datetime import datetime, timedelta +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * + class v1_private_campaign(plugins.ConfServerApp): def __init__(self): diff --git a/bumper/plugins/bumper_confserver_v1_private_message.py b/bumper/plugins/bumper_confserver_v1_private_message.py index 796a7f7..6bb4eac 100644 --- a/bumper/plugins/bumper_confserver_v1_private_message.py +++ b/bumper/plugins/bumper_confserver_v1_private_message.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins from datetime import datetime, timedelta +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * + class v1_private_message(plugins.ConfServerApp): def __init__(self): diff --git a/bumper/plugins/bumper_confserver_v1_private_shop.py b/bumper/plugins/bumper_confserver_v1_private_shop.py index 855570a..00693d0 100644 --- a/bumper/plugins/bumper_confserver_v1_private_shop.py +++ b/bumper/plugins/bumper_confserver_v1_private_shop.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins from datetime import datetime, timedelta +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * + class v1_private_shop(plugins.ConfServerApp): def __init__(self): diff --git a/bumper/plugins/bumper_confserver_v1_private_user.py b/bumper/plugins/bumper_confserver_v1_private_user.py index a69bb4e..f4c5cce 100644 --- a/bumper/plugins/bumper_confserver_v1_private_user.py +++ b/bumper/plugins/bumper_confserver_v1_private_user.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins from datetime import datetime, timedelta +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * + class v1_private_user(plugins.ConfServerApp): def __init__(self): diff --git a/bumper/plugins/bumper_confserver_v1_private_userSetting.py b/bumper/plugins/bumper_confserver_v1_private_userSetting.py index 2e78594..37bb39d 100644 --- a/bumper/plugins/bumper_confserver_v1_private_userSetting.py +++ b/bumper/plugins/bumper_confserver_v1_private_userSetting.py @@ -1,9 +1,11 @@ #!/usr/bin/env python3 -from aiohttp import web import logging +from datetime import datetime + +from aiohttp import web + import bumper from bumper import plugins -from datetime import datetime class v1_private_userSetting(plugins.ConfServerApp): diff --git a/bumper/plugins/bumper_confserver_v2_private_user.py b/bumper/plugins/bumper_confserver_v2_private_user.py index 981fb03..f076c7c 100644 --- a/bumper/plugins/bumper_confserver_v2_private_user.py +++ b/bumper/plugins/bumper_confserver_v2_private_user.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import asyncio -from aiohttp import web -from bumper import plugins import logging -import bumper -from bumper.models import * -from bumper import plugins from datetime import datetime, timedelta +from aiohttp import web + +import bumper +from bumper import plugins +from bumper.models import * + class v2_private_user(plugins.ConfServerApp): def __init__(self): diff --git a/bumper/util.py b/bumper/util.py index ce1359b..3ab30ab 100644 --- a/bumper/util.py +++ b/bumper/util.py @@ -2,7 +2,6 @@ import logging import os import sys from logging.handlers import RotatingFileHandler - from typing import MutableMapping logformat = logging.Formatter( diff --git a/bumper/xmppserver.py b/bumper/xmppserver.py index 8dbd5cc..72a386e 100644 --- a/bumper/xmppserver.py +++ b/bumper/xmppserver.py @@ -1,14 +1,14 @@ #!/usr/bin/env python3 +import asyncio +import base64 import logging import re +import ssl import uuid import xml.etree.ElementTree as ET -import base64 -import ssl -import bumper -import asyncio +import bumper from bumper import get_logger xmppserverlog = get_logger("xmppserver") diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..67524cb --- /dev/null +++ b/setup.cfg @@ -0,0 +1,25 @@ +[flake8] +# To work with Black +max-line-length = 88 +# E501: line too long +# W503: Line break occurred before a binary operator +# E203: Whitespace before ':' +# D202 No blank lines allowed after function docstring +# D105 Missing docstring in magic method +# D107 Missing docstring in __init__ +ignore = + E501, + W503, + E203, + D202, + D105, + D107 + +# Disable unused imports for __init__.py +per-file-ignores = + */__init__.py: F401 + +[isort] +# https://github.com/timothycrosley/isort +# https://github.com/timothycrosley/isort/wiki/isort-Settings +profile = black \ No newline at end of file diff --git a/tests/test_confserver.py b/tests/test_confserver.py index 9673618..b53cdbb 100644 --- a/tests/test_confserver.py +++ b/tests/test_confserver.py @@ -1,18 +1,20 @@ -from unittest import mock -import bumper import asyncio -import pytest -import os +import datetime import json -import tinydb -import pytest_aiohttp -import pytest_asyncio -import datetime, time -from aiohttp import web import logging -from testfixtures import LogCapture +import os +import time +from unittest import mock from unittest.mock import MagicMock +import pytest +import pytest_aiohttp +import pytest_asyncio +import tinydb +from aiohttp import web +from testfixtures import LogCapture + +import bumper from tests.const import HOST, MQTT_PORT diff --git a/tests/test_db.py b/tests/test_db.py index 2f306c5..2d28eb4 100644 --- a/tests/test_db.py +++ b/tests/test_db.py @@ -1,12 +1,14 @@ #!/usr/bin/env python3 -import bumper -from bumper.models import VacBotClient, VacBotDevice, BumperUser, EcoVacsHomeProducts -from tinydb import TinyDB, Query -from tinydb.storages import MemoryStorage -from datetime import datetime, timedelta -import os import json import logging +import os +from datetime import datetime, timedelta + +from tinydb import Query, TinyDB +from tinydb.storages import MemoryStorage + +import bumper +from bumper.models import BumperUser, EcoVacsHomeProducts, VacBotClient, VacBotDevice def test_db_path(): diff --git a/tests/test_init.py b/tests/test_init.py index e8e18a5..044fe2b 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -1,14 +1,16 @@ -from unittest import mock -from unittest.mock import patch -import pytest -from tinydb.storages import MemoryStorage -from tinydb import TinyDB, Query -import bumper +import asyncio +import json import os import platform -import json -import asyncio +from unittest import mock +from unittest.mock import patch + +import pytest from testfixtures import LogCapture +from tinydb import Query, TinyDB +from tinydb.storages import MemoryStorage + +import bumper def test_strtobool(): diff --git a/tests/test_mqttserver.py b/tests/test_mqttserver.py index 87eab72..7135773 100644 --- a/tests/test_mqttserver.py +++ b/tests/test_mqttserver.py @@ -1,17 +1,18 @@ -from unittest import mock -import bumper import asyncio -import pytest -import os import json -import tinydb -import pytest_asyncio -import xml.etree.ElementTree as ET -import hbmqtt import logging -from testfixtures import LogCapture +import os import time +import xml.etree.ElementTree as ET +from unittest import mock +import hbmqtt +import pytest +import pytest_asyncio +import tinydb +from testfixtures import LogCapture + +import bumper from tests.const import HOST, MQTT_PORT diff --git a/tests/test_xmppserver.py b/tests/test_xmppserver.py index 8be9144..c6cf681 100644 --- a/tests/test_xmppserver.py +++ b/tests/test_xmppserver.py @@ -1,15 +1,17 @@ -from unittest import mock -import bumper import asyncio -import pytest -import os import json -import tinydb -import pytest_asyncio -import xml.etree.ElementTree as ET +import os import socket -from testfixtures import LogCapture import ssl +import xml.etree.ElementTree as ET +from unittest import mock + +import pytest +import pytest_asyncio +import tinydb +from testfixtures import LogCapture + +import bumper def return_send_data(data, *args, **kwargs):