diff --git a/libraries/database/broadcasts.py b/libraries/database/broadcasts.py index 137892df42411d8bb5678a6a7ce9ad0887a60aa4..605b54ab024e34c6f1235a8dea54cae3aa63b31f 100644 --- a/libraries/database/broadcasts.py +++ b/libraries/database/broadcasts.py @@ -38,7 +38,7 @@ from sqlalchemy.orm import relationship from sqlalchemy import create_engine -from libraries.enum.auraenumerations import Channel, ChannelType +from modules.base.enum import Channel, ChannelType from modules.base.config import AuraConfig from modules.base.simpleutil import SimpleUtil, EngineUtil diff --git a/libraries/enum/auraenumerations.py b/modules/base/enum.py similarity index 90% rename from libraries/enum/auraenumerations.py rename to modules/base/enum.py index bf0466f76f43775f5eed8fe4f7a1deb2a29b3956..5b73c2c7c6ed36eb98a15bf4c0e1c3f193244fb6 100644 --- a/libraries/enum/auraenumerations.py +++ b/modules/base/enum.py @@ -25,24 +25,6 @@ from enum import Enum -class TerminalColors(Enum): - HEADER = "\033[95m" - - RED = "\033[31m" - GREEN = "\033[32m" - ORANGE = "\033[33m" - BLUE = "\033[34m" - PINK = "\033[35m" - CYAN = "\033[36m" - - WARNING = "\033[31m" - FAIL = "\033[41m" - - BOLD = "\033[1m" - UNDERLINE = "\033[4m" - - ENDC = "\033[0m" - class RedisChannel(Enum): STANDARD = "aura" diff --git a/modules/cli_tool/padavan.py b/modules/cli_tool/padavan.py index dc60cbdf9942f996f690e80ac64fc04d5267e2c0..ed2b2807529abc925b18809fb5d28d24e82f8b67 100644 --- a/modules/cli_tool/padavan.py +++ b/modules/cli_tool/padavan.py @@ -24,7 +24,7 @@ import json -from libraries.enum.auraenumerations import RedisChannel, TerminalColors +from modules.base.enum import RedisChannel, TerminalColors from modules.communication.redis.adapter import ClientRedisAdapter, ServerRedisAdapter from modules.communication.redis.messenger import RedisMessenger from libraries.database.broadcasts import AuraDatabaseModel diff --git a/modules/communication/liquidsoap/client.py b/modules/communication/liquidsoap/client.py index afb451dd3c5e340fe82f13733d10545e5f0b3a0d..3595de0f36b9af84f5c3ef1aaa4588695c5c1638 100644 --- a/modules/communication/liquidsoap/client.py +++ b/modules/communication/liquidsoap/client.py @@ -30,7 +30,7 @@ import logging from multiprocessing import Lock from modules.base.exceptions import LQConnectionError -from libraries.enum.auraenumerations import TerminalColors +from modules.base.simpleutil import TerminalColors """ LiquidSoapClient Class diff --git a/modules/communication/liquidsoap/playerclient.py b/modules/communication/liquidsoap/playerclient.py index 49a1a10116ea5e698933a36c035d58f8fc54375d..36830b907cd6ee84fbc6ec48b4e9fa7cb4fca05f 100644 --- a/modules/communication/liquidsoap/playerclient.py +++ b/modules/communication/liquidsoap/playerclient.py @@ -22,7 +22,7 @@ # along with engine. If not, see <http://www.gnu.org/licenses/>. # -from libraries.enum.auraenumerations import Channel, ChannelType +from modules.base.enum import Channel, ChannelType from modules.communication.liquidsoap.client import LiquidSoapClient diff --git a/modules/communication/redis/adapter.py b/modules/communication/redis/adapter.py index b450a197b390839005d0221da3288470734b8aff..f51b2b3c1fe7b842827a0df37a37cf9d06758e96 100644 --- a/modules/communication/redis/adapter.py +++ b/modules/communication/redis/adapter.py @@ -35,7 +35,7 @@ from modules.communication.redis.messenger import RedisMessenger # from modules.communication.connection_tester import ConnectionTester from libraries.database.statestore import RedisStateStore from modules.base.exceptions import RedisConnectionException -from libraries.enum.auraenumerations import RedisChannel, TerminalColors, FallbackType +from modules.base.enum import RedisChannel, TerminalColors, FallbackType # ------------------------------------------------------------------------------------------ # diff --git a/modules/communication/redis/messenger.py b/modules/communication/redis/messenger.py index 98cb9909cce7a3b0350d9c578dd9b72e54075202..e6f2f7144f70da06bf647c01b6f84bfe11c8c537 100644 --- a/modules/communication/redis/messenger.py +++ b/modules/communication/redis/messenger.py @@ -29,7 +29,7 @@ import datetime from libraries.database.statestore import RedisStateStore from modules.communication.mail import AuraMailer from modules.base.exceptions import PlaylistException -from libraries.enum.auraenumerations import RedisChannel +from modules.base.enum import RedisChannel from modules.base.logger import AuraLogger """