From 5a9b1fed4498afc6fab0a240f66fd8dfb434f4d4 Mon Sep 17 00:00:00 2001 From: Tianyu Liu Date: Tue, 27 Aug 2024 11:01:14 +0200 Subject: [PATCH] rename --- .gitignore | 2 +- src/{cloud_util => components}/__init__.py | 0 src/{recorder/poo.py => components/poo_recorder.py} | 6 +++--- src/helper/poo_recorder/old_poo_record_importer.py | 2 +- src/main.py | 10 +++++----- src/{cloud_util/tests => util}/__init__.py | 0 src/{cloud_util => util}/homeassistant.py | 2 +- src/{cloud_util => util}/mqtt.py | 0 src/{cloud_util => util}/notion.py | 0 src/{recorder => util/tests}/__init__.py | 0 src/{cloud_util => util}/tests/test_ticktick.py | 2 +- src/{cloud_util => util}/ticktick.py | 0 12 files changed, 12 insertions(+), 12 deletions(-) rename src/{cloud_util => components}/__init__.py (100%) rename src/{recorder/poo.py => components/poo_recorder.py} (95%) rename src/{cloud_util/tests => util}/__init__.py (100%) rename src/{cloud_util => util}/homeassistant.py (98%) rename src/{cloud_util => util}/mqtt.py (100%) rename src/{cloud_util => util}/notion.py (100%) rename src/{recorder => util/tests}/__init__.py (100%) rename src/{cloud_util => util}/tests/test_ticktick.py (69%) rename src/{cloud_util => util}/ticktick.py (100%) diff --git a/.gitignore b/.gitignore index 657b979..6db97bd 100644 --- a/.gitignore +++ b/.gitignore @@ -149,4 +149,4 @@ dmypy.json # Cython debug symbols cython_debug/ -temp_data \ No newline at end of file +temp_data/ \ No newline at end of file diff --git a/src/cloud_util/__init__.py b/src/components/__init__.py similarity index 100% rename from src/cloud_util/__init__.py rename to src/components/__init__.py diff --git a/src/recorder/poo.py b/src/components/poo_recorder.py similarity index 95% rename from src/recorder/poo.py rename to src/components/poo_recorder.py index 61d0c47..058e875 100644 --- a/src/recorder/poo.py +++ b/src/components/poo_recorder.py @@ -2,10 +2,10 @@ from datetime import datetime from pydantic import BaseModel -from src.cloud_util.homeassistant import HomeAssistant -from src.cloud_util.mqtt import MQTT -from src.cloud_util.notion import NotionAsync from src.config import Config +from src.util.homeassistant import HomeAssistant +from src.util.mqtt import MQTT +from src.util.notion import NotionAsync class PooRecorder: diff --git a/src/helper/poo_recorder/old_poo_record_importer.py b/src/helper/poo_recorder/old_poo_record_importer.py index 23d8ad0..f36dc57 100644 --- a/src/helper/poo_recorder/old_poo_record_importer.py +++ b/src/helper/poo_recorder/old_poo_record_importer.py @@ -2,8 +2,8 @@ import asyncio import datetime from pathlib import Path -from src.cloud_util.notion import NotionAsync from src.config import Config +from src.util.notion import NotionAsync Config.init() diff --git a/src/main.py b/src/main.py index 1064eb7..257a8f8 100644 --- a/src/main.py +++ b/src/main.py @@ -2,12 +2,12 @@ from contextlib import asynccontextmanager from fastapi import FastAPI -from src.cloud_util.homeassistant import HomeAssistant -from src.cloud_util.mqtt import MQTT -from src.cloud_util.notion import NotionAsync -from src.cloud_util.ticktick import TickTick +from src.components.poo_recorder import PooRecorder from src.config import Config -from src.recorder.poo import PooRecorder +from src.util.homeassistant import HomeAssistant +from src.util.mqtt import MQTT +from src.util.notion import NotionAsync +from src.util.ticktick import TickTick Config.init() diff --git a/src/cloud_util/tests/__init__.py b/src/util/__init__.py similarity index 100% rename from src/cloud_util/tests/__init__.py rename to src/util/__init__.py diff --git a/src/cloud_util/homeassistant.py b/src/util/homeassistant.py similarity index 98% rename from src/cloud_util/homeassistant.py rename to src/util/homeassistant.py index c2643aa..968ee2b 100644 --- a/src/cloud_util/homeassistant.py +++ b/src/util/homeassistant.py @@ -6,8 +6,8 @@ from datetime import datetime, timedelta, timezone import httpx from pydantic import BaseModel -from src.cloud_util.ticktick import TickTick from src.config import Config +from src.util.ticktick import TickTick class HomeAssistant: diff --git a/src/cloud_util/mqtt.py b/src/util/mqtt.py similarity index 100% rename from src/cloud_util/mqtt.py rename to src/util/mqtt.py diff --git a/src/cloud_util/notion.py b/src/util/notion.py similarity index 100% rename from src/cloud_util/notion.py rename to src/util/notion.py diff --git a/src/recorder/__init__.py b/src/util/tests/__init__.py similarity index 100% rename from src/recorder/__init__.py rename to src/util/tests/__init__.py diff --git a/src/cloud_util/tests/test_ticktick.py b/src/util/tests/test_ticktick.py similarity index 69% rename from src/cloud_util/tests/test_ticktick.py rename to src/util/tests/test_ticktick.py index c00452c..96e9c3e 100644 --- a/src/cloud_util/tests/test_ticktick.py +++ b/src/util/tests/test_ticktick.py @@ -1,6 +1,6 @@ import pytest -from cloud_util.ticktick import TickTick +from util.ticktick import TickTick def test_ticktick_begin_auth() -> None: diff --git a/src/cloud_util/ticktick.py b/src/util/ticktick.py similarity index 100% rename from src/cloud_util/ticktick.py rename to src/util/ticktick.py