From 85cb788c8494f4336e0ae66b9143ea20bb85ee25 Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Wed, 27 Jan 2021 22:17:34 +0100
Subject: [PATCH] Flattening source. #72
---
run.py | 2 +-
src/{core => }/channels.py | 2 +-
src/{core => }/client/client.py | 0
src/{core => }/client/connector.py | 2 +-
src/{core => }/client/playerclient.py | 2 +-
src/{core => }/control.py | 2 +-
src/core/__init__.py | 1 -
src/{core => }/engine.py | 22 +++++++++++-----------
src/{core => }/events.py | 0
src/{core => }/mixer.py | 0
src/plugins/trackservice.py | 4 ++--
src/{core => }/resources.py | 0
src/scheduling/fallback.py | 8 ++++----
src/scheduling/models.py | 2 +-
src/scheduling/programme.py | 2 +-
src/scheduling/scheduler.py | 8 ++++----
16 files changed, 28 insertions(+), 29 deletions(-)
rename src/{core => }/channels.py (99%)
rename src/{core => }/client/client.py (100%)
rename src/{core => }/client/connector.py (99%)
rename src/{core => }/client/playerclient.py (99%)
rename src/{core => }/control.py (99%)
delete mode 100644 src/core/__init__.py
rename src/{core => }/engine.py (96%)
rename src/{core => }/events.py (100%)
rename src/{core => }/mixer.py (100%)
rename src/{core => }/resources.py (100%)
diff --git a/run.py b/run.py
index 51949f3f..f56e0569 100755
--- a/run.py
+++ b/run.py
@@ -70,7 +70,7 @@ class EngineRunner:
"""
Starts Engine Core.
"""
- from src.core.engine import Engine
+ from src.engine import Engine
self.engine = Engine()
diff --git a/src/core/channels.py b/src/channels.py
similarity index 99%
rename from src/core/channels.py
rename to src/channels.py
index d251cdd4..3a0be4af 100644
--- a/src/core/channels.py
+++ b/src/channels.py
@@ -20,7 +20,7 @@
from enum import Enum
from src.base.utils import SimpleUtil as SU
-from src.core.resources import ResourceType
+from src.resources import ResourceType
class TransitionType(Enum):
diff --git a/src/core/client/client.py b/src/client/client.py
similarity index 100%
rename from src/core/client/client.py
rename to src/client/client.py
diff --git a/src/core/client/connector.py b/src/client/connector.py
similarity index 99%
rename from src/core/client/connector.py
rename to src/client/connector.py
index 446fc78d..a39f0fd8 100644
--- a/src/core/client/connector.py
+++ b/src/client/connector.py
@@ -23,7 +23,7 @@ import time
from src.base.config import AuraConfig
from src.base.utils import TerminalColors, SimpleUtil as SU
from src.base.exceptions import LQConnectionError
-from src.core.client.playerclient import LiquidSoapPlayerClient
+from src.client.playerclient import LiquidSoapPlayerClient
diff --git a/src/core/client/playerclient.py b/src/client/playerclient.py
similarity index 99%
rename from src/core/client/playerclient.py
rename to src/client/playerclient.py
index 3a822d19..8efcb294 100644
--- a/src/core/client/playerclient.py
+++ b/src/client/playerclient.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from src.core.client.client import LiquidSoapClient
+from src.client.client import LiquidSoapClient
class LiquidSoapPlayerClient(LiquidSoapClient):
diff --git a/src/core/control.py b/src/control.py
similarity index 99%
rename from src/core/control.py
rename to src/control.py
index 516fdc39..441a281d 100644
--- a/src/core/control.py
+++ b/src/control.py
@@ -209,7 +209,7 @@ class EngineExecutor(Timer):
param (object): Parameter passt to the function
"""
self._lock = Lock()
- from src.core.engine import Engine
+ from src.engine import Engine
now_unix = Engine.engine_time()
# Init parent-child relation
diff --git a/src/core/__init__.py b/src/core/__init__.py
deleted file mode 100644
index 8b137891..00000000
--- a/src/core/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/core/engine.py b/src/engine.py
similarity index 96%
rename from src/core/engine.py
rename to src/engine.py
index 1d0d8e57..bbd63773 100644
--- a/src/core/engine.py
+++ b/src/engine.py
@@ -20,20 +20,20 @@
import time
import logging
-from contextlib import suppress
-from threading import Thread
+from contextlib import suppress
+from threading import Thread
import meta
-from src.base.config import AuraConfig
-from src.base.utils import SimpleUtil as SU
-from src.base.exceptions import LQConnectionError, InvalidChannelException, LQStreamException, LoadSourceException
-from src.core.resources import ResourceClass, ResourceUtil
-from src.core.channels import ChannelType, TransitionType, LiquidsoapResponse, EntryPlayState, ResourceType, ChannelRouter
-from src.core.events import EngineEventDispatcher
-from src.core.control import EngineControlInterface
-from src.core.mixer import Mixer, MixerType
-from src.core.client.connector import PlayerConnector
+from src.base.config import AuraConfig
+from src.base.utils import SimpleUtil as SU
+from src.base.exceptions import LQConnectionError, InvalidChannelException, LQStreamException, LoadSourceException
+from src.resources import ResourceClass, ResourceUtil
+from src.channels import ChannelType, TransitionType, LiquidsoapResponse, EntryPlayState, ResourceType, ChannelRouter
+from src.events import EngineEventDispatcher
+from src.control import EngineControlInterface
+from src.mixer import Mixer, MixerType
+from src.client.connector import PlayerConnector
diff --git a/src/core/events.py b/src/events.py
similarity index 100%
rename from src/core/events.py
rename to src/events.py
diff --git a/src/core/mixer.py b/src/mixer.py
similarity index 100%
rename from src/core/mixer.py
rename to src/mixer.py
diff --git a/src/plugins/trackservice.py b/src/plugins/trackservice.py
index cbf79b2d..1373d48f 100644
--- a/src/plugins/trackservice.py
+++ b/src/plugins/trackservice.py
@@ -26,8 +26,8 @@ from datetime import datetime, timedelta
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
-from src.core.resources import ResourceClass
-from src.core.resources import ResourceUtil
+from src.resources import ResourceClass
+from src.resources import ResourceUtil
from src.scheduling.fallback import FallbackType
diff --git a/src/core/resources.py b/src/resources.py
similarity index 100%
rename from src/core/resources.py
rename to src/resources.py
diff --git a/src/scheduling/fallback.py b/src/scheduling/fallback.py
index faf721f0..b2425091 100644
--- a/src/scheduling/fallback.py
+++ b/src/scheduling/fallback.py
@@ -26,9 +26,9 @@ from datetime import timedelta
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
-from src.core.resources import ResourceClass, ResourceUtil
-from src.core.channels import Channel
-from src.core.control import EngineExecutor
+from src.resources import ResourceClass, ResourceUtil
+from src.channels import Channel
+from src.control import EngineExecutor
from src.scheduling.models import DB
@@ -300,7 +300,7 @@ class FallbackCommand(EngineExecutor):
timeslot (Timeslot): The timeslot any fallback entries should be scheduled for
entries (List): List of entries to be scheduled as fallback
"""
- from src.core.engine import Engine
+ from src.engine import Engine
def do_play(entries):
self.logger.info(SU.cyan(f"=== start_fallback_playlist('{entries}') ==="))
diff --git a/src/scheduling/models.py b/src/scheduling/models.py
index ae70bfb1..1f477703 100644
--- a/src/scheduling/models.py
+++ b/src/scheduling/models.py
@@ -33,7 +33,7 @@ from sqlalchemy.ext.hybrid import hybrid_property
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil
-from src.core.resources import ResourceUtil
+from src.resources import ResourceUtil
# Initialize DB Model and session
config = AuraConfig()
diff --git a/src/scheduling/programme.py b/src/scheduling/programme.py
index 9cec262f..195c901a 100644
--- a/src/scheduling/programme.py
+++ b/src/scheduling/programme.py
@@ -27,7 +27,7 @@ from datetime import datetime
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
-from src.core.engine import Engine
+from src.engine import Engine
from src.scheduling.utils import M3UPlaylistProcessor
from src.scheduling.models import Timeslot, Playlist, PlaylistEntry, PlaylistEntryMetaData
from src.scheduling.api import ApiFetcher
diff --git a/src/scheduling/scheduler.py b/src/scheduling/scheduler.py
index 6e81b39e..cd376899 100644
--- a/src/scheduling/scheduler.py
+++ b/src/scheduling/scheduler.py
@@ -27,10 +27,10 @@ from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
from src.scheduling.models import AuraDatabaseModel
from src.base.exceptions import NoActiveTimeslotException, LoadSourceException
-from src.core.control import EngineExecutor
-from src.core.engine import Engine
-from src.core.channels import ChannelType, TransitionType, EntryPlayState
-from src.core.resources import ResourceClass, ResourceUtil
+from src.control import EngineExecutor
+from src.engine import Engine
+from src.channels import ChannelType, TransitionType, EntryPlayState
+from src.resources import ResourceClass, ResourceUtil
from src.scheduling.utils import TimeslotRenderer
from src.scheduling.programme import ProgrammeService
--
GitLab