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 89214d381eb9a6ae5293bda8cecd1c0e5be10a90..ff723b8bd5eee6c34f2a0ccaecf608f47fe0ac0b 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 e120c17317d86d39a572b869791e6d9203960fab..67dbac38a4133a90cafb5e8c287094c067aaf7fb 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 e2185a3566749f2c4b8fe88aa1f32b39cf03c41a..f0c4ede7fc776f8326bb2045bc91eccc79fc0b67 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 98d6520ae033823777d614d2a0f43389c3d338f4..0e3b245c37aa5cba4766954e865baf9866b8b7f5 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 75b00cebe4184e110afcaa454c913c2499b8edb7..cf2eea4d9102f9e78250fa2567e741592349af8a 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 b53669734d442126e44b9954ab824e540d0562cb..d383840b0dd7a96d4e55e514535982563538ef9f 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 b2ce6633cc8e5e9cb7a678cadc570585849c0f83..86759993c9cf8660ae00d42c314f7e2139f6d5ab 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 44537476e252848ec7ba86aef464d8e9849d6013..877c5e01ac4ed9022f15d35927d858f04b843f71 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 b208165f8353cb93e15d247565c192f4bc966602..32950343b50e3894d5af84bb86ccc60934d15a60 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 22e076156b196852d01c6a51342615587f6620be..b9cfe8482e55776de512c6c4d14878c6cd1a2c3e 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