From 335d90773c94b337b09e4b420336026d120f30df Mon Sep 17 00:00:00 2001 From: David Trattnig <david.trattnig@o94.at> Date: Thu, 7 May 2020 09:44:05 +0200 Subject: [PATCH] Moved to modules. --- engine-api.py | 2 +- modules/cli_tool/padavan.py | 2 +- modules/core/state.py | 2 +- libraries/database/broadcasts.py => modules/database/model.py | 0 modules/scheduling/calendar.py | 2 +- modules/scheduling/scheduler.py | 2 +- testing/connection_tester.py | 2 +- testing/test.py | 2 +- testing/tests.py | 4 ++-- 9 files changed, 9 insertions(+), 9 deletions(-) rename libraries/database/broadcasts.py => modules/database/model.py (100%) diff --git a/engine-api.py b/engine-api.py index 60af93da..0ee13358 100644 --- a/engine-api.py +++ b/engine-api.py @@ -39,7 +39,7 @@ from werkzeug.exceptions import HTTPException, default_exceptions, Ab from modules.base.logger import AuraLogger from modules.base.config import AuraConfig -from libraries.database.broadcasts import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService +from modules.database.model import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService diff --git a/modules/cli_tool/padavan.py b/modules/cli_tool/padavan.py index a81033f3..a96f5156 100644 --- a/modules/cli_tool/padavan.py +++ b/modules/cli_tool/padavan.py @@ -28,7 +28,7 @@ from modules.base.enum import RedisChannel from modules.base.utils import TerminalColors from modules.communication.redis.adapter import ClientRedisAdapter, ServerRedisAdapter from modules.communication.redis.messenger import RedisMessenger -from libraries.database.broadcasts import AuraDatabaseModel +from modules.database.model import AuraDatabaseModel class Padavan: diff --git a/modules/core/state.py b/modules/core/state.py index c188695e..d7d5980f 100644 --- a/modules/core/state.py +++ b/modules/core/state.py @@ -23,7 +23,7 @@ from collections import deque from modules.base.exceptions import NoActiveEntryException from modules.base.utils import SimpleUtil -from libraries.database.broadcasts import SingleEntry, SingleEntryMetaData, PlaylistEntry, PlaylistEntryMetaData, TrackService +from modules.database.model import SingleEntry, SingleEntryMetaData, PlaylistEntry, PlaylistEntryMetaData, TrackService diff --git a/libraries/database/broadcasts.py b/modules/database/model.py similarity index 100% rename from libraries/database/broadcasts.py rename to modules/database/model.py diff --git a/modules/scheduling/calendar.py b/modules/scheduling/calendar.py index 951c6d73..1c309059 100644 --- a/modules/scheduling/calendar.py +++ b/modules/scheduling/calendar.py @@ -34,7 +34,7 @@ import logging from mutagen.flac import FLAC from datetime import datetime, timedelta -from libraries.database.broadcasts import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData +from modules.database.model import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData from modules.communication.redis.messenger import RedisMessenger from modules.scheduling.calender_fetcher import CalendarFetcher diff --git a/modules/scheduling/scheduler.py b/modules/scheduling/scheduler.py index 912b8d7e..f8f422c3 100644 --- a/modules/scheduling/scheduler.py +++ b/modules/scheduling/scheduler.py @@ -34,7 +34,7 @@ import threading from operator import attrgetter -from libraries.database.broadcasts import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, SingleEntry, SingleEntryMetaData, TrackService +from modules.database.model import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, SingleEntry, SingleEntryMetaData, TrackService from modules.base.exceptions import NoActiveScheduleException, NoActiveEntryException from modules.base.enum import Channel, ChannelType, TimerType, TransitionType, EntryQueueState diff --git a/testing/connection_tester.py b/testing/connection_tester.py index c156b7d2..4ab6c171 100644 --- a/testing/connection_tester.py +++ b/testing/connection_tester.py @@ -27,7 +27,7 @@ import logging import json from modules.core.engine import SoundSystem -#from libraries.database.broadcasts import ScheduleEntry +#from modules.database.model import ScheduleEntry from modules.base.config import AuraConfig diff --git a/testing/test.py b/testing/test.py index 06e047ac..2dc9c7fe 100644 --- a/testing/test.py +++ b/testing/test.py @@ -8,7 +8,7 @@ from datetime import datetime from modules.base.logger import AuraLogger from modules.base.config import AuraConfig # libraries.database -from libraries.database.broadcasts import Schedule, TrackService +from modules.database.model import Schedule, TrackService # libraries.security # from libraries.security.user import AuraUser diff --git a/testing/tests.py b/testing/tests.py index b69e64ff..31f19763 100755 --- a/testing/tests.py +++ b/testing/tests.py @@ -24,7 +24,7 @@ # along with engine. If not, see <http://www.gnu.org/licenses/>. # -from libraries.database.broadcasts import * + import json import logging import sqlalchemy @@ -32,7 +32,7 @@ import decimal from modules.core.engine import SoundSystem from modules.base.config import AuraConfig -from libraries.database.broadcasts import Schedule, ScheduleEntry +from modules.database.model import Schedule, ScheduleEntry from modules.scheduling.scheduler import AuraScheduler, AuraCalendarService def alchemyencoder(obj): -- GitLab