From 27b07d25dab1f15a8668d854d04f2659aa15e321 Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Wed, 18 Mar 2020 11:22:04 +0100
Subject: [PATCH] Moved config to base module.
---
api.py | 2 +-
aura.py | 2 +-
guru.py | 2 +-
libraries/base/logger.py | 2 +-
libraries/database/broadcasts.py | 2 +-
{libraries => modules}/base/config.py | 0
testing/connection_tester.py | 2 +-
testing/test.py | 2 +-
testing/tests.py | 2 +-
9 files changed, 8 insertions(+), 8 deletions(-)
rename {libraries => modules}/base/config.py (100%)
diff --git a/api.py b/api.py
index 84f42ddf..bdcfd578 100644
--- a/api.py
+++ b/api.py
@@ -44,7 +44,7 @@ from apispec_webframeworks.flask import FlaskPlugin
from werkzeug.exceptions import HTTPException, default_exceptions, Aborter
from libraries.base.logger import AuraLogger
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
from libraries.database.broadcasts import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
diff --git a/aura.py b/aura.py
index 0fe04a73..27e5e401 100755
--- a/aura.py
+++ b/aura.py
@@ -32,7 +32,7 @@ from flask_sqlalchemy import SQLAlchemy
# from sqlalchemy.ext.declarative import declarative_base
from libraries.base.logger import AuraLogger
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
# from modules.monitoring.diskspace_watcher import DiskSpaceWatcher
diff --git a/guru.py b/guru.py
index 290fb031..afbae622 100755
--- a/guru.py
+++ b/guru.py
@@ -34,7 +34,7 @@ from argparse import ArgumentParser
# own libs
from modules.cli_tool.padavan import Padavan
from libraries.exceptions.auraexceptions import PlaylistException
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
class Guru():
diff --git a/libraries/base/logger.py b/libraries/base/logger.py
index b9d15e41..ec02e00f 100644
--- a/libraries/base/logger.py
+++ b/libraries/base/logger.py
@@ -20,7 +20,7 @@
import logging
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
class AuraLogger():
diff --git a/libraries/database/broadcasts.py b/libraries/database/broadcasts.py
index 63950c83..1f6aad43 100644
--- a/libraries/database/broadcasts.py
+++ b/libraries/database/broadcasts.py
@@ -39,7 +39,7 @@ from sqlalchemy.orm import relationship
from sqlalchemy import create_engine
from libraries.enum.auraenumerations import ScheduleEntryType
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
from modules.base.simpleutil import SimpleUtil
diff --git a/libraries/base/config.py b/modules/base/config.py
similarity index 100%
rename from libraries/base/config.py
rename to modules/base/config.py
diff --git a/testing/connection_tester.py b/testing/connection_tester.py
index d946e656..d508df70 100644
--- a/testing/connection_tester.py
+++ b/testing/connection_tester.py
@@ -28,7 +28,7 @@ import json
from modules.communication.liquidsoap.communicator import LiquidSoapCommunicator
#from libraries.database.broadcasts import ScheduleEntry
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
# ------------------------------------------------------------------------------------------ #
diff --git a/testing/test.py b/testing/test.py
index adee1286..3374253e 100644
--- a/testing/test.py
+++ b/testing/test.py
@@ -6,7 +6,7 @@ from datetime import datetime
# libraries.base
from libraries.base.logger import AuraLogger
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
# libraries.database
from libraries.database.broadcasts import Schedule, TrackService
# libraries.security
diff --git a/testing/tests.py b/testing/tests.py
index 42eef174..1e05f954 100755
--- a/testing/tests.py
+++ b/testing/tests.py
@@ -32,7 +32,7 @@ import decimal
from modules.communication.liquidsoap.communicator import LiquidSoapCommunicator
from modules.monitoring.diskspace_watcher import DiskSpaceWatcher
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
from libraries.database.broadcasts import Schedule, ScheduleEntry
from modules.scheduling.scheduler import AuraScheduler, AuraCalendarService
--
GitLab