Renamed "core/liquidsoap" to "core/client". #50

src/core/liquidsoap/client.py → 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
 
 
 

src/core/liquidsoap/connector.py → 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
 
 
 

src/core/liquidsoap/playerclient.py → 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):

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
 
 
 

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

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
 

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
 
 
 

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
 
 
 

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
 
 
 

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