From 014ee25bb0895bc4e31a5d03ffa13ae09d7cc8d7 Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Thu, 29 Oct 2020 14:47:09 +0100
Subject: [PATCH] Renamed "core/liquidsoap" to "core/client". #50
---
src/core/{liquidsoap => client}/client.py | 6 ++--
src/core/{liquidsoap => client}/connector.py | 8 +++---
.../{liquidsoap => client}/playerclient.py | 2 +-
src/core/engine.py | 18 ++++++------
src/core/events.py | 2 +-
src/core/mixer.py | 3 +-
src/plugins/monitor.py | 11 ++++----
src/plugins/trackservice.py | 16 +++++------
src/scheduling/calendar.py | 8 +++---
src/scheduling/scheduler.py | 28 +++++++++----------
10 files changed, 52 insertions(+), 50 deletions(-)
rename src/core/{liquidsoap => client}/client.py (98%)
rename src/core/{liquidsoap => client}/connector.py (96%)
rename src/core/{liquidsoap => client}/playerclient.py (99%)
diff --git a/src/core/liquidsoap/client.py b/src/core/client/client.py
similarity index 98%
rename from src/core/liquidsoap/client.py
rename to src/core/client/client.py
index 89214d38..ff723b8b 100644
--- a/src/core/liquidsoap/client.py
+++ b/src/core/client/client.py
@@ -22,10 +22,10 @@ import urllib.parse
import configparser
import logging
-from multiprocessing import Lock
+from multiprocessing import Lock
-from src.base.exceptions import LQConnectionError
-from src.base.utils import TerminalColors
+from src.base.exceptions import LQConnectionError
+from src.base.utils import TerminalColors
diff --git a/src/core/liquidsoap/connector.py b/src/core/client/connector.py
similarity index 96%
rename from src/core/liquidsoap/connector.py
rename to src/core/client/connector.py
index e120c173..67dbac38 100644
--- a/src/core/liquidsoap/connector.py
+++ b/src/core/client/connector.py
@@ -20,10 +20,10 @@
import logging
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.liquidsoap.playerclient import LiquidSoapPlayerClient
+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
diff --git a/src/core/liquidsoap/playerclient.py b/src/core/client/playerclient.py
similarity index 99%
rename from src/core/liquidsoap/playerclient.py
rename to src/core/client/playerclient.py
index e2185a35..f0c4ede7 100644
--- a/src/core/liquidsoap/playerclient.py
+++ b/src/core/client/playerclient.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from src.core.liquidsoap.client import LiquidSoapClient
+from src.core.client.client import LiquidSoapClient
class LiquidSoapPlayerClient(LiquidSoapClient):
diff --git a/src/core/engine.py b/src/core/engine.py
index 98d6520a..0e3b245c 100644
--- a/src/core/engine.py
+++ b/src/core/engine.py
@@ -25,15 +25,15 @@ 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.liquidsoap.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.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
diff --git a/src/core/events.py b/src/core/events.py
index 75b00ceb..cf2eea4d 100644
--- a/src/core/events.py
+++ b/src/core/events.py
@@ -20,7 +20,7 @@
import logging
import datetime
-from threading import Thread
+from threading import Thread
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
diff --git a/src/core/mixer.py b/src/core/mixer.py
index b5366973..d383840b 100644
--- a/src/core/mixer.py
+++ b/src/core/mixer.py
@@ -22,7 +22,8 @@
import logging
import time
-from enum import Enum
+from enum import Enum
+
from src.base.exceptions import LQConnectionError
from src.base.utils import SimpleUtil as SU
diff --git a/src/plugins/monitor.py b/src/plugins/monitor.py
index b2ce6633..86759993 100644
--- a/src/plugins/monitor.py
+++ b/src/plugins/monitor.py
@@ -26,13 +26,14 @@ import threading
import platform
import requests
-from enum import Enum
-from socket import socket, AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST
+from enum import Enum
+from socket import socket, AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST
import meta
-from src.base.config import AuraConfig
-from src.base.utils import SimpleUtil as SU
-from src.base.mail import AuraMailer
+
+from src.base.config import AuraConfig
+from src.base.utils import SimpleUtil as SU
+from src.base.mail import AuraMailer
diff --git a/src/plugins/trackservice.py b/src/plugins/trackservice.py
index 44537476..877c5e01 100644
--- a/src/plugins/trackservice.py
+++ b/src/plugins/trackservice.py
@@ -21,14 +21,14 @@ import json
import logging
import requests
-from collections import deque
-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.scheduling.fallback import FallbackType
+from collections import deque
+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.scheduling.fallback import FallbackType
diff --git a/src/scheduling/calendar.py b/src/scheduling/calendar.py
index b208165f..32950343 100644
--- a/src/scheduling/calendar.py
+++ b/src/scheduling/calendar.py
@@ -24,11 +24,11 @@ import threading
import queue
import logging
-from datetime import datetime
+from datetime import datetime
-from src.base.utils import SimpleUtil as SU
-from src.base.models import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
-from src.scheduling.calender_fetcher import CalendarFetcher
+from src.base.utils import SimpleUtil as SU
+from src.base.models import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
+from src.scheduling.calender_fetcher import CalendarFetcher
diff --git a/src/scheduling/scheduler.py b/src/scheduling/scheduler.py
index 22e07615..b9cfe848 100644
--- a/src/scheduling/scheduler.py
+++ b/src/scheduling/scheduler.py
@@ -23,20 +23,20 @@ import threading
import time
import sqlalchemy
-from enum import Enum
-from operator import attrgetter
-from datetime import datetime, timedelta
-
-from src.base.config import AuraConfig
-from src.base.utils import SimpleUtil as SU
-from src.base.models import AuraDatabaseModel, Schedule, Playlist
-from src.base.exceptions import NoActiveScheduleException, 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.scheduling.calendar import AuraCalendarService
-from src.scheduling.fallback import FallbackManager
+from enum import Enum
+from operator import attrgetter
+from datetime import datetime, timedelta
+
+from src.base.config import AuraConfig
+from src.base.utils import SimpleUtil as SU
+from src.base.models import AuraDatabaseModel, Schedule, Playlist
+from src.base.exceptions import NoActiveScheduleException, 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.scheduling.calendar import AuraCalendarService
+from src.scheduling.fallback import FallbackManager
--
GitLab