Commit 7ad944ba authored by David Trattnig's avatar David Trattnig
Browse files

Move DB model to base.

parent 2109127b
......@@ -41,7 +41,7 @@ from werkzeug.exceptions import HTTPException, default_exceptions, Ab
from modules.base.logger import AuraLogger
from modules.base.config import AuraConfig
from modules.database.model import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
from modules.base.models import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
......
......@@ -22,8 +22,7 @@ import json
from modules.base.enum import RedisChannel
from modules.base.utils import TerminalColors
from modules.cli.redis.adapter import ClientRedisAdapter, ServerRedisAdapter
from modules.cli.redis.messenger import RedisMessenger
from modules.database.model import AuraDatabaseModel
from modules.base.models import AuraDatabaseModel
class Padavan:
......
......@@ -28,7 +28,7 @@ from datetime import datetime
from modules.base.enum import PlaylistType
from modules.base.utils import SimpleUtil
from modules.database.model import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
from modules.base.models import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
from modules.scheduling.calender_fetcher import CalendarFetcher
......
......@@ -30,7 +30,7 @@ import threading
from operator import attrgetter
from datetime import datetime, timedelta
from modules.database.model import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
from modules.base.models import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
from modules.base.exceptions import NoActiveScheduleException, NoActiveEntryException, LoadSourceException
from modules.base.enum import Channel, ChannelType, TimerType, TransitionType, EntryQueueState, EntryPlayState
from modules.base.utils import SimpleUtil, TerminalColors, EngineUtil
......
......@@ -23,7 +23,6 @@ import urllib
import json
from modules.core.engine import SoundSystem
#from modules.database.model import ScheduleEntry
from modules.base.config import AuraConfig
......
......@@ -24,13 +24,10 @@ import validators
from datetime import datetime
# libraries.base
from modules.base.logger import AuraLogger
from modules.base.config import AuraConfig
# libraries.database
from modules.database.model import Schedule, TrackService
# libraries.security
# from libraries.security.user import AuraUser
from modules.base.models import Schedule, TrackService
# modules
from modules.core.engine import SoundSystem
......
......@@ -26,7 +26,7 @@ import decimal
from modules.core.engine import SoundSystem
from modules.base.config import AuraConfig
from modules.database.model import Schedule, ScheduleEntry
from modules.base.models import Schedule, ScheduleEntry
from modules.scheduling.scheduler import AuraScheduler, AuraCalendarService
def alchemyencoder(obj):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment